diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Components/BodyRadiation.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Components/BodyRadiation.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Components/BodyRadiation.mo" 2022-03-10 09:57:39.648144334 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Components/BodyRadiation.mo" 2022-03-10 09:58:35.352151392 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BaseClasses.HeatTransfer.Components; +within BuildSysPro.BaseClasses.HeatTransfer.Components; model BodyRadiation "Lumped thermal element for radiation heat transfer" extends BaseClasses.HeatTransfer.Interfaces.Element1D; parameter Boolean Gr_as_input=false "Prescribed Net radiation conductance between two surface" annotation(Evaluate=true, HideResult=true, choices(choice=false "Fixed", @@ -16,7 +16,7 @@ rotation=-90, origin={-20,84}))); -// Internal connector +// Internal connector protected Modelica.Blocks.Interfaces.RealInput Gr_internal "internal connector for optional configuration"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Components/ControlledThermalConductor.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Components/ControlledThermalConductor.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Components/ControlledThermalConductor.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Components/ControlledThermalConductor.mo" 2022-03-10 09:58:35.336151391 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BaseClasses.HeatTransfer.Components; +within BuildSysPro.BaseClasses.HeatTransfer.Components; model ControlledThermalConductor "Lumped thermal element transporting heat without storing it - with controlled conductance" extends BaseClasses.HeatTransfer.Interfaces.Element1D; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Components/ExtLWR.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Components/ExtLWR.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Components/ExtLWR.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Components/ExtLWR.mo" 2022-03-10 09:58:35.320151388 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BaseClasses.HeatTransfer.Components; +within BuildSysPro.BaseClasses.HeatTransfer.Components; model ExtLWR "Long wavelength radiation exchanges with the sky and the environment" @@ -58,8 +58,7 @@ Modelica.Blocks.Sources.RealExpression GrCiel_in(y=if GLO_ciel then eps*S*(0.5*(1+cos(incl_gen_in.y*Modelica.Constants.pi/180))) else 0) if use_incl_in; - - //Internal connector +//Internal connector protected Modelica.Blocks.Interfaces.RealInput incl_in_internal "Internal connector for optional configuration"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Components/HeatCapacitor.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Components/HeatCapacitor.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Components/HeatCapacitor.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Components/HeatCapacitor.mo" 2022-03-10 09:58:35.304151385 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BaseClasses.HeatTransfer.Components; +within BuildSysPro.BaseClasses.HeatTransfer.Components; model HeatCapacitor "Heat capacitor" parameter Modelica.Units.SI.HeatCapacity C "Heat capacity of the element (= cp*m)"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Components/HomogeneousConduction.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Components/HomogeneousConduction.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Components/HomogeneousConduction.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Components/HomogeneousConduction.mo" 2022-03-10 09:58:35.296151384 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BaseClasses.HeatTransfer.Components; +within BuildSysPro.BaseClasses.HeatTransfer.Components; model HomogeneousConduction "1-D thermal conduction for homogeneous medium" parameter Integer n=1 "Number of states"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Components/HomogeneousNLayersWall.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Components/HomogeneousNLayersWall.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Components/HomogeneousNLayersWall.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Components/HomogeneousNLayersWall.mo" 2022-03-10 09:58:35.288151384 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BaseClasses.HeatTransfer.Components; +within BuildSysPro.BaseClasses.HeatTransfer.Components; model HomogeneousNLayersWall "Pure thermal conduction in an N homogeneous layers wall" @@ -15,8 +15,8 @@ parameter Modelica.Units.SI.Temperature Tinit=293.15; parameter BuildSysPro.Utilities.Types.InitCond InitType=BuildSysPro.Utilities.Types.InitCond.SteadyState; -//extends BuildSysPro.ModelesAvances.ParoiNCouchesHomogenesCrypte( -extends BuildSysPro.BaseClasses.HeatTransfer.Components.Wall( +//extends BuildSysPro.ModelesAvances.ParoiNCouchesHomogenesCrypte( + extends BuildSysPro.BaseClasses.HeatTransfer.Components.Wall( nc=n, mc=m, Sc=S, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Components/LinearExtLWR.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Components/LinearExtLWR.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Components/LinearExtLWR.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Components/LinearExtLWR.mo" 2022-03-10 09:58:35.280151383 +0000 @@ -1,14 +1,14 @@ -within BuildSysPro.BaseClasses.HeatTransfer.Components; +within BuildSysPro.BaseClasses.HeatTransfer.Components; model LinearExtLWR "Echanges thermique par rayonnement en grande longueur d'onde" -// Paramètres publics +// Paramètres publics parameter Modelica.Units.SI.Area S=1 "Surface"; parameter Real eps=0.5 "Emissivité"; parameter Real skyViewFactor "Facteur de forme moyen entre les parois et le ciel (exemple: skyViewFactor(toiture terrase)=1, skyViewfactor(paroi verticale en environnement dégagé)=0.5)"; -// Composants publics +// Composants publics BuildSysPro.BaseClasses.HeatTransfer.Interfaces.HeatPort_a T_sky "Température du ciel" annotation (Placement(transformation(extent={{-100,-50}, {-80,-30}}, rotation=0))); @@ -20,7 +20,7 @@ extent={{80,-10},{100,10}}, rotation=0), iconTransformation(extent={{ 80,-10},{100,10}}))); -// Paramètres protégés +// Paramètres protégés protected parameter Modelica.Units.SI.Temperature TcielConst=263.15 "Estimation de la température de Ciel"; @@ -29,7 +29,7 @@ parameter Modelica.Units.SI.Temperature TsurfConst=288.15 "Estimation de la température de surface des parois"; -// Composants internes +// Composants internes BuildSysPro.BaseClasses.HeatTransfer.Components.ThermalConductor GLOenv(G=(1 - skyViewFactor)*S*Modelica.Constants.sigma*eps*(TenvConst^2 + TsurfConst ^2)*(TenvConst + TsurfConst)) "Echange GLO avec l'environnement" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Components/MaterialLayer.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Components/MaterialLayer.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Components/MaterialLayer.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Components/MaterialLayer.mo" 2022-03-10 09:58:35.256151380 +0000 @@ -23,8 +23,8 @@ initial equation if InitType == BuildSysPro.Utilities.Types.InitCond.SteadyState then der(T)=0; -// elseif InitType ==BuildSysPro.Utilitaires.Types.InitCond.Value then -// T=Tinit; +// elseif InitType ==BuildSysPro.Utilitaires.Types.InitCond.Value then +// T=Tinit; end if; equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Components/NonLinearConvective.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Components/NonLinearConvective.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Components/NonLinearConvective.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Components/NonLinearConvective.mo" 2022-03-10 09:58:35.240151377 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BaseClasses.HeatTransfer.Components; +within BuildSysPro.BaseClasses.HeatTransfer.Components; model NonLinearConvective "Generic non linear convective heat exchange coefficient" extends BaseClasses.HeatTransfer.Interfaces.Element1D; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Components/RadiationTemperature.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Components/RadiationTemperature.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Components/RadiationTemperature.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Components/RadiationTemperature.mo" 2022-03-10 09:58:35.232151376 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BaseClasses.HeatTransfer.Components; +within BuildSysPro.BaseClasses.HeatTransfer.Components; model RadiationTemperature "Radiative temperature of the room" parameter Integer np=6 "Number of walles exposed to the radiative flux" annotation(Dialog(group="Opaque walls")); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Components/ThermalConductor.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Components/ThermalConductor.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Components/ThermalConductor.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Components/ThermalConductor.mo" 2022-03-10 09:58:35.172151370 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BaseClasses.HeatTransfer.Components; +within BuildSysPro.BaseClasses.HeatTransfer.Components; model ThermalConductor "Lumped thermal element transporting heat without storing it" extends BaseClasses.HeatTransfer.Interfaces.Element1D; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Components/ThermalResistance.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Components/ThermalResistance.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Components/ThermalResistance.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Components/ThermalResistance.mo" 2022-03-10 09:58:35.164151368 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BaseClasses.HeatTransfer.Components; +within BuildSysPro.BaseClasses.HeatTransfer.Components; model ThermalResistance "Thermal resistance" extends BaseClasses.HeatTransfer.Interfaces.Element1D; parameter Modelica.Units.SI.ThermalResistance R diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Components/Wall.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Components/Wall.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Components/Wall.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Components/Wall.mo" 2022-03-10 09:58:35.160151368 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BaseClasses.HeatTransfer.Components; +within BuildSysPro.BaseClasses.HeatTransfer.Components; model Wall "Model of wall composed of one or more materials described from outside to inside" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Components/WindConvection.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Components/WindConvection.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Components/WindConvection.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Components/WindConvection.mo" 2022-03-10 09:58:35.152151366 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BaseClasses.HeatTransfer.Components; +within BuildSysPro.BaseClasses.HeatTransfer.Components; model WindConvection "Convective heat exchange coefficient of a wall taking into account wind speed and direction" extends BuildSysPro.BaseClasses.HeatTransfer.Interfaces.Element1D; @@ -53,7 +53,7 @@ parameter Real a1=3.06; parameter Real n1=1; parameter Real b1=5.44; - //Leeward façade + //Leeward façade parameter Real a2=0.34; parameter Real n2=1; parameter Real b2=7.99; @@ -90,7 +90,8 @@ BuildSysPro version 3.5.0
Author : Aurélie KAEMMERLEN, EDF (2013)
--------------------------------------------------------------

-")); +")); + end correlation; equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Interfaces/Element1D.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Interfaces/Element1D.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Interfaces/Element1D.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Interfaces/Element1D.mo" 2022-03-10 09:58:35.124151363 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BaseClasses.HeatTransfer.Interfaces; +within BuildSysPro.BaseClasses.HeatTransfer.Interfaces; partial model Element1D "Partial heat transfer element with two HeatPort connectors that does not store energy" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Interfaces/HeatPort.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Interfaces/HeatPort.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Interfaces/HeatPort.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Interfaces/HeatPort.mo" 2022-03-10 09:58:35.120151362 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BaseClasses.HeatTransfer.Interfaces; +within BuildSysPro.BaseClasses.HeatTransfer.Interfaces; partial connector HeatPort "Thermal port for 1-D heat transfer" Modelica.Units.SI.Temperature T "Port temperature"; flow Modelica.Units.SI.HeatFlowRate Q_flow diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Interfaces/HeatPort_a.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Interfaces/HeatPort_a.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Interfaces/HeatPort_a.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Interfaces/HeatPort_a.mo" 2022-03-10 09:58:35.116151363 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BaseClasses.HeatTransfer.Interfaces; +within BuildSysPro.BaseClasses.HeatTransfer.Interfaces; connector HeatPort_a "Thermal port for 1-D heat transfer" extends HeatPort; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Interfaces/HeatPort_b.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Interfaces/HeatPort_b.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Interfaces/HeatPort_b.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Interfaces/HeatPort_b.mo" 2022-03-10 09:58:35.108151360 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BaseClasses.HeatTransfer.Interfaces; +within BuildSysPro.BaseClasses.HeatTransfer.Interfaces; connector HeatPort_b "Thermal port for 1-D heat transfer" extends HeatPort; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Sensors/HeatFlowSensor.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Sensors/HeatFlowSensor.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Sensors/HeatFlowSensor.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Sensors/HeatFlowSensor.mo" 2022-03-10 09:58:35.100151360 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BaseClasses.HeatTransfer.Sensors; +within BuildSysPro.BaseClasses.HeatTransfer.Sensors; model HeatFlowSensor "Heat flow rate sensor" extends Modelica.Icons.RoundSensor; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Sensors/TemperatureSensor.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Sensors/TemperatureSensor.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Sensors/TemperatureSensor.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Sensors/TemperatureSensor.mo" 2022-03-10 09:58:35.092151359 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BaseClasses.HeatTransfer.Sensors; +within BuildSysPro.BaseClasses.HeatTransfer.Sensors; model TemperatureSensor "Absolute temperature sensor in Kelvin" Modelica.Blocks.Interfaces.RealOutput T annotation (Placement( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Sources/FixedHeatFlow.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Sources/FixedHeatFlow.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Sources/FixedHeatFlow.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Sources/FixedHeatFlow.mo" 2022-03-10 09:58:35.080151357 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BaseClasses.HeatTransfer.Sources; +within BuildSysPro.BaseClasses.HeatTransfer.Sources; model FixedHeatFlow "Fixed heat flow boundary condition" parameter Modelica.Units.SI.HeatFlowRate Q_flow "Fixed heat flow rate at port"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Sources/FixedTemperature.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Sources/FixedTemperature.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Sources/FixedTemperature.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Sources/FixedTemperature.mo" 2022-03-10 09:58:35.072151357 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BaseClasses.HeatTransfer.Sources; +within BuildSysPro.BaseClasses.HeatTransfer.Sources; model FixedTemperature "Fixed temperature boundary condition in Kelvin" parameter Modelica.Units.SI.Temperature T "Fixed temperature"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Sources/PrescribedHeatFlow.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Sources/PrescribedHeatFlow.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Sources/PrescribedHeatFlow.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Sources/PrescribedHeatFlow.mo" 2022-03-10 09:58:35.060151355 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BaseClasses.HeatTransfer.Sources; +within BuildSysPro.BaseClasses.HeatTransfer.Sources; model PrescribedHeatFlow "Prescribed heat flow boundary condition" parameter Modelica.Units.SI.Temperature T_ref=293.15 "Reference temperature"; parameter Modelica.Units.SI.LinearTemperatureCoefficient alpha=0 diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Sources/PrescribedTemperature.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Sources/PrescribedTemperature.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Sources/PrescribedTemperature.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Sources/PrescribedTemperature.mo" 2022-03-10 09:58:35.048151353 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BaseClasses.HeatTransfer.Sources; +within BuildSysPro.BaseClasses.HeatTransfer.Sources; model PrescribedTemperature "Variable temperature boundary condition in Kelvin" BuildSysPro.BaseClasses.HeatTransfer.Interfaces.HeatPort_b port annotation (Placement( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Units/FromKelvin.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Units/FromKelvin.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Units/FromKelvin.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Units/FromKelvin.mo" 2022-03-10 09:58:35.004151348 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BaseClasses.HeatTransfer.Units; +within BuildSysPro.BaseClasses.HeatTransfer.Units; model FromKelvin "Conversion from Kelvin to degCelsius" Modelica.Blocks.Interfaces.RealInput Kelvin(unit="K") diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Units/ToKelvin.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Units/ToKelvin.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Units/ToKelvin.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/HeatTransfer/Units/ToKelvin.mo" 2022-03-10 09:58:34.996151347 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BaseClasses.HeatTransfer.Units; +within BuildSysPro.BaseClasses.HeatTransfer.Units; model ToKelvin "Conversion block from degCelsius to Kelvin" Modelica.Blocks.Interfaces.RealInput Celsius(unit="degC") diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/Media/OLD_THERMHYGAERO/AirConstants/CteAH.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/Media/OLD_THERMHYGAERO/AirConstants/CteAH.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/Media/OLD_THERMHYGAERO/AirConstants/CteAH.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/Media/OLD_THERMHYGAERO/AirConstants/CteAH.mo" 2022-03-10 09:58:34.968151343 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BaseClasses.Media.OLD_THERMHYGAERO.AirConstants; +within BuildSysPro.BaseClasses.Media.OLD_THERMHYGAERO.AirConstants; record CteAH "Moist air constants" constant Real gamma=1.4 "Ratio Cp/Cv"; constant Real Cpa=1003.6 @@ -15,7 +15,7 @@ "Specific heat capacity of water vapour at constant pressure, at T=16°C [J/(kg.K)]"; constant Real Cl=4216 "Specific heat capacity of water vapour at constant pressure, at T=100°C [J/(kg.K)]"; - // constant Real Lv=2500776 "Latent heat of vaporization at T=0°C [J/kg]"; + // constant Real Lv=2500776 "Latent heat of vaporization at T=0°C [J/kg]"; constant Real Pref=101325 "Absolute pression of reference [Pa]"; constant Real TKref=273.15 "Absolute temperature of reference at 0°C [K]"; constant Real Lv0=AirFunctions.Lv( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/Media/OLD_THERMHYGAERO/AirFunctions/Lv.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/Media/OLD_THERMHYGAERO/AirFunctions/Lv.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/Media/OLD_THERMHYGAERO/AirFunctions/Lv.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/Media/OLD_THERMHYGAERO/AirFunctions/Lv.mo" 2022-03-10 09:58:34.956151341 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BaseClasses.Media.OLD_THERMHYGAERO.AirFunctions; +within BuildSysPro.BaseClasses.Media.OLD_THERMHYGAERO.AirFunctions; function Lv "Latent heat depending on temperature" input Real T "Air temperature [K]"; input Real TKref "Absolute temperature of reference at 0°C [K]"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/Media/OLD_THERMHYGAERO/package.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/Media/OLD_THERMHYGAERO/package.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/Media/OLD_THERMHYGAERO/package.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BaseClasses/Media/OLD_THERMHYGAERO/package.mo" 2022-03-10 09:58:34.980151344 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BaseClasses.Media; +within BuildSysPro.BaseClasses.Media; package OLD_THERMHYGAERO "Issu de Thermohygroaéraulique des Modèles de base" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Radiation/BESTESTSolarDistrib.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Radiation/BESTESTSolarDistrib.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Radiation/BESTESTSolarDistrib.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Radiation/BESTESTSolarDistrib.mo" 2022-03-10 09:58:34.936151339 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BoundaryConditions.Radiation; +within BuildSysPro.BoundaryConditions.Radiation; function BESTESTSolarDistrib "Computation of solar fractions following the procedure described in BESTEST appendix" @@ -16,21 +16,21 @@ input Real FFf[nf] "Form factor between windows and floor for the computation of the first reflection"; -// Several outputs: beware of the order! -output Real[np] SFp +// Several outputs: beware of the order! + output Real[np] SFp "Solar fractions of walls / BESTEST : 1-ceiling, 2-floor, 3-North, 4-South, 5-East, 6-West"; output Real[nf] SFf "Solar fractions of windows/ BESTEST : 1-South OR 1-East, 2-West"; -//Intermediate solar fractions for walls +//Intermediate solar fractions for walls protected Real B1p[np]; Real B2p[np]; Real B3p[np]; Real BRp[np]; -// Intermediate solar fraction for windows -Real[nf] B1f_abs; +// Intermediate solar fraction for windows + Real[nf] B1f_abs; Real[nf] B1f_lost; Real[nf] B2f_abs; Real[nf] B2f_lost; @@ -39,58 +39,54 @@ Real[nf] BRf_abs; Real[nf] BRf_lost; -// Intermediate sums of solar fractions and surfaces -Real B2t; +// Intermediate sums of solar fractions and surfaces + Real B2t; Real B3t; Real BRt; Real St; -algorithm -// calculation of surfaces sum -St :=sum(Sp)+sum(Sf); - -// B1 calculation- First reflection of the incident short-wave radiation - Hypothesis = everything hit the floor -for i in 1:np loop - B1p[i]:= if i<>2 then 0 else AbsP; //i=2 représente le plancher -end for; -for i in 1:nf loop - B1f_abs[i]:= 0; - B1f_lost[i]:= 0; -end for; - -// B2 calculation - Second reflection of the incident short-wave radiation - Hypothesis = diffuse redistribution through the floor proportionally to the term : absorptance x form factor -for i in 1:np loop - B2p[i]:= if i<>2 then (1-AbsP)*AbsP*FFp[i] else 0; -end for; +algorithm +// calculation of surfaces sum + St := sum(Sp) + sum(Sf); +// B1 calculation- First reflection of the incident short-wave radiation - Hypothesis = everything hit the floor + for i in 1:np loop + B1p[i] := if i <> 2 then 0 else AbsP; + end for; +//i=2 représente le plancher + for i in 1:nf loop + B1f_abs[i] := 0; + B1f_lost[i] := 0; + end for; +// B2 calculation - Second reflection of the incident short-wave radiation - Hypothesis = diffuse redistribution through the floor proportionally to the term : absorptance x form factor + for i in 1:np loop + B2p[i] := if i <> 2 then (1 - AbsP) * AbsP * FFp[i] else 0; + end for; for i in 1:nf loop B2f_lost[i]:= (1-AbsP)*(TrF-AbsF/2)*FFf[i]; B2f_abs[i]:= (1-AbsP)*(AbsF/2)*FFf[i]; end for; -B2t := sum(B2p)+sum(B2f_abs)+sum(B2f_lost); - -// B3 calculation- Third reflection of the incident short-wave radiation - Hypothesis = remaining distribution on each surface proportionally to the term : absorptance x form factor -for i in 1:np loop - B3p[i]:= (1-AbsP-B2t)*AbsP*Sp[i]/St; -end for; +B2t := sum(B2p)+sum(B2f_abs)+sum(B2f_lost); +// B3 calculation- Third reflection of the incident short-wave radiation - Hypothesis = remaining distribution on each surface proportionally to the term : absorptance x form factor + for i in 1:np loop + B3p[i] := (1 - AbsP - B2t) * AbsP * Sp[i] / St; + end for; for i in 1:nf loop B3f_lost[i]:= (1-AbsP-B2t)*(TrF-AbsF/2)*Sf[i]/St; B3f_abs[i]:= (1-AbsP-B2t)*(AbsF/2)*Sf[i]/St; end for; -B3t := sum(B3p)+sum(B3f_abs)+sum(B3f_lost); - -// BR calculation - Remaining flux distribution proportionally to the third reflection -for i in 1:np loop - BRp[i]:= (1-AbsP-B2t-B3t)*B3p[i]/B3t; -end for; +B3t := sum(B3p)+sum(B3f_abs)+sum(B3f_lost); +// BR calculation - Remaining flux distribution proportionally to the third reflection + for i in 1:np loop + BRp[i] := (1 - AbsP - B2t - B3t) * B3p[i] / B3t; + end for; for i in 1:nf loop BRf_abs[i]:= (1-AbsP-B2t-B3t)*B3f_abs[i]/B3t; BRf_lost[i]:= (1-AbsP-B2t-B3t)*B3f_lost[i]/B3t; -end for; - -// Form factors (FF) calculation -for i in 1:np loop - SFp[i]:= B1p[i]+B2p[i]+B3p[i]+BRp[i]; -end for; +end for; +// Form factors (FF) calculation + for i in 1:np loop + SFp[i] := B1p[i] + B2p[i] + B3p[i] + BRp[i]; + end for; for i in 1:nf loop SFf[i]:= B1f_abs[i] +B2f_abs[i] +B3f_abs[i] +BRf_abs[i]; end for; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Radiation/FractionSolarDistrib.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Radiation/FractionSolarDistrib.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Radiation/FractionSolarDistrib.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Radiation/FractionSolarDistrib.mo" 2022-03-10 09:58:34.924151337 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BoundaryConditions.Radiation; +within BuildSysPro.BoundaryConditions.Radiation; model FractionSolarDistrib "Redistribution of short-wave radiation entering a zone on each wall and window - based on absorptance/transmittance coefficients, surfaces and form factors" @@ -16,8 +16,8 @@ parameter Real FFf[nf]={0.08929} "Form factor between windows and floor for the calculation of the first reflection"; -// Intermediate solar fractions for windows -Real[np] SFp +// Intermediate solar fractions for windows + Real[np] SFp "Walls solar fractions / BESTEST : 1-ceiling, 2-floor, 3-Northe, 4-South, 5-East, 6-West"; Real[nf] SFf "Windows solar fractions/ BESTEST : 1-South OR 1-East, 2-West"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Radiation/PintRadDistrib.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Radiation/PintRadDistrib.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Radiation/PintRadDistrib.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Radiation/PintRadDistrib.mo" 2022-03-10 09:58:34.916151336 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BoundaryConditions.Radiation; +within BuildSysPro.BoundaryConditions.Radiation; model PintRadDistrib "Redistribution of radiative heat flow entering a zone on each wall and window - based on surfaces only" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Radiation/RadDistrib.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Radiation/RadDistrib.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Radiation/RadDistrib.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Radiation/RadDistrib.mo" 2022-03-10 09:58:34.908151336 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BoundaryConditions.Radiation; +within BuildSysPro.BoundaryConditions.Radiation; partial model RadDistrib "Partial model for the construction of radiative distribution models" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Radiation/SumDistribRad.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Radiation/SumDistribRad.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Radiation/SumDistribRad.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Radiation/SumDistribRad.mo" 2022-03-10 09:58:34.900151335 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BoundaryConditions.Radiation; +within BuildSysPro.BoundaryConditions.Radiation; model SumDistribRad "Redistribution of radiative internal gains with sum of internal gains and solar gains" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Radiation/package.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Radiation/package.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Radiation/package.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Radiation/package.mo" 2022-03-10 09:58:34.940151340 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BoundaryConditions; +within BuildSysPro.BoundaryConditions; package Radiation "Modèles de distribution des flux radiatifs dans une pièce" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Scenarios/CombiTimeTable.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Scenarios/CombiTimeTable.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Scenarios/CombiTimeTable.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Scenarios/CombiTimeTable.mo" 2022-03-10 09:58:34.868151330 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BoundaryConditions.Scenarios; +within BuildSysPro.BoundaryConditions.Scenarios; model CombiTimeTable "Table look-up with respect to time and linear/perodic extrapolation methods (data from matrix/file)" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Scenarios/DrawOffScenario.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Scenarios/DrawOffScenario.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Scenarios/DrawOffScenario.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Scenarios/DrawOffScenario.mo" 2022-03-10 09:58:34.784151320 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BoundaryConditions.Scenarios; +within BuildSysPro.BoundaryConditions.Scenarios; model DrawOffScenario "DHW draw-off scenario" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Scenarios/InternalGains.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Scenarios/InternalGains.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Scenarios/InternalGains.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Scenarios/InternalGains.mo" 2022-03-10 09:58:34.756151317 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BoundaryConditions.Scenarios; +within BuildSysPro.BoundaryConditions.Scenarios; model InternalGains "Fixed internal heat gains" parameter Modelica.Units.SI.Power Pint=200 "Internal heat gains"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Scenarios/NightVentilation.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Scenarios/NightVentilation.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Scenarios/NightVentilation.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Scenarios/NightVentilation.mo" 2022-03-10 09:58:34.748151315 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BoundaryConditions.Scenarios; +within BuildSysPro.BoundaryConditions.Scenarios; model NightVentilation "Model of overventilation by windows opening for summer comfort" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Scenarios/OccupancySchedule.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Scenarios/OccupancySchedule.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Scenarios/OccupancySchedule.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Scenarios/OccupancySchedule.mo" 2022-03-10 09:58:34.740151314 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BoundaryConditions.Scenarios; +within BuildSysPro.BoundaryConditions.Scenarios; block OccupancySchedule "Occupancy schedule" extends Modelica.Blocks.Icons.Block; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Scenarios/ScenarioDHW.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Scenarios/ScenarioDHW.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Scenarios/ScenarioDHW.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Scenarios/ScenarioDHW.mo" 2022-03-10 09:58:34.720151312 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BoundaryConditions.Scenarios; +within BuildSysPro.BoundaryConditions.Scenarios; block ScenarioDHW parameter Integer ChoixScenario=3 "Scenario choice" annotation(choices( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Scenarios/ScenarioRT.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Scenarios/ScenarioRT.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Scenarios/ScenarioRT.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Scenarios/ScenarioRT.mo" 2022-03-10 09:58:34.708151310 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BoundaryConditions.Scenarios; +within BuildSysPro.BoundaryConditions.Scenarios; model ScenarioRT "Residential scenarios for the french building regulation 2012" @@ -54,8 +54,8 @@ parameter BuildSysPro.Utilities.Types.FileNameIn pth=Modelica.Utilities.Files.loadResource("modelica://BuildSysPro/Resources/Donnees/Scenarios/ScenarioRT2012.txt") "Chemin d'acces au fichier des scénarios (contient les 2 tables voir Scenarios.StepFunctionMat)"; -//Output connectors related to control -Modelica.Blocks.Interfaces.RealOutput Presence "Presence 1 / Absence 0" +//Output connectors related to control + Modelica.Blocks.Interfaces.RealOutput Presence "Presence 1 / Absence 0" annotation (Placement(transformation(extent={{82,82},{118,118}}, rotation=0), iconTransformation(extent={{80,-130},{100,-110}}))); Modelica.Blocks.Interfaces.RealOutput ComRefChauffage @@ -91,7 +91,7 @@ annotation (Placement(transformation(extent={{82,-138},{118,-102}}, rotation=0), iconTransformation(extent={{80,110},{100,130}}))); -// Output connectors associated to various loads +// Output connectors associated to various loads BuildSysPro.BaseClasses.HeatTransfer.Interfaces.HeatPort_a ApportsThOccupants if UtilApportThOcc "Heat gains from occupancy [W]" annotation (Placement(transformation(extent={{-80,180},{-60,200}}))); @@ -122,8 +122,9 @@ rotation=90, origin={40,190}))); -//Data table -// Inner components +//Data table + +// Inner components protected BuildSysPro.BaseClasses.HeatTransfer.Sources.PrescribedHeatFlow prescribedHeatFlow if UtilApportThOcc annotation (Placement(transformation( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Scenarios/ShutterControl.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Scenarios/ShutterControl.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Scenarios/ShutterControl.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Scenarios/ShutterControl.mo" 2022-03-10 09:58:34.656151304 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BoundaryConditions.Scenarios; +within BuildSysPro.BoundaryConditions.Scenarios; model ShutterControl "Shutters control for closure and occultancy during night in the cooling period - comfort objective" @@ -72,8 +72,7 @@ algorithm Hyst1:=if TintTfermeture then 1 else pre(Hyst1); equation - - //Variation in occultation level during according to the occupancy scenario +//Variation in occultation level during according to the occupancy scenario if Occupation>=0.5 then TauxOccultation = 0.5; else diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Scenarios/WaterVaporMozart.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Scenarios/WaterVaporMozart.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Scenarios/WaterVaporMozart.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Scenarios/WaterVaporMozart.mo" 2022-03-10 09:58:34.576151293 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BoundaryConditions.Scenarios; +within BuildSysPro.BoundaryConditions.Scenarios; block WaterVaporMozart "Water vapour generation scenario" parameter Integer ChoixScenario=1 "Scenario choice" annotation(choices( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/Interfaces/SolarFluxInput.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/Interfaces/SolarFluxInput.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/Interfaces/SolarFluxInput.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/Interfaces/SolarFluxInput.mo" 2022-03-10 09:58:34.548151291 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BoundaryConditions.Solar.Interfaces; +within BuildSysPro.BoundaryConditions.Solar.Interfaces; connector SolarFluxInput = input Real "Input irradiation connector" annotation (defaultComponentName="Flux", diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/Interfaces/SolarFluxOutput.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/Interfaces/SolarFluxOutput.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/Interfaces/SolarFluxOutput.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/Interfaces/SolarFluxOutput.mo" 2022-03-10 09:58:34.540151290 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BoundaryConditions.Solar.Interfaces; +within BuildSysPro.BoundaryConditions.Solar.Interfaces; connector SolarFluxOutput = output Real "Input irradiation connector" annotation (defaultComponentName="Flux", diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/Irradiation/DirectAbs.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/Irradiation/DirectAbs.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/Irradiation/DirectAbs.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/Irradiation/DirectAbs.mo" 2022-03-10 09:58:34.528151288 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BoundaryConditions.Solar.Irradiation; +within BuildSysPro.BoundaryConditions.Solar.Irradiation; block DirectAbs "Compute the direct solar irradiation absorbed by a glazing surface" extends Modelica.Blocks.Icons.Block; @@ -19,39 +19,37 @@ transformation(extent={{80,-20},{120,20}}), iconTransformation(extent={ {100,-8},{120,12}}))); -// Variables internes +// Variables internes protected Real cosi; Real PondAbsDir; -// Coefficients calculés pour la formule de Fauconnier -parameter Real a0 = 0.0016 - 0.0619*AbsDir - 0.0368*AbsDir^2; + // Coefficients calculés pour la formule de Fauconnier + parameter Real a0 = 0.0016 - 0.0619*AbsDir - 0.0368*AbsDir^2; parameter Real a1 = -0.007 + 1.65*AbsDir - 0.443*AbsDir^2; parameter Real a2 = 0.005 - 0.5849*AbsDir + 0.4835*AbsDir^2; -// Coefficients calculés pour la formule de la RT -parameter Real alpha30 = -8.5884e-4 + 1.0869*AbsDir - (6.1151e-2)*AbsDir^2; +// Coefficients calculés pour la formule de la RT + parameter Real alpha30 = -8.5884e-4 + 1.0869*AbsDir - (6.1151e-2)*AbsDir^2; parameter Real alpha60 = -1.7566e-3 + 1.2352*AbsDir - (2.7231e-1)*AbsDir^2; parameter Real d1 = 6.4646*AbsDir - 11.7745*alpha30 + 9.4645*alpha60; parameter Real d2 = -20.394*AbsDir + 35.3234*alpha30 - 20.394*alpha60; parameter Real d3 = 14.9294*AbsDir - 23.5489*alpha30 + 10.9295*alpha60; algorithm -cosi :=FluxIncExt[3]; -if choix == 1 then - // Fauconnier - PondAbsDir := if noEvent(cosi>0.05) then max(0,a0/cosi + a1 + a2*cosi) else 0; -elseif choix ==2 then - // RT - PondAbsDir := if noEvent(cosi>0) then d1*cosi + d2*cosi^2 + d3*cosi^3 else 0; -elseif choix ==3 then - // Formule de Cardonnel - PondAbsDir := if noEvent(cosi>0) then (if noEvent(cosi>0.8) then AbsDir else AbsDir*2.5*cosi*(1-0.625*cosi)) else 0; -else - PondAbsDir := if noEvent(cosi>0) then cosi*AbsDir else 0; -end if; - - FluxAbsDir := PondAbsDir*FluxIncExt[2]; - +cosi :=FluxIncExt[3]; + if choix == 1 then + PondAbsDir := if noEvent(cosi > 0.05) then max(0, a0 / cosi + a1 + a2 * cosi) else 0; + elseif choix == 2 then + PondAbsDir := if noEvent(cosi > 0) then d1 * cosi + d2 * cosi ^ 2 + d3 * cosi ^ 3 else 0; + elseif choix == 3 then + PondAbsDir := if noEvent(cosi > 0) then if noEvent(cosi > 0.8) then AbsDir else AbsDir * 2.5 * cosi * (1 - 0.625 * cosi) else 0; + else + PondAbsDir := if noEvent(cosi > 0) then cosi * AbsDir else 0; + end if; +// Fauconnier +// RT +// Formule de Cardonnel + FluxAbsDir := PondAbsDir * FluxIncExt[2]; annotation (Icon(graphics={ Polygon( points={{-80,84},{-85,62},{-74,62},{-80,84}}, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/Irradiation/DirectTrans.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/Irradiation/DirectTrans.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/Irradiation/DirectTrans.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/Irradiation/DirectTrans.mo" 2022-03-10 09:58:34.516151287 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BoundaryConditions.Solar.Irradiation; +within BuildSysPro.BoundaryConditions.Solar.Irradiation; block DirectTrans "Compute the direct solar irradiation transmited through a glazing surface" extends Modelica.Blocks.Icons.Block; @@ -19,39 +19,37 @@ Placement(transformation(extent={{80,-20},{120,20}}), iconTransformation( extent={{100,-8},{120,12}}))); -// Internal variables +// Internal variables protected Real cosi; Real PondTransDir; -// Coefficients calculated for the Fauconnier formula -parameter Real c0 = 0.0139 - 0.1093*TrDir - 0.0079*TrDir^2; + // Coefficients calculated for the Fauconnier formula + parameter Real c0 = 0.0139 - 0.1093*TrDir - 0.0079*TrDir^2; parameter Real c1 = -0.0895 + 0.7662*TrDir + 0.4706*TrDir^2; parameter Real c2 = 0.0751 + 0.3489*TrDir - 0.4563*TrDir^2; -// Coefficients calculated for the RT formula -parameter Real tau30 = -7.068e-4 + TrDir*9.3967e-1 + (TrDir^2)*7.0476e-2; +// Coefficients calculated for the RT formula + parameter Real tau30 = -7.068e-4 + TrDir*9.3967e-1 + (TrDir^2)*7.0476e-2; parameter Real tau60 = -1.6265e-2 + TrDir*6.9767e-1 + (TrDir^2)*2.4509e-1; parameter Real b1 = 6.4646*TrDir - 11.7745*tau30 + 9.4645*tau60; parameter Real b2 = -20.3940*TrDir + 35.3234*tau30 - 20.3940*tau60; parameter Real b3 = 14.9294*TrDir - 23.5489*tau30 + 10.9295*tau60; algorithm -cosi :=FluxIncExt[3]; -if choix == 1 then - // Fauconnier - PondTransDir := if noEvent(cosi>0.05) then max(0,c0/cosi + c1 + c2*cosi) else 0; -elseif choix ==2 then - // RT - PondTransDir := if noEvent(cosi>0) then b1*cosi + b2*cosi^2 + b3*cosi^3 else 0; -elseif choix ==3 then - // Cardonnel formula - PondTransDir := if noEvent(cosi>0) then (if noEvent(cosi>0.8) then TrDir else TrDir*2.5*cosi*(1-0.625*cosi)) else 0; -else - PondTransDir := if noEvent(cosi>0) then cosi*TrDir else 0; -end if; - - FluxTrDir := PondTransDir*FluxIncExt[2]; - +cosi :=FluxIncExt[3]; + if choix == 1 then + PondTransDir := if noEvent(cosi > 0.05) then max(0, c0 / cosi + c1 + c2 * cosi) else 0; + elseif choix == 2 then + PondTransDir := if noEvent(cosi > 0) then b1 * cosi + b2 * cosi ^ 2 + b3 * cosi ^ 3 else 0; + elseif choix == 3 then + PondTransDir := if noEvent(cosi > 0) then if noEvent(cosi > 0.8) then TrDir else TrDir * 2.5 * cosi * (1 - 0.625 * cosi) else 0; + else + PondTransDir := if noEvent(cosi > 0) then cosi * TrDir else 0; + end if; +// Fauconnier +// RT +// Cardonnel formula + FluxTrDir := PondTransDir * FluxIncExt[2]; annotation (Icon(graphics={ Polygon( points={{-80,84},{-85,62},{-74,62},{-80,84}}, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/Irradiation/FLUXsurf.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/Irradiation/FLUXsurf.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/Irradiation/FLUXsurf.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/Irradiation/FLUXsurf.mo" 2022-03-10 09:58:34.492151283 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BoundaryConditions.Solar.Irradiation; +within BuildSysPro.BoundaryConditions.Solar.Irradiation; model FLUXsurf "Calculation of irradiance on a particular surface" parameter Modelica.Units.NonSI.Angle_deg azimut @@ -14,8 +14,7 @@ choice=1 "Isotropic", choice=2 "Circumsolar diffuse model (Hay Davies Kluch Reindl))")); -// Model parameterization: selection of a specific time, of time interval for measurement of fluxes and input data fluxes - +// Model parameterization: selection of a specific time, of time interval for measurement of fluxes and input data fluxes Modelica.Units.SI.HeatFlux DIRH; Modelica.Units.SI.HeatFlux DIRN; Modelica.Units.SI.HeatFlux GLOH; @@ -48,7 +47,7 @@ rotation=90, origin={0,-110}))); -// Internal connector +// Internal connector protected Modelica.Blocks.Interfaces.RealInput Albedo_in_internal "Internal connector required in the case of conditional connection"; @@ -59,24 +58,24 @@ final parameter Real coef3=sin(incl*d2r/2)^3; final parameter Real s=incl*d2r "Surface tilt"; final parameter Real g=azimut*d2r "Orientation"; - // Direction cosines of the plan + // Direction cosines of the plan final parameter Real l=cos(s); final parameter Real m=sin(s)*sin(g); final parameter Real n=sin(s)*cos(g); - //cosi:=max(0,{l,m,n}*CosDir); - // For the HDKR model + //cosi:=max(0,{l,m,n}*CosDir); + // For the HDKR model Real AI "anisotropy index"; Real f "correction factor for the horizon irradiance"; Modelica.Units.SI.HeatFlux I0 "extraterrestrial illumination on a horizontal surface (outside the atmosphere)"; -algorithm - // sin_h and cosi calculations - sin_h := G[6]; //First sun's direction cosine - cosi :=max(0,l*G[6]+m*G[7]+n*G[8]); - // Calculation of parameters for diffuse modelling with the model HDKR - I0 :=max(0, Isc*(1 + 0.033*cos(360*(floor((time + G[5])/86400) + 1)/365))* - sin_h); +algorithm +// sin_h and cosi calculations + sin_h := G[6]; +//First sun's direction cosine + cosi := max(0, l * G[6] + m * G[7] + n * G[8]); +// Calculation of parameters for diffuse modelling with the model HDKR + I0 := max(0, Isc * (1 + 0.033 * cos(360 * (floor((time + G[5]) / 86400) + 1) / 365)) * sin_h); AI :=if noEvent(sin_h > 0) then DIRH/I0 else 0; f :=if noEvent(DIRH > 0 and GLOH > 0) then sqrt(DIRH/GLOH) else 0; @@ -85,24 +84,22 @@ connect(Albedo_in, Albedo_in_internal); if not use_Albedo_in then Albedo_in_internal=albedo; - end if; - //// irradiance CALCULATION -//Direct irradiance calculation: if sin h is negative, direct fluxes are canceled" - {DIFH,DIRN,DIRH,GLOH}=G[1:4]; - - // Vector FLUX on an output inclined surface: diffuse, direct, cosi - DiffusSol = max(0, coef1*GLOH*Albedo_in_internal); + end if; +//// irradiance CALCULATION +//Direct irradiance calculation: if sin h is negative, direct fluxes are canceled" + {DIFH, DIRN, DIRH, GLOH} = G[1:4]; +// Vector FLUX on an output inclined surface: diffuse, direct, cosi + DiffusSol = max(0, coef1 * GLOH * Albedo_in_internal); FluxIncExt[1] = if diffus_isotrope == 1 then max(0, coef2*DIFH) + DiffusSol else max(0, coef2*(1 - AI)*(1 + f*coef3)*DIFH) + DiffusSol; FluxIncExt[2] = if noEvent(sin_h > 0.01) then (if diffus_isotrope == 1 then max(0, cosi)*max(0, DIRN) else max(0, cosi)*max(0, DIRN) + max(0, AI*cosi* - DIFH/sin_h)) else 0; - //To avoid cases with a non-zero direct irradiance when the sun is below the horizon - FluxIncExt[3] = cosi; - //FLUX[4] = FLUX[1]+FLUX[2]; - - //AzHSol[1] = AzHaut[1]; - //AzHSol[2] = AzHaut[2]; + DIFH/sin_h)) else 0; +//To avoid cases with a non-zero direct irradiance when the sun is below the horizon + FluxIncExt[3] = cosi; +//FLUX[4] = FLUX[1]+FLUX[2]; +//AzHSol[1] = AzHaut[1]; +//AzHSol[2] = AzHaut[2]; AzHSol[1] = G[9]; AzHSol[2] = G[10]; AzHSol[3] = DiffusSol; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/Irradiation/FLUXsurfLWRinc.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/Irradiation/FLUXsurfLWRinc.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/Irradiation/FLUXsurfLWRinc.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/Irradiation/FLUXsurfLWRinc.mo" 2022-03-10 09:58:34.472151281 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BoundaryConditions.Solar.Irradiation; +within BuildSysPro.BoundaryConditions.Solar.Irradiation; model FLUXsurfLWRinc "Calculation of global incident irradiance on a particular surface" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/Irradiation/FLUXzone.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/Irradiation/FLUXzone.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/Irradiation/FLUXzone.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/Irradiation/FLUXzone.mo" 2022-03-10 09:58:34.460151279 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BoundaryConditions.Solar.Irradiation; +within BuildSysPro.BoundaryConditions.Solar.Irradiation; model FLUXzone "Calculation of irradiance and illuminance for a zone model" parameter Real albedo=0.2 "Albedo of the environment"; @@ -56,7 +56,7 @@ final parameter Real g[5]={azim_in[i]*d2r for i in 1:5} "Orientation"; final parameter Real coef1[5]={0.5*(1 - cos(s[i]))*albedo for i in 1:5}; final parameter Real coef2[5]={0.5*(1 + cos(s[i])) for i in 1:5}; - // Direction cosines of the plan + // Direction cosines of the plan final parameter Real l[5]={cos(s[i]) for i in 1:5}; final parameter Real m[5]={sin(s[i])*sin(g[i]) for i in 1:5}; final parameter Real n[5]={sin(s[i])*cos(g[i]) for i in 1:5}; @@ -110,26 +110,26 @@ rotation=90, origin={-90,110}))); -algorithm - // sin_h and cosi computations - sin_h :=G[6]; //First direction consine of the solar vector - cosi:={max(0, l[i]*G[6] + m[i]*G[7] + n[i]*G[8]) for i in 1:5}; - -//equation -//// Irradiance computation -//Direct irradiance calculation: if sin h is negative, direct irradiance is canceled" - DIFH:=G[1]; +algorithm +// sin_h and cosi computations + sin_h := G[6]; +//First direction consine of the solar vector + cosi := {max(0, l[i] * G[6] + m[i] * G[7] + n[i] * G[8]) for i in 1:5}; +//equation +//// Irradiance computation +//Direct irradiance calculation: if sin h is negative, direct irradiance is canceled" + DIFH := G[1]; DIRN:=G[2]; DIRH:=G[3]; - GLOH:=G[4]; - - for i in 1:5 loop - // FLUX vector for irradiance on the surfaces: diffuse, direct, cosi - DiffusSol[i] :=max(0, coef1[i]*GLOH); - FLUX[3*i-2] :=max(0, coef2[i]*DIFH) + DiffusSol[i]; - FLUX[3*i-1] :=if noEvent(sin_h > 0.01) then max(0, cosi[i])*DIRN else 0; //To avoid cases with a non-zero direct irradiance when the sun is below the horizon - FLUX[3*i] :=cosi[i]; - end for; + GLOH:=G[4]; + for i in 1:5 loop + DiffusSol[i] := max(0, coef1[i] * GLOH); + FLUX[3 * i - 2] := max(0, coef2[i] * DIFH) + DiffusSol[i]; + FLUX[3 * i - 1] := if noEvent(sin_h > 0.01) then max(0, cosi[i]) * DIRN else 0; + FLUX[3 * i] := cosi[i]; + end for; +// FLUX vector for irradiance on the surfaces: diffuse, direct, cosi +//To avoid cases with a non-zero direct irradiance when the sun is below the horizon FluxIncExtRoof := FLUX[1:3]; FluxIncExtNorth := FLUX[4:6]; FluxIncExtSouth := FLUX[7:9]; @@ -137,8 +137,7 @@ FluxIncExtWest := FLUX[13:15]; equation - - //Computation of natural illuminance (French building regulation RT2012) +//Computation of natural illuminance (French building regulation RT2012) Idn=DIRN; Idi=DIFH; gamma=G[10]*pi/180; @@ -152,7 +151,7 @@ end if; algorithm - // Computation of illuminance (direct, diffuse and reflected) without shading +// Computation of illuminance (direct, diffuse and reflected) without shading phi:=G[9]*pi/180; for i in 1:5 loop teta[i]:=min(pi/2, acos(cos(gamma)*sin(incl[i]*pi/180)*cos(phi - azim[i]*pi/180)+ sin(gamma)*cos(incl[i]*pi/180))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/Irradiation/LightTransCoeff.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/Irradiation/LightTransCoeff.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/Irradiation/LightTransCoeff.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/Irradiation/LightTransCoeff.mo" 2022-03-10 09:58:34.436151276 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BoundaryConditions.Solar.Irradiation; +within BuildSysPro.BoundaryConditions.Solar.Irradiation; model LightTransCoeff "Calculation of direct and global light transmittance throught a window" @@ -38,73 +38,84 @@ iconTransformation(extent={{60,26},{86,52}}))); equation -if (L>0 and H>0) then - - //Calculation of form coefficient characterizing the bay window (formula 7 of Th-L rules) - K=L*H/(e*(L+H)); - - //Computation of correction coefficients - //Share of the total direct incident radiation on the bay window (table 9 of Th-L rules) - if azimut==0 then - R_dir=0.5; - else if azimut==90 then - R_dir=0.4; - else if azimut==-90 then - R_dir=0.4; - else R_dir=0.05; - end if; - end if; - end if; - - //Correction coefficients associated with the integration to work (Tables 10 and 11 of Th-L Rules) -if MasqueProche==false then - if K<=1 then - Fbati_dif=0.5; - if azimut==0 then - Fbati_dir=0.45; - else if azimut==90 then - Fbati_dir=0.55; - else if azimut==-90 then - Fbati_dir=0.55; - else Fbati_dir=0.15; - end if; - end if; - end if; -else if K<5 then - Fbati_dif=0.7; - if azimut==0 then - Fbati_dir=0.70; - else if azimut==90 then - Fbati_dir=0.75; - else if azimut==-90 then - Fbati_dir=0.75; - else Fbati_dir=0.30; - end if; - end if; - end if; -else Fbati_dif=0.85; - if azimut==0 then - Fbati_dir=0.85; - else if azimut==90 then - Fbati_dir=0.90; - else if azimut==-90 then - Fbati_dir=0.90; - else Fbati_dir=0.60; - end if; - end if; - end if; - end if; +if (L>0 and H>0) then +//Calculation of form coefficient characterizing the bay window (formula 7 of Th-L rules) + K = L * H / (e * (L + H)); +//Computation of correction coefficients +//Share of the total direct incident radiation on the bay window (table 9 of Th-L rules) + if azimut == 0 then + R_dir = 0.5; + else + if azimut == 90 then + R_dir = 0.4; + else + if azimut == (-90) then + R_dir = 0.4; + else + R_dir = 0.05; + end if; + end if; + end if; +//Correction coefficients associated with the integration to work (Tables 10 and 11 of Th-L Rules) + if MasqueProche == false then + if K <= 1 then + Fbati_dif = 0.5; + if azimut == 0 then + Fbati_dir = 0.45; + else + if azimut == 90 then + Fbati_dir = 0.55; + else + if azimut == (-90) then + Fbati_dir = 0.55; + else + Fbati_dir = 0.15; + end if; + end if; + end if; + else + if K < 5 then + Fbati_dif = 0.7; + if azimut == 0 then + Fbati_dir = 0.70; + else + if azimut == 90 then + Fbati_dir = 0.75; + else + if azimut == (-90) then + Fbati_dir = 0.75; + else + Fbati_dir = 0.30; + end if; + end if; + end if; + else + Fbati_dif = 0.85; + if azimut == 0 then + Fbati_dir = 0.85; + else + if azimut == 90 then + Fbati_dir = 0.90; + else + if azimut == (-90) then + Fbati_dir = 0.90; + else + Fbati_dir = 0.60; + end if; + end if; + end if; + end if; + end if; + else + Fbati_dir = 1; + Fbati_dif = 1; + end if; +//Correction coefficients related to the variable incidence (Table 18 of Th-L Rules) + if K < 1.5 then + k = 1; + else + k = 0; end if; -else -Fbati_dir=1; -Fbati_dif=1; -end if; - - //Correction coefficients related to the variable incidence (Table 18 of Th-L Rules) - if K<1.5 then - k=1; - else k=0; - end if; if Protection==true then l=1; else l=0; @@ -115,17 +126,16 @@ Friv_dif=1; else Friv_dir=0.95; Friv_dif=0.95; - end if; - - //Light transmission coefficients with and without sun protection (formula 1,2,3 and 4 of Th-L Rules) - CoeffTransLum[1]=(R_dir*Fbati_dir*Friv_dir+(1-R_dir)*Fbati_dif*Friv_dif)*TLw; + end if; +//Light transmission coefficients with and without sun protection (formula 1,2,3 and 4 of Th-L Rules) + CoeffTransLum[1] = (R_dir * Fbati_dir * Friv_dir + (1 - R_dir) * Fbati_dif * Friv_dif) * TLw; CoeffTransLum[2]=(R_dir*Fbati_dir*Friv_dir+(1-R_dir)*Fbati_dif*Friv_dif)*TLw_dif; CoeffTransLum[3]=(R_dir*Fbati_dir*Friv_dir+(1-R_dir)*Fbati_dif*Friv_dif)*TLws; CoeffTransLum[4]=(R_dir*Fbati_dir*Friv_dir+(1-R_dir)*Fbati_dif*Friv_dif)*TLws_dif; -else - //Window dimensions are null - K=0; +else +//Window dimensions are null + K = 0; Fbati_dir=0; Fbati_dif=0; Friv_dir=0; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/Irradiation/NaturalIlluminance.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/Irradiation/NaturalIlluminance.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/Irradiation/NaturalIlluminance.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/Irradiation/NaturalIlluminance.mo" 2022-03-10 09:58:34.416151273 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BoundaryConditions.Solar.Irradiation; +within BuildSysPro.BoundaryConditions.Solar.Irradiation; model NaturalIlluminance "Natural illuminance transmitted to a zone" parameter Real S_gr=100 "Total surface of the group (m²)"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/Irradiation/SolarBC.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/Irradiation/SolarBC.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/Irradiation/SolarBC.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/Irradiation/SolarBC.mo" 2022-03-10 09:58:34.376151269 +0000 @@ -1,6 +1,6 @@ -within BuildSysPro.BoundaryConditions.Solar.Irradiation; +within BuildSysPro.BoundaryConditions.Solar.Irradiation; model SolarBC "Calculation of solar irradiation for a building model" - // Parameters section + // Parameters section parameter Modelica.Units.SI.Area[5] SurfacesVitrees "Glazed surface areas (Ceiling, North, South, East, West)" annotation (Dialog(group="Glazing")); @@ -18,7 +18,7 @@ "Zone orientation azimut=beta+azimut, (if beta=0 : azimut={N=180,S=0,E=-90,O=90})"; parameter Real albedo=0.2 "Albedo of the environment"; - // Public components +// Public components BuildSysPro.BoundaryConditions.Solar.Interfaces.SolarFluxOutput FluxIncWall "Surface incident solar flux on external walls" annotation (Placement(transformation( extent={{60,50},{100,90}}), iconTransformation(extent={{80,-70},{100, @@ -32,7 +32,7 @@ annotation (Placement(transformation(extent={{60,-90},{100,-50}}), iconTransformation(extent={{80,70},{100,90}}))); -// Internal components +// Internal components protected BuildSysPro.BoundaryConditions.Solar.Irradiation.FLUXzone fLUXzone(albedo= albedo, beta=beta) @@ -89,13 +89,10 @@ annotation (Placement(transformation(extent={{-119,69},{-79,109}}, rotation=0), iconTransformation(extent={{-99,69},{-79,89}}))); -equation - // Calculation of irradiance transmitted through the glazed surfaces - connect(fLUXzone.FluxIncExtNorth, transDirectNord.FluxIncExt) annotation ( - Line( - points={{-43.8,7.24},{-24,7.24},{-24,-57.6},{-1,-57.6}}, - color={255,192,1}, - smooth=Smooth.None)); +equation +// Calculation of irradiance transmitted through the glazed surfaces + connect(fLUXzone.FluxIncExtNorth, transDirectNord.FluxIncExt) annotation( + Line(points = {{-43.8, 7.24}, {-24, 7.24}, {-24, -57.6}, {-1, -57.6}}, color = {255, 192, 1}, smooth = Smooth.None)); connect(fLUXzone.FluxIncExtSouth, transDirectSud.FluxIncExt) annotation (Line( points={{-43.8,-1.12},{-24,-1.12},{-24,-81.6},{-1,-81.6}}, color={255,192,1}, @@ -183,12 +180,10 @@ annotation (Line( points={{51,-136},{56,-136},{56,-73.36},{60,-73.36}}, color={0,0,127}, - smooth=Smooth.None)); - // Calculation of irradiance absorbed by the glazed surfaces - connect(multiSumAbsVitrages.y,FluxIncGlazing) annotation (Line( - points={{73.02,0},{80,0}}, - color={0,0,127}, - smooth=Smooth.None)); + smooth=Smooth.None)); +// Calculation of irradiance absorbed by the glazed surfaces + connect(multiSumAbsVitrages.y, FluxIncGlazing) annotation( + Line(points = {{73.02, 0}, {80, 0}}, color = {0, 0, 127}, smooth = Smooth.None)); connect(fLUXzone.FluxIncExtRoof[1], multiSumAbsVitrages.u[1]) annotation ( Line( points={{-43.8,15.0133},{40,15.0133},{40,3.78},{60,3.78}}, @@ -239,13 +234,10 @@ Line( points={{-43.8,-18.72},{-24,-18.72},{-24,-10},{40,-10},{40,-3.78},{60,-3.78}}, color={255,192,1}, - smooth=Smooth.None)); - - // Calculation of irradiance absorbed by external walls - connect(multiSumAbsParois.y, FluxIncWall) annotation (Line( - points={{73.02,70},{80,70}}, - color={0,0,127}, - smooth=Smooth.None)); + smooth=Smooth.None)); +// Calculation of irradiance absorbed by external walls + connect(multiSumAbsParois.y, FluxIncWall) annotation( + Line(points = {{73.02, 70}, {80, 70}}, color = {0, 0, 127}, smooth = Smooth.None)); connect(fLUXzone.FluxIncExtRoof[1], multiSumAbsParois.u[1]) annotation (Line( points={{-43.8,15.0133},{-24,15.0133},{-24,96},{40,96},{40,73.78},{60, 73.78}}, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/SolarMasks/FLUXsurfMask.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/SolarMasks/FLUXsurfMask.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/SolarMasks/FLUXsurfMask.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/SolarMasks/FLUXsurfMask.mo" 2022-03-10 09:58:34.324151261 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BoundaryConditions.Solar.SolarMasks; +within BuildSysPro.BoundaryConditions.Solar.SolarMasks; model FLUXsurfMask "Solar incident irradiance and illuminance on a surface considering solar mask" parameter Boolean useEclairement=false diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/SolarMasks/FullMask.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/SolarMasks/FullMask.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/SolarMasks/FullMask.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/SolarMasks/FullMask.mo" 2022-03-10 09:58:34.304151259 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BoundaryConditions.Solar.SolarMasks; +within BuildSysPro.BoundaryConditions.Solar.SolarMasks; function FullMask "Calculation of the sunny area for the full mask (horizontal+vertical)" @@ -25,37 +25,35 @@ constant Real Convert=Modelica.Constants.pi/180 "Conversion factor degrees->radians"; -algorithm - //Calculation of Y0 - Y0 := Av * tan(HauteurSoleil*Convert)/cos((azimut-AzimutSoleil)*Convert); +algorithm +//Calculation of Y0 + Y0 := Av * tan(HauteurSoleil * Convert) / cos((azimut - AzimutSoleil) * Convert); if Y0 <= Ha then Y0 := Ha; end if; if Y0 >= Ha+Hf then Y0 := Ha+Hf; + end if; +//Calculation of X0 + if AzimutSoleil <= azimut then + X0 := Av * tan((azimut - AzimutSoleil) * Convert); + if X0 <= Dg then + X0 := Dg; + end if; + if X0 >= Dg + Lf then + X0 := Dg + Lf; + end if; + A0 := (Lf + Dg - X0) * (Ha + Hf - Y0); + else + X0 := Av * tan((AzimutSoleil - azimut) * Convert); + if X0 <= Dd then + X0 := Dd; + end if; + if X0 >= Dd + Lf then + X0 := Dd + Lf; + end if; + A0 := (Lf + Dd - X0) * (Ha + Hf - Y0); end if; - - //Calculation of X0 - if AzimutSoleil<=azimut then - X0 :=Av * tan((azimut-AzimutSoleil)*Convert); - if X0 <= Dg then - X0 := Dg; - end if; - if X0 >= Dg + Lf then - X0 := Dg + Lf; - end if; - A0 := (Lf+Dg-X0)*(Ha+Hf-Y0); - else - X0 :=Av * tan((AzimutSoleil-azimut)*Convert); - if X0 <= Dd then - X0 := Dd; - end if; - if X0 >= Dd + Lf then - X0 := Dd + Lf; - end if; - A0 := (Lf+Dd-X0)*(Ha+Hf-Y0); - end if; - annotation (Documentation(info="

Calculation of the sunny share of a surface considering shading devices

diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/SolarMasks/HorizontalMask.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/SolarMasks/HorizontalMask.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/SolarMasks/HorizontalMask.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/SolarMasks/HorizontalMask.mo" 2022-03-10 09:58:34.292151257 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BoundaryConditions.Solar.SolarMasks; +within BuildSysPro.BoundaryConditions.Solar.SolarMasks; function HorizontalMask "Calculation of the sunny area for an horizontal shading device" @@ -37,8 +37,8 @@ Boolean continue=true "True while the good case is not found"; Real b; -// Intersections with the vertical and horizontal edges -Real Yi0; +// Intersections with the vertical and horizontal edges + Real Yi0; Real YiL; Real Xi0; Real XiH; @@ -46,126 +46,115 @@ "Intermediate Size - intersection of the other overhang for case 1 discrimination"; algorithm - Phi := AzimutSoleil-azimut; //Beware if Phi = 0 => M=0 => shape of the shadow determined according to the value of T - DebordGauche := if (Phi < 0) then true else false; + Phi := AzimutSoleil-azimut; +//Beware if Phi = 0 => M=0 => shape of the shadow determined according to the value of T + DebordGauche := if Phi < 0 then true else false; T := Av * tan(HauteurSoleil*Convert)/cos(Phi*Convert); - M := Av * tan(Phi*Convert); - -// First cases determined if Phi = 0 -if (not (M<>0)) then - continue := false; - // Particular cases 1,2 or 3 - if (T >= Ha+Hf) then - Cas := 2; - elseif (T <= Ha) then - Cas := 1; - else - Cas := 3; + M := Av * tan(Phi*Convert); +// First cases determined if Phi = 0 + if not M <> 0 then + continue := false; + if T >= Ha + Hf then + Cas := 2; + elseif T <= Ha then + Cas := 1; + else + Cas := 3; + end if; + end if; +// Particular cases 1,2 or 3 +//Cases determined through the knowledge of the horizontal mask corner projection coordinates in the direction of light rays + if DebordGauche == true then + b := Dg; + Xdeb := Lf + Dg; + else + b := Dd; + Xdeb := -Dd; end if; -end if; - -//Cases determined through the knowledge of the horizontal mask corner projection coordinates in the direction of light rays -if DebordGauche==true then - b := Dg; - Xdeb := Lf +Dg; -else - b := Dd; - Xdeb:= -Dd; -end if; Ydeb := Ha + Hf; X0 := Xdeb + M; -Y0 := Ydeb - T; - -if (continue == true) then - //Calculation of the coordinates (X,Y) of the intersection between the incident ray from (Xdeb,Ydeb) and the edges of the window - //Calculation of Y coordinates of the intersection with the window edge x=0 - Yi0 :=Ydeb+T*Xdeb/M; - // Calculation of Y coordinates of the intersection with the window edge x=Lf - YiL :=Ydeb+(T/M)*(Xdeb-Lf); - // Calculation of X coordinates of the intersection with the window edge y=0 - Xi0 :=Xdeb+M*Ydeb/T; - // Calculation of X coordinates of the intersection with the window edge y=Hf - XiH :=Xdeb+(M/T)*Ha; - - // Cases 4 & 7 depending if 0 belongs to the glazing or not - Inclus :=BuildSysPro.BoundaryConditions.Solar.SolarMasks.PointOnSurface( - Lf=Lf, - Hf=Hf, - X0=X0, - Y0=Y0); - - if (Inclus == true) then - continue := false; - // Case 4 or 7 - if ((XiH>=0) and (XiH<=Lf)) then - Cas := 4; - else - Cas := 7; - end if; - end if; -end if; - -// Case 1 discrimination -if (continue == true) then - X2iH := if DebordGauche then (M/T)*Ha-Dd else (M/T)*Ha+Dg+Lf; - if ((T<=Ha) or ((not DebordGauche) and X2iH >=Lf and XiH >=Lf) or (DebordGauche and X2iH <=0 and XiH <=0)) then - continue := false; - Cas := 1; - end if; -end if; - -// Cases 2,3,5,6,8,9 -if (continue == true) then - if (XiH >=0 and XiH <=Lf) then - //Case 5 or 6 - if (Xi0 >=0 and Xi0 <=Lf) then - Cas := 5; - else - Cas := 6; - end if; - else - //Cases 2,3,8,9 - if (Yi0 >=0 and Yi0 <=Hf) and (YiL >=0 and YiL <=Hf) and ((DebordGauche and X0<=0) or ((not DebordGauche) and X0 >=Lf)) then - Cas := 9; - else - //Cases 2,3,8 - if (Y0 >=0 and Y0 <=Hf) then - Cas := 3; - else - if (Xi0 >=0 and Xi0 <=Lf) then - Cas := 8; - else - Cas := 2; - end if; - end if; - end if; - end if; -end if; - -////// Calculation of shadow area (A0) and sunny area (Asol) -M := abs(M); // For following areas formulas the absolute value of M is taken -if Cas == 1 then - A0 := 0; -elseif Cas == 2 then - A0 := Hf*Lf; -elseif Cas == 3 then - A0 := Lf*(T-Ha); -elseif Cas == 4 then - A0 := (T-Ha)*(Lf+b-M*0.5*(1+Ha/T)); -elseif Cas == 5 then - A0 := Hf*(Lf+b-(Ha+0.5*Hf)*M/T); -elseif Cas == 6 then - A0 := ((((Lf+b)*T/M)-Ha)^2)*0.5*M/T; -elseif Cas == 7 then - A0 := (T-Ha)*Lf-((M-b)^2)*T*0.5/M; -elseif Cas == 8 then - A0 := Hf*Lf-0.5*(T/M)*(M*(Ha+Hf)/T-b)^2; -else //Cas 9 - A0 := Lf*((b+0.5*Lf)*T/M-Ha); -end if; - -Asol := Hf*Lf - A0; - +Y0 := Ydeb - T; + if continue == true then + Yi0 := Ydeb + T * Xdeb / M; + YiL := Ydeb + T / M * (Xdeb - Lf); + Xi0 := Xdeb + M * Ydeb / T; + XiH := Xdeb + M / T * Ha; + Inclus := BuildSysPro.BoundaryConditions.Solar.SolarMasks.PointOnSurface(Lf = Lf, Hf = Hf, X0 = X0, Y0 = Y0); + if Inclus == true then + continue := false; + if XiH >= 0 and XiH <= Lf then + Cas := 4; + else + Cas := 7; + end if; + end if; + end if; +//Calculation of the coordinates (X,Y) of the intersection between the incident ray from (Xdeb,Ydeb) and the edges of the window +//Calculation of Y coordinates of the intersection with the window edge x=0 +// Calculation of Y coordinates of the intersection with the window edge x=Lf +// Calculation of X coordinates of the intersection with the window edge y=0 +// Calculation of X coordinates of the intersection with the window edge y=Hf +// Cases 4 & 7 depending if 0 belongs to the glazing or not +// Case 4 or 7 +// Case 1 discrimination + if continue == true then + X2iH := if DebordGauche then M / T * Ha - Dd else M / T * Ha + Dg + Lf; + if T <= Ha or not DebordGauche and X2iH >= Lf and XiH >= Lf or DebordGauche and X2iH <= 0 and XiH <= 0 then + continue := false; + Cas := 1; + end if; + end if; +// Cases 2,3,5,6,8,9 + if continue == true then + if XiH >= 0 and XiH <= Lf then + if Xi0 >= 0 and Xi0 <= Lf then + Cas := 5; + else + Cas := 6; + end if; + else + if Yi0 >= 0 and Yi0 <= Hf and YiL >= 0 and YiL <= Hf and (DebordGauche and X0 <= 0 or not DebordGauche and X0 >= Lf) then + Cas := 9; + else + if Y0 >= 0 and Y0 <= Hf then + Cas := 3; + else + if Xi0 >= 0 and Xi0 <= Lf then + Cas := 8; + else + Cas := 2; + end if; + end if; + end if; + end if; + end if; +//Case 5 or 6 +//Cases 2,3,8,9 +//Cases 2,3,8 +////// Calculation of shadow area (A0) and sunny area (Asol) + M := abs(M); +// For following areas formulas the absolute value of M is taken + if Cas == 1 then + A0 := 0; + elseif Cas == 2 then + A0 := Hf * Lf; + elseif Cas == 3 then + A0 := Lf * (T - Ha); + elseif Cas == 4 then + A0 := (T - Ha) * (Lf + b - M * 0.5 * (1 + Ha / T)); + elseif Cas == 5 then + A0 := Hf * (Lf + b - (Ha + 0.5 * Hf) * M / T); + elseif Cas == 6 then + A0 := ((Lf + b) * T / M - Ha) ^ 2 * 0.5 * M / T; + elseif Cas == 7 then + A0 := (T - Ha) * Lf - (M - b) ^ 2 * T * 0.5 / M; + elseif Cas == 8 then + A0 := Hf * Lf - 0.5 * (T / M) * (M * (Ha + Hf) / T - b) ^ 2; + else + A0 := Lf * ((b + 0.5 * Lf) * T / M - Ha); + end if; +//Cas 9 + Asol := Hf * Lf - A0; annotation (Documentation(info="

Function inspired by calculation of overhang effects described in ISO 13791 standard

Hypothesis and equations

diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/SolarMasks/Masks.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/SolarMasks/Masks.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/SolarMasks/Masks.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/SolarMasks/Masks.mo" 2022-03-10 09:58:34.268151255 +0000 @@ -1,9 +1,9 @@ -within BuildSysPro.BoundaryConditions.Solar.SolarMasks; +within BuildSysPro.BoundaryConditions.Solar.SolarMasks; model Masks "Base model - Solar incident irradiance and illuminance on a surface considering solar mask" -// Paramètres propres au masque -parameter Boolean useEclairement=false +// Paramètres propres au masque + parameter Boolean useEclairement=false annotation(choices(choice=true "With calculation of natural lighting", choice=false "Without calculation of natural lighting", radioButtons=true), Dialog(group="Options")); parameter Modelica.Units.NonSI.Angle_deg azimut=0 @@ -81,64 +81,50 @@ AzimutSoleil:=AzHSol[1]; HauteurSoleil:=AzHSol[2]; -DiffusSol:=AzHSol[3]; - -if TypeMasque==0 then - - //Full mask - if noEvent(abs(azimut-AzimutSoleil)>=90) or (noEvent(HauteurSoleil<=0)) then - A0:=0; - else - A0 :=BuildSysPro.BoundaryConditions.Solar.SolarMasks.FullMask( - Av=Av, - Ha=Ha, - Lf=Lf, - Hf=Hf, - Dd=Dd, - Dg=Dg, - AzimutSoleil=AzimutSoleil, - HauteurSoleil=HauteurSoleil, - azimut=azimut); - FacMasqueDir:= A0/(Lf*Hf); +DiffusSol:=AzHSol[3]; + if TypeMasque == 0 then + if noEvent(abs(azimut - AzimutSoleil) >= 90) or noEvent(HauteurSoleil <= 0) then + A0 := 0; + else + A0 := BuildSysPro.BoundaryConditions.Solar.SolarMasks.FullMask(Av = Av, Ha = Ha, Lf = Lf, Hf = Hf, Dd = Dd, Dg = Dg, AzimutSoleil = AzimutSoleil, HauteurSoleil = HauteurSoleil, azimut = azimut); + FacMasqueDir := A0 / (Lf * Hf); + end if; + FacMasqueDif := (Dd + Lf + Dg) * (Ha + Hf) / ((Dd + Lf + Dg) * (Ha + Hf) + (Dd + Lf + Dg) * Av + 2 * (Hf + Ha) * Av); + else + if TypeMasque == 1 then + if noEvent(abs(azimut - AzimutSoleil) >= 90) or noEvent(HauteurSoleil <= 0) then + A0 := 0; + else + A0 := BuildSysPro.BoundaryConditions.Solar.SolarMasks.HorizontalMask(Av = Av, Ha = Ha, Lf = Lf, Hf = Hf, Dd = Dd, Dg = Dg, AzimutSoleil = AzimutSoleil, HauteurSoleil = HauteurSoleil, azimut = azimut); + FacMasqueDir := A0 / (Lf * Hf); + end if; + FacMasqueDif := ((Dd + Lf + Dg) * (Ha + Hf) + 2 * Av * (Ha + Hf)) / ((Dd + Lf + Dg) * (Ha + Hf) + (Dd + Lf + Dg) * Av + 2 * (Hf + Ha) * Av); + else + FacMasqueDir := 1; + FacMasqueDif := 1; + end if; + end if; +//Full mask +//Horizontal mask +//FacMasqueDir:= min(max(0,1-(max(0,Av*tan(HauteurSoleil*Convert)/cos((AzimutSoleil-azimut)*Convert))-Ha)/Hf),1); //Formule RT2012 +//FacMasqueDif:=(2/Modelica.Constants.pi)*atan((Ha+Hf/2)/Av); //Formule RT2012 +//Distant mask defined by a vertical plan + if MasqueLointain == true and cos((AzimutSoleil - azimut) * pi / 180) > 10 ^ (-5) then + if hpE > 0 then + if dE * tan(HauteurSoleil * pi / 180) / cos((AzimutSoleil - azimut) * pi / 180) > hpE then + FE_dir := 1; + else + FE_dir := 0; + end if; + else + FE_dir := 1; + end if; + else + FE_dir := 1; end if; - FacMasqueDif:=(Dd+Lf+Dg)*(Ha+Hf)/((Dd+Lf+Dg)*(Ha+Hf)+(Dd+Lf+Dg)*Av+2*(Hf+Ha)*Av); -else if TypeMasque==1 then - //Horizontal mask - if noEvent(abs(azimut-AzimutSoleil)>=90) or (noEvent(HauteurSoleil<=0)) then - A0:=0; - else - A0 :=BuildSysPro.BoundaryConditions.Solar.SolarMasks.HorizontalMask( - Av=Av, - Ha=Ha, - Lf=Lf, - Hf=Hf, - Dd=Dd, - Dg=Dg, - AzimutSoleil=AzimutSoleil, - HauteurSoleil=HauteurSoleil, - azimut=azimut); - FacMasqueDir:= A0/(Lf*Hf); - //FacMasqueDir:= min(max(0,1-(max(0,Av*tan(HauteurSoleil*Convert)/cos((AzimutSoleil-azimut)*Convert))-Ha)/Hf),1); //Formule RT2012 - end if; - FacMasqueDif:=((Dd+Lf+Dg)*(Ha+Hf)+2*Av*(Ha+Hf))/((Dd+Lf+Dg)*(Ha+Hf)+(Dd+Lf+Dg)*Av+2*(Hf+Ha)*Av); - //FacMasqueDif:=(2/Modelica.Constants.pi)*atan((Ha+Hf/2)/Av); //Formule RT2012 -else - FacMasqueDir:=1; - FacMasqueDif:=1; -end if; -end if; - -//Distant mask defined by a vertical plan -if MasqueLointain==true and cos((AzimutSoleil-azimut)*pi/180)>10^(-5) then //if distant mask and sun entry in the considered plan - if hpE>0 then - if (dE*tan(HauteurSoleil*pi/180)/cos((AzimutSoleil-azimut)*pi/180))>hpE then FE_dir:=1;else FE_dir:=0;end if; - else FE_dir:=1; - end if; -else FE_dir:=1; - end if; - +//if distant mask and sun entry in the considered plan equation - //Vector FLUX on a glazing with close mask / output: diffuse, direct, cosi +//Vector FLUX on a glazing with close mask / output: diffuse, direct, cosi FluxMasques[1] =((FluxIncExt[1] - DiffusSol)*FacMasqueDif + DiffusSol)*FE_dir; FluxMasques[2] =FacMasqueDir*FluxIncExt[2]; FluxMasques[3] =FluxIncExt[3]; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/SolarMasks/PointOnSurface.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/SolarMasks/PointOnSurface.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/SolarMasks/PointOnSurface.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/SolarMasks/PointOnSurface.mo" 2022-03-10 09:58:34.232151251 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BoundaryConditions.Solar.SolarMasks; +within BuildSysPro.BoundaryConditions.Solar.SolarMasks; function PointOnSurface "Function to determine if a point belongs to a surface" input Modelica.Units.SI.Distance Lf "Surface width"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/SolarMasks/package.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/SolarMasks/package.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/SolarMasks/package.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/SolarMasks/package.mo" 2022-03-10 09:58:34.328151262 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BoundaryConditions.Solar; +within BuildSysPro.BoundaryConditions.Solar; package SolarMasks "Package contenant des modèles de masques solaires" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/Utilities/CosDirSunVector.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/Utilities/CosDirSunVector.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/Utilities/CosDirSunVector.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/Utilities/CosDirSunVector.mo" 2022-03-10 09:58:34.220151248 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BoundaryConditions.Solar.Utilities; +within BuildSysPro.BoundaryConditions.Solar.Utilities; function CosDirSunVector "Sun's direction cosines" input Real t0=0 "Time in seconds at t=0"; input Modelica.Units.SI.Time t "Universal time in seconds"; @@ -10,20 +10,20 @@ constant Real d2r=pi/180; constant Real w=2*pi/365.25; Real d=mod((t+t0)/86400,365)+1; -// Real d=mod(integer(t+t0)/86400,365); + // Real d=mod(integer(t+t0)/86400,365); Real wd1=w*d; Real wd2=2*wd1; Real wd3=3*wd1; - // Sun declination in radians + // Sun declination in radians Real delta= (0.302 - 22.93*cos(wd1) - 0.229*cos(wd2) - 0.243*cos(wd3) + 3.851*sin(wd1) + 0.002*sin(wd2) - 0.055*sin(wd3))*d2r; - // Equation of time in hours + // Equation of time in hours Real ET = 0.128*sin(w*(d-2)) + 0.164*sin(2*w*(d+10)); - // Real solar time in radians + // Real solar time in radians Real TSV= (t+t0)/3600+longitude/15-ET; - // Hour angle + // Hour angle Real AH= (TSV-12)*pi/12; - // Latitude in radians + // Latitude in radians Real phi=latitude*d2r; algorithm CosDir[1]:=sin(phi)*sin(delta)+cos(phi)*cos(delta)*cos(AH) "=CosV=SinH"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/Utilities/CosDirSunVectorHeightAz.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/Utilities/CosDirSunVectorHeightAz.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/Utilities/CosDirSunVectorHeightAz.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/Utilities/CosDirSunVectorHeightAz.mo" 2022-03-10 09:58:34.208151247 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BoundaryConditions.Solar.Utilities; +within BuildSysPro.BoundaryConditions.Solar.Utilities; function CosDirSunVectorHeightAz "Compute the sun's direction cosine, the solar elevation and azimuth angle" @@ -14,20 +14,20 @@ constant Real d2r=pi/180; constant Real w=2*pi/365.25; Real d=mod((t+t0)/86400,365)+1; -// Real d=mod(integer(t+t0)/86400,365); + // Real d=mod(integer(t+t0)/86400,365); Real wd1=w*d; Real wd2=2*wd1; Real wd3=3*wd1; - // Sun's declination in radians + // Sun's declination in radians Real delta= (0.302 - 22.93*cos(wd1) - 0.229*cos(wd2) - 0.243*cos(wd3) + 3.851*sin(wd1) + 0.002*sin(wd2) - 0.055*sin(wd3))*d2r; - // Equation of time in hours + // Equation of time in hours Real ET = 0.128*sin(w*(d-2)) + 0.164*sin(2*w*(d+10)); - // Real Solar Time in hours + // Real Solar Time in hours Real TSV= (t+t0)/3600+longitude/15-ET; - // Hour Angle + // Hour Angle Real AH= (TSV-12)*pi/12; - // Latitude in radians + // Latitude in radians Real phi=latitude*d2r; Real cosh; Real sinAz; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/Utilities/CosI.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/Utilities/CosI.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/Utilities/CosI.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/Utilities/CosI.mo" 2022-03-10 09:58:34.196151245 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BoundaryConditions.Solar.Utilities; +within BuildSysPro.BoundaryConditions.Solar.Utilities; function CosI "Cosine of the angle of incidence" input Modelica.Units.NonSI.Angle_deg azimut "Surface azimuth in degree"; input Modelica.Units.NonSI.Angle_deg incl "Surface tilt in degree"; @@ -8,12 +8,12 @@ constant Real d2r=Modelica.Constants.pi/180; Real s=incl*d2r "Tilt"; Real g=azimut*d2r "Orientation"; - // Direction cosines of the plane + // Direction cosines of the plane Real l=cos(s); Real m=sin(s)*sin(g); Real n=sin(s)*cos(g); algorithm - //cosi:=max(0,l*CosDir[1]+m*CosDir[2]+n*CosDir[3]); +//cosi:=max(0,l*CosDir[1]+m*CosDir[2]+n*CosDir[3]); cosi:=max(0,{l,m,n}*CosDir); annotation (Documentation(info=" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/Utilities/HourAngle.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/Utilities/HourAngle.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/Utilities/HourAngle.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/Utilities/HourAngle.mo" 2022-03-10 09:58:34.188151245 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BoundaryConditions.Solar.Utilities; +within BuildSysPro.BoundaryConditions.Solar.Utilities; function HourAngle "Hour Angle (HA)" input Modelica.Units.SI.Time t0=0 "Time in seconds at t=0"; input Modelica.Units.SI.Time t "Universal time in seconds"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/Utilities/SineH.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/Utilities/SineH.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/Utilities/SineH.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/Utilities/SineH.mo" 2022-03-10 09:58:34.184151244 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BoundaryConditions.Solar.Utilities; +within BuildSysPro.BoundaryConditions.Solar.Utilities; function SineH "Sine of the solar elevation angle" input Real t0=0 "Time in seconds at t=0"; input Modelica.Units.SI.Time t "Universal time in seconds"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/Utilities/SunDeclination.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/Utilities/SunDeclination.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/Utilities/SunDeclination.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/Utilities/SunDeclination.mo" 2022-03-10 09:58:34.176151243 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BoundaryConditions.Solar.Utilities; +within BuildSysPro.BoundaryConditions.Solar.Utilities; function SunDeclination "Sun declination" input Real t0=0 "Time in seconds at t=0"; input Modelica.Units.SI.Time t "Time in seconds"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/Utilities/TimeEquation.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/Utilities/TimeEquation.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/Utilities/TimeEquation.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/Utilities/TimeEquation.mo" 2022-03-10 09:58:34.172151242 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BoundaryConditions.Solar.Utilities; +within BuildSysPro.BoundaryConditions.Solar.Utilities; function TimeEquation "Equation of time" input Real t0=0 "Time in seconds at t=0"; input Modelica.Units.SI.Time t "Time in seconds"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/Utilities/TimeEquationClim2000.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/Utilities/TimeEquationClim2000.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/Utilities/TimeEquationClim2000.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Solar/Utilities/TimeEquationClim2000.mo" 2022-03-10 09:58:34.164151241 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BoundaryConditions.Solar.Utilities; +within BuildSysPro.BoundaryConditions.Solar.Utilities; function TimeEquationClim2000 "Equation of time" input Real t0=0 "Time in seconds at t=0"; input Modelica.Units.SI.Time t "Time in seconds"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Weather/AnalyticIrradiance.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Weather/AnalyticIrradiance.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Weather/AnalyticIrradiance.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Weather/AnalyticIrradiance.mo" 2022-03-10 09:58:34.124151237 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BoundaryConditions.Weather; +within BuildSysPro.BoundaryConditions.Weather; model AnalyticIrradiance "Irradiance scenario" Modelica.Blocks.Interfaces.RealOutput G diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Weather/AnalyticText.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Weather/AnalyticText.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Weather/AnalyticText.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Weather/AnalyticText.mo" 2022-03-10 09:58:34.116151235 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BoundaryConditions.Weather; +within BuildSysPro.BoundaryConditions.Weather; model AnalyticText "External temperature scenario" Modelica.Blocks.Interfaces.RealOutput T_ext "Analytic external temperature" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Weather/ColdWaterTempReader.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Weather/ColdWaterTempReader.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Weather/ColdWaterTempReader.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Weather/ColdWaterTempReader.mo" 2022-03-10 09:58:34.108151234 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BoundaryConditions.Weather; +within BuildSysPro.BoundaryConditions.Weather; model ColdWaterTempReader "Cold water temperature reader" parameter String pth=Modelica.Utilities.Files.loadResource("modelica://BuildSysPro/Resources/Donnees/Meteos/RT2012/eau_froide_H1a.txt") diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Weather/CombiTable1Ds_ForStepMeteo.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Weather/CombiTable1Ds_ForStepMeteo.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Weather/CombiTable1Ds_ForStepMeteo.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Weather/CombiTable1Ds_ForStepMeteo.mo" 2022-03-10 09:58:34.100151233 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BoundaryConditions.Weather; +within BuildSysPro.BoundaryConditions.Weather; block CombiTable1Ds_ForStepMeteo "Table look-up in one dimension (matrix/file) with one input and n outputs" extends Modelica.Blocks.Interfaces.SIMO(final nout=size(columns, 1)); @@ -115,7 +115,7 @@ end for; else for i in 1:nout loop - //y[i] = getTableValue(tableID, i, u, tableOnFileRead); +//y[i] = getTableValue(tableID, i, u, tableOnFileRead); y[i] = getTableValue(tableID, i, if option[i]==0 then u1 else u, tableOnFileRead); end for; end if; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Weather/Functions/CalculPs.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Weather/Functions/CalculPs.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Weather/Functions/CalculPs.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Weather/Functions/CalculPs.mo" 2022-03-10 09:58:34.068151229 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BoundaryConditions.Weather.Functions; +within BuildSysPro.BoundaryConditions.Weather.Functions; function CalculPs "Compute the saturation pressure" output Real ps; input Real T; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Weather/Functions/CalculTsky_withoutRH.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Weather/Functions/CalculTsky_withoutRH.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Weather/Functions/CalculTsky_withoutRH.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Weather/Functions/CalculTsky_withoutRH.mo" 2022-03-10 09:58:34.056151228 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BoundaryConditions.Weather.Functions; +within BuildSysPro.BoundaryConditions.Weather.Functions; function CalculTsky_withoutRH "Compute the sky temperature not knowing the relative humidity" input Modelica.Units.SI.Time t "Time"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Weather/Functions/ConvertLongitude.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Weather/Functions/ConvertLongitude.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Weather/Functions/ConvertLongitude.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Weather/Functions/ConvertLongitude.mo" 2022-03-10 09:58:34.052151227 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BoundaryConditions.Weather.Functions; +within BuildSysPro.BoundaryConditions.Weather.Functions; function ConvertLongitude "Longitude conversion for astronomical functions" input Boolean Est=true @@ -6,12 +6,11 @@ input Real LongIn "Input longitude of the given place"; output Real LongOut "Longitude of the place converted into an output"; -algorithm - //The longitude is already inversed if it is given in °Ouest - LongOut:=if Est then LongIn else -LongIn; - // The longitude is replaced in the interval [-180° ; 180°[ - LongOut:=LongOut - 360*integer(LongOut/360 + 0.5); - +algorithm +//The longitude is already inversed if it is given in °Ouest + LongOut := if Est then LongIn else -LongIn; +// The longitude is replaced in the interval [-180° ; 180°[ + LongOut := LongOut - 360 * integer(LongOut / 360 + 0.5); annotation (Documentation(info="

Function converting the longitude for astronomical application

Hypothesis and equations

diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Weather/Meteofile.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Weather/Meteofile.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Weather/Meteofile.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Weather/Meteofile.mo" 2022-03-10 09:58:34.044151226 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BoundaryConditions.Weather; +within BuildSysPro.BoundaryConditions.Weather; model Meteofile "Weather data reader" parameter Integer TypeMeteo=3 annotation(choices( @@ -110,37 +110,26 @@ columns={10}, fileName=pth) annotation (Placement(transformation(extent={{-58,-10},{ -38,10}}, rotation=0))); -equation - // Irradiance reading, latitude and longitude - // The longitude must be given in such a way that East>0 and West<0 with absolute values <180 ° - - when initial() then - latitude=combiTimeTable.y[10]; - longitude = - BuildSysPro.BoundaryConditions.Weather.Functions.ConvertLongitude(Est= - ChoixEst, LongIn=combiTimeTable.y[11]); - h0 = if (TypeMeteo==4) then DonneesPerso.h0 else (if (TypeMeteo==1) then 0 else -1); - d0 = if TypeMeteo==4 then DonneesPerso.d0 else 1; - CoupleFlux= if TypeMeteo==4 then DonneesPerso.CoupleFlux else 2; - t0=86400*(d0-1)+3600*h0; - end when; - - //combiTimeTable.u=mod(time,31536000); - - FluxMeteo[1]=combiTimeTable.y[1]; - FluxMeteo[2]=combiTimeTable.y[2]; - -// Wind connector - connect(combiTimeTable.y[8], V[1]) annotation (Line( - points={{-37,30},{-30,30},{-30,-73},{100,-73}}, - color={0,0,127}, - smooth=Smooth.None)); - -// Temperature Connectors - connect(prescribedTseche.port, T_dry) annotation (Line( - points={{46,58},{90,58}}, - color={191,0,0}, - smooth=Smooth.None)); +equation +// Irradiance reading, latitude and longitude +// The longitude must be given in such a way that East>0 and West<0 with absolute values <180 ° + when initial() then + latitude = combiTimeTable.y[10]; + longitude = BuildSysPro.BoundaryConditions.Weather.Functions.ConvertLongitude(Est = ChoixEst, LongIn = combiTimeTable.y[11]); + h0 = if TypeMeteo == 4 then DonneesPerso.h0 else if TypeMeteo == 1 then 0 else -1; + d0 = if TypeMeteo == 4 then DonneesPerso.d0 else 1; + CoupleFlux = if TypeMeteo == 4 then DonneesPerso.CoupleFlux else 2; + t0 = 86400 * (d0 - 1) + 3600 * h0; + end when; +//combiTimeTable.u=mod(time,31536000); + FluxMeteo[1] = combiTimeTable.y[1]; + FluxMeteo[2]=combiTimeTable.y[2]; +// Wind connector + connect(combiTimeTable.y[8], V[1]) annotation( + Line(points = {{-37, 30}, {-30, 30}, {-30, -73}, {100, -73}}, color = {0, 0, 127}, smooth = Smooth.None)); +// Temperature Connectors + connect(prescribedTseche.port, T_dry) annotation( + Line(points = {{46, 58}, {90, 58}}, color = {191, 0, 0}, smooth = Smooth.None)); connect(prescribedTrosee.port, T_dew) annotation (Line( points={{46,28},{90,28}}, color={191,0,0}, @@ -163,77 +152,57 @@ connect(toKelvinTrosee.Kelvin, prescribedTrosee.T) annotation (Line( points={{13,28},{26,28}}, color={0,0,127}, - smooth=Smooth.None)); - - // Connector for humid air - + smooth=Smooth.None)); +// Connector for humid air ps = BuildSysPro.BoundaryConditions.Weather.Functions.CalculPs(Hygro[1]); Hygro[1]=combiTimeTable.y[3]+273.15; Hygro[2]=combiTimeTable.y[6]; - Hygro[3]=combiTimeTable.y[7]; - - // Tciel computation - - if Tempciel==false then - if HR==true then - T_ciel=Functions.CalculTsky_withRH( - t=time, - G=G, - T_seche=T_dry.T, - Pvap=Hygro[3]*ps); - else - T_ciel=Functions.CalculTsky_withoutRH( - t=time, - G=G, - T_seche=T_dry.T); - end if; - else - T_ciel=combiTimeTable.y[5]+273.15; - end if; - - T_sky.T=T_ciel; - - //Calculation of sun's direction cosines - - (CosDir,AzHaut[1],AzHaut[2]) = - BuildSysPro.BoundaryConditions.Solar.Utilities.CosDirSunVectorHeightAz( - t0=t0, - t=time, - latitude=latitude, - longitude=longitude); - - // Calculation of flux DIFH, DIRN, DIRH, GLOH - - if CoupleFlux<1.5 then - GLOH = FluxMeteo[1]; - DIFH = FluxMeteo[2]; - DIRH=GLOH-DIFH; - DIRN=if noEvent(CosDir[1]>0) then DIRH/CosDir[1] else 0; - elseif CoupleFlux<2.5 then - DIRN = FluxMeteo[1]; - DIFH = FluxMeteo[2]; - DIRH=if CosDir[1]>0 then DIRN*CosDir[1] else 0; - GLOH=DIRH+DIFH; - elseif CoupleFlux<3.5 then - DIFH = FluxMeteo[1]; - DIRH = FluxMeteo[2]; - GLOH=DIRH+DIFH; - DIRN=if noEvent(CosDir[1]>0) then DIRH/CosDir[1] else 0; - elseif CoupleFlux<4.5 then - GLOH = FluxMeteo[1]; - DIRH = FluxMeteo[2]; - DIRN=if noEvent(CosDir[1]>0) then DIRH/CosDir[1] else 0; - DIFH=GLOH-DIRH; - else // CoupleFlux==5 - GLOH = FluxMeteo[1]; - DIRN = FluxMeteo[2]; - DIRH=if CosDir[1]>0 then DIRN*CosDir[1] else 0; - DIFH=GLOH-DIRH; + Hygro[3]=combiTimeTable.y[7]; +// Tciel computation + if Tempciel == false then + if HR == true then + T_ciel = Functions.CalculTsky_withRH(t = time, G = G, T_seche = T_dry.T, Pvap = Hygro[3] * ps); + else + T_ciel = Functions.CalculTsky_withoutRH(t = time, G = G, T_seche = T_dry.T); + end if; + else + T_ciel = combiTimeTable.y[5] + 273.15; end if; - //G[1:10]={DIFH,DIRN,DIRH,GLOH, t0, CosDir[1],CosDir[2],CosDir[3], latitude, longitude}; - G[1:10]={DIFH,DIRN,DIRH,GLOH, t0, CosDir[1],CosDir[2],CosDir[3], AzHaut[1],AzHaut[2]}; + T_sky.T=T_ciel; +//Calculation of sun's direction cosines + (CosDir, AzHaut[1], AzHaut[2]) = BuildSysPro.BoundaryConditions.Solar.Utilities.CosDirSunVectorHeightAz(t0 = t0, t = time, latitude = latitude, longitude = longitude); +// Calculation of flux DIFH, DIRN, DIRH, GLOH + if CoupleFlux < 1.5 then + GLOH = FluxMeteo[1]; + DIFH = FluxMeteo[2]; + DIRH = GLOH - DIFH; + DIRN = if noEvent(CosDir[1] > 0) then DIRH / CosDir[1] else 0; + elseif CoupleFlux < 2.5 then + DIRN = FluxMeteo[1]; + DIFH = FluxMeteo[2]; + DIRH = if CosDir[1] > 0 then DIRN * CosDir[1] else 0; + GLOH = DIRH + DIFH; + elseif CoupleFlux < 3.5 then + DIFH = FluxMeteo[1]; + DIRH = FluxMeteo[2]; + GLOH = DIRH + DIFH; + DIRN = if noEvent(CosDir[1] > 0) then DIRH / CosDir[1] else 0; + elseif CoupleFlux < 4.5 then + GLOH = FluxMeteo[1]; + DIRH = FluxMeteo[2]; + DIRN = if noEvent(CosDir[1] > 0) then DIRH / CosDir[1] else 0; + DIFH = GLOH - DIRH; + else +// CoupleFlux==5 + GLOH = FluxMeteo[1]; + DIRN = FluxMeteo[2]; + DIRH = if CosDir[1] > 0 then DIRN * CosDir[1] else 0; + DIFH = GLOH - DIRH; + end if; +//G[1:10]={DIFH,DIRN,DIRH,GLOH, t0, CosDir[1],CosDir[2],CosDir[3], latitude, longitude}; + G[1:10] = {DIFH, DIRN, DIRH, GLOH, t0, CosDir[1], CosDir[2], CosDir[3], AzHaut[1], AzHaut[2]}; if option[9]==0 then connect(combiTimeTable.y[9],V[2]); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Weather/ZoneWind.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Weather/ZoneWind.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Weather/ZoneWind.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/Weather/ZoneWind.mo" 2022-03-10 09:58:34.012151222 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BoundaryConditions.Weather; +within BuildSysPro.BoundaryConditions.Weather; model ZoneWind "Wind computation for a zone model" parameter Boolean ChoixAzimuth=false @@ -42,8 +42,8 @@ constant Real d2r=Modelica.Constants.pi/180; algorithm -// Calculation of walls normal wind speeds -VENTNord:=max(0,cos((V[2]+180-azim_in[1])*d2r))*V[1]; +// Calculation of walls normal wind speeds + VENTNord:=max(0,cos((V[2]+180-azim_in[1])*d2r))*V[1]; VENTSud:=max(0,cos((V[2]+180-azim_in[2])*d2r))*V[1]; VENTEst:=max(0,cos((V[2]+180-azim_in[3])*d2r))*V[1]; VENTOuest:=max(0,cos((V[2]+180-azim_in[4])*d2r))*V[1]; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/package.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/package.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/package.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BoundaryConditions/package.mo" 2022-03-10 09:58:34.948151340 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro; +within BuildSysPro; package BoundaryConditions "Package with boundary conditions models" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/AirNode.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/AirNode.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/AirNode.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/AirNode.mo" 2022-03-10 09:58:33.976151217 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.Building.AirFlow.HeatTransfer; +within BuildSysPro.Building.AirFlow.HeatTransfer; model AirNode "Air node" parameter Modelica.Units.SI.Volume V "Air node volume [m3]"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/AirRenewal.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/AirRenewal.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/AirRenewal.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/AirRenewal.mo" 2022-03-10 09:58:33.968151216 +0000 @@ -1,28 +1,28 @@ -within BuildSysPro.Building.AirFlow.HeatTransfer; +within BuildSysPro.Building.AirFlow.HeatTransfer; model AirRenewal "Air renewal" extends BuildSysPro.BaseClasses.HeatTransfer.Interfaces.Element1D; -// Control parameters -parameter Boolean use_Qv_in=false "Prescribed volume flow rate" annotation(Evaluate=true,HideResult=true,Dialog(group="Ventilation/infiltration"),choices(choice=true +// Control parameters + parameter Boolean use_Qv_in=false "Prescribed volume flow rate" annotation(Evaluate=true,HideResult=true,Dialog(group="Ventilation/infiltration"),choices(choice=true "Prescribed", choice=false "Fixed", radioButtons=true)); parameter Real Qv=0 "Constant volume flow rate for ventilation and/or infiltrations [m3/h]" annotation(Dialog(group="Ventilation/infiltration",enable=not use_Qv_in)); - // Fan power consumption -parameter Boolean use_Pelec=false "Compute power consumption" annotation(Evaluate=true,HideResult=true,Dialog(group="Electric power consumption"),choices(choice=true "Yes", +// Fan power consumption + parameter Boolean use_Pelec=false "Compute power consumption" annotation(Evaluate=true,HideResult=true,Dialog(group="Electric power consumption"),choices(choice=true "Yes", choice=false "No", radioButtons=true)); parameter Real Pelec_spe=0.334 "Specific power consumption for ventilation [W/m3.h]" annotation(Dialog(group="Electric power consumption",enable=use_Pelec)); -// Air properties +// Air properties parameter Modelica.Units.SI.Density rhoair=1.24 "Air density" annotation (Dialog(group="Air properties")); parameter Modelica.Units.SI.SpecificHeatCapacity Cp=1005 "Air specific heat capacity" annotation (Dialog(group="Air properties")); -// Connecteur public +// Connecteur public Modelica.Blocks.Interfaces.RealInput Qv_in if use_Qv_in "Prescribed air flow rate[m3/h]" annotation (Placement( transformation(extent={{-20,-20},{20,20}}, @@ -36,7 +36,7 @@ annotation (Placement(transformation(extent={{86,26},{126,66}}), iconTransformation(extent={{88,40},{108,60}}))); -// Connecteur interne +// Connecteur interne protected Modelica.Blocks.Interfaces.RealInput Qv_in_internal "Internal connector for optional configuration"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/AirRenewal_DynProp.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/AirRenewal_DynProp.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/AirRenewal_DynProp.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/AirRenewal_DynProp.mo" 2022-03-10 09:58:33.916151211 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.Building.AirFlow.HeatTransfer; +within BuildSysPro.Building.AirFlow.HeatTransfer; model AirRenewal_DynProp "Air renewal - Variable air properties" extends BuildSysPro.BaseClasses.HeatTransfer.Interfaces.Element1D; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/DoorEnthalpy.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/DoorEnthalpy.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/DoorEnthalpy.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/DoorEnthalpy.mo" 2022-03-10 09:58:33.904151208 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.Building.AirFlow.HeatTransfer; +within BuildSysPro.Building.AirFlow.HeatTransfer; model DoorEnthalpy "Enthalpy transfer through a door" extends BaseClasses.HeatTransfer.Interfaces.Element1D; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/EnthalpyFlow.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/EnthalpyFlow.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/EnthalpyFlow.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/EnthalpyFlow.mo" 2022-03-10 09:58:33.896151208 +0000 @@ -1,22 +1,22 @@ -within BuildSysPro.Building.AirFlow.HeatTransfer; +within BuildSysPro.Building.AirFlow.HeatTransfer; model EnthalpyFlow "Enthalpy flow" extends BuildSysPro.BaseClasses.HeatTransfer.Interfaces.Element1D; -// Control parameters -parameter Boolean use_Qv_in=false "Prescribed volume flow rate" annotation(Evaluate=true,HideResult=true,Dialog(group="Ventilation/infiltration"),choices(choice=true +// Control parameters + parameter Boolean use_Qv_in=false "Prescribed volume flow rate" annotation(Evaluate=true,HideResult=true,Dialog(group="Ventilation/infiltration"),choices(choice=true "Prescribed", choice=false "Fixed", radioButtons=true)); parameter Real Qv=0 "Constant volume flow rate for ventilation and/or infiltrations [m3/h]" annotation(Dialog(group="Ventilation/infiltration",enable=not use_Qv_in)); -// Propriétés de l'air +// Propriétés de l'air parameter Modelica.Units.SI.Density rhoair=1.24 "Air density" annotation (Dialog(group="Air properties")); parameter Modelica.Units.SI.SpecificHeatCapacity Cp=1005 "Air specific heat capacity" annotation (Dialog(group="Air properties")); -// Connecteur public +// Connecteur public Modelica.Blocks.Interfaces.RealInput Qv_in if use_Qv_in "Prescribed air flow rate[m3/h]" annotation (Placement( transformation(extent={{-20,-20},{20,20}}, @@ -26,7 +26,7 @@ rotation=-90, origin={0,88}))); -// Connecteur interne +// Connecteur interne protected Modelica.Blocks.Interfaces.RealInput Qv_in_internal "Internal connector for optional configuration"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/HeatRecoveryVentilation.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/HeatRecoveryVentilation.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/HeatRecoveryVentilation.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/HeatRecoveryVentilation.mo" 2022-03-10 09:58:33.880151205 +0000 @@ -1,7 +1,7 @@ -within BuildSysPro.Building.AirFlow.HeatTransfer; +within BuildSysPro.Building.AirFlow.HeatTransfer; model HeatRecoveryVentilation "Heat recovery ventilation with bypass" -// Control parameters +// Control parameters parameter Boolean use_Qv_in=false "Prescribed volume flow rate" annotation(Evaluate=true,HideResult=true,Dialog(group="Ventilation/infiltration"),choices(choice=true "Prescribed", choice=false "Fixed", radioButtons=true)); @@ -12,21 +12,20 @@ "No (constant)", radioButtons=true)); parameter Real Efficacite=0.5 "Constant efficiency [0-1]" annotation(Dialog(group="Heat recovery",enable=not use_Efficacite_in)); - // Fan power consumption -parameter Boolean use_Pelec=false "Compute power consumption" annotation(Evaluate=true,HideResult=true,Dialog(group="Electric power consumption"),choices(choice=true "Yes", + // Fan power consumption + parameter Boolean use_Pelec=false "Compute power consumption" annotation(Evaluate=true,HideResult=true,Dialog(group="Electric power consumption"),choices(choice=true "Yes", choice=false "No", radioButtons=true)); parameter Real Pelec_spe=0.667 "Specific power consumption for ventilation [W/m3.h]" annotation(Dialog(group="Electric power consumption",enable=use_Pelec)); -// Air properties +// Air properties parameter Modelica.Units.SI.Density rhoair=1.24 "Air density" annotation (Dialog(group="Air properties")); parameter Modelica.Units.SI.SpecificHeatCapacity Cp=1005 "Air specific heat capacity" annotation (Dialog(group="Air properties")); - // Components - +// Components public Modelica.Blocks.Interfaces.RealInput Qv_in if use_Qv_in "Prescribed air flow rate[m3/h]" annotation (Placement( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Permea3CL_DPE/GenericPermeaDPE.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Permea3CL_DPE/GenericPermeaDPE.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Permea3CL_DPE/GenericPermeaDPE.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Permea3CL_DPE/GenericPermeaDPE.mo" 2022-03-10 09:58:33.836151200 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.Building.AirFlow.HeatTransfer.Permea3CL_DPE; +within BuildSysPro.Building.AirFlow.HeatTransfer.Permea3CL_DPE; record GenericPermeaDPE "Residential permeability" parameter Real I4Pa=0.4 "Air permeability under 4 Pa"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Permea3CL_DPE/OtherCases.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Permea3CL_DPE/OtherCases.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Permea3CL_DPE/OtherCases.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Permea3CL_DPE/OtherCases.mo" 2022-03-10 09:58:33.832151200 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.Building.AirFlow.HeatTransfer.Permea3CL_DPE; +within BuildSysPro.Building.AirFlow.HeatTransfer.Permea3CL_DPE; record OtherCases = GenericPermeaDPE ( I4Pa=1.7) "Other cases" annotation (Documentation(info=" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Permea3CL_DPE/Permea04.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Permea3CL_DPE/Permea04.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Permea3CL_DPE/Permea04.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Permea3CL_DPE/Permea04.mo" 2022-03-10 09:58:33.824151198 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.Building.AirFlow.HeatTransfer.Permea3CL_DPE; +within BuildSysPro.Building.AirFlow.HeatTransfer.Permea3CL_DPE; record Permea04 =GenericPermeaDPE ( I4Pa=0.4) "Permeability 0,4 m3/h-m2" annotation (Documentation(info="

Hypothesis and equations

diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Permea3CL_DPE/Permea06.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Permea3CL_DPE/Permea06.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Permea3CL_DPE/Permea06.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Permea3CL_DPE/Permea06.mo" 2022-03-10 09:58:33.816151197 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.Building.AirFlow.HeatTransfer.Permea3CL_DPE; +within BuildSysPro.Building.AirFlow.HeatTransfer.Permea3CL_DPE; record Permea06 =GenericPermeaDPE ( I4Pa=0.6) "Permeability 0,6 m3/h-m2" annotation (Documentation(info="

Hypothesis and equations

diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Permea3CL_DPE/WindowWithoutSealAndChimneyWithoutTrap.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Permea3CL_DPE/WindowWithoutSealAndChimneyWithoutTrap.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Permea3CL_DPE/WindowWithoutSealAndChimneyWithoutTrap.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Permea3CL_DPE/WindowWithoutSealAndChimneyWithoutTrap.mo" 2022-03-10 09:58:33.808151197 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.Building.AirFlow.HeatTransfer.Permea3CL_DPE; +within BuildSysPro.Building.AirFlow.HeatTransfer.Permea3CL_DPE; record WindowWithoutSealAndChimneyWithoutTrap = GenericPermeaDPE ( I4Pa=2.5) "Windows without seals or chimney without trap" annotation ( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Permea3CL_DPE/WindowWithoutSealOrChimneyWithoutTrap.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Permea3CL_DPE/WindowWithoutSealOrChimneyWithoutTrap.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Permea3CL_DPE/WindowWithoutSealOrChimneyWithoutTrap.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Permea3CL_DPE/WindowWithoutSealOrChimneyWithoutTrap.mo" 2022-03-10 09:58:33.804151196 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.Building.AirFlow.HeatTransfer.Permea3CL_DPE; +within BuildSysPro.Building.AirFlow.HeatTransfer.Permea3CL_DPE; record WindowWithoutSealOrChimneyWithoutTrap = GenericPermeaDPE ( I4Pa=2.0) "Windows without seals or chimney without trap" annotation ( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Permea3CL_DPE/package.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Permea3CL_DPE/package.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Permea3CL_DPE/package.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Permea3CL_DPE/package.mo" 2022-03-10 09:58:33.844151200 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.Building.AirFlow.HeatTransfer; +within BuildSysPro.Building.AirFlow.HeatTransfer; package Permea3CL_DPE diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Ventilation3CL_DPE/ByWindowsOpening.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Ventilation3CL_DPE/ByWindowsOpening.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Ventilation3CL_DPE/ByWindowsOpening.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Ventilation3CL_DPE/ByWindowsOpening.mo" 2022-03-10 09:58:33.788151195 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.Building.AirFlow.HeatTransfer.Ventilation3CL_DPE; +within BuildSysPro.Building.AirFlow.HeatTransfer.Ventilation3CL_DPE; record ByWindowsOpening = GenericVentilationDPE ( SmeaConv= 0, QvarepConv=1.2) "Ventilation by opening windows" annotation ( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Ventilation3CL_DPE/ClimaticWell.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Ventilation3CL_DPE/ClimaticWell.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Ventilation3CL_DPE/ClimaticWell.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Ventilation3CL_DPE/ClimaticWell.mo" 2022-03-10 09:58:33.780151192 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.Building.AirFlow.HeatTransfer.Ventilation3CL_DPE; +within BuildSysPro.Building.AirFlow.HeatTransfer.Ventilation3CL_DPE; record ClimaticWell = GenericVentilationDPE ( SmeaConv= 0, QvarepConv=1.04) "Canadian or Provençal climatic well" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Ventilation3CL_DPE/DoubleFlow.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Ventilation3CL_DPE/DoubleFlow.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Ventilation3CL_DPE/DoubleFlow.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Ventilation3CL_DPE/DoubleFlow.mo" 2022-03-10 09:58:33.776151193 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.Building.AirFlow.HeatTransfer.Ventilation3CL_DPE; +within BuildSysPro.Building.AirFlow.HeatTransfer.Ventilation3CL_DPE; record DoubleFlow = GenericVentilationDPE ( SmeaConv= 0, QvarepConv=1.65) diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Ventilation3CL_DPE/DoubleFlowExchanger.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Ventilation3CL_DPE/DoubleFlowExchanger.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Ventilation3CL_DPE/DoubleFlowExchanger.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Ventilation3CL_DPE/DoubleFlowExchanger.mo" 2022-03-10 09:58:33.772151192 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.Building.AirFlow.HeatTransfer.Ventilation3CL_DPE; +within BuildSysPro.Building.AirFlow.HeatTransfer.Ventilation3CL_DPE; record DoubleFlowExchanger = GenericVentilationDPE ( SmeaConv= 0, QvarepConv=0.66) diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Ventilation3CL_DPE/ExtractorOnNatVentilationPipe.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Ventilation3CL_DPE/ExtractorOnNatVentilationPipe.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Ventilation3CL_DPE/ExtractorOnNatVentilationPipe.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Ventilation3CL_DPE/ExtractorOnNatVentilationPipe.mo" 2022-03-10 09:58:33.764151191 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.Building.AirFlow.HeatTransfer.Ventilation3CL_DPE; +within BuildSysPro.Building.AirFlow.HeatTransfer.Ventilation3CL_DPE; record ExtractorOnNatVentilationPipe = GenericVentilationDPE ( SmeaConv= 4, QvarepConv=2.2425) diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Ventilation3CL_DPE/GenericVentilationDPE.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Ventilation3CL_DPE/GenericVentilationDPE.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Ventilation3CL_DPE/GenericVentilationDPE.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Ventilation3CL_DPE/GenericVentilationDPE.mo" 2022-03-10 09:58:33.756151189 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.Building.AirFlow.HeatTransfer.Ventilation3CL_DPE; +within BuildSysPro.Building.AirFlow.HeatTransfer.Ventilation3CL_DPE; record GenericVentilationDPE "Residential ventilation" parameter Real SmeaConv= 2.15 diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Ventilation3CL_DPE/HighAndLowAirInlets.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Ventilation3CL_DPE/HighAndLowAirInlets.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Ventilation3CL_DPE/HighAndLowAirInlets.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Ventilation3CL_DPE/HighAndLowAirInlets.mo" 2022-03-10 09:58:33.748151188 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.Building.AirFlow.HeatTransfer.Ventilation3CL_DPE; +within BuildSysPro.Building.AirFlow.HeatTransfer.Ventilation3CL_DPE; record HighAndLowAirInlets = GenericVentilationDPE ( SmeaConv= 4, QvarepConv=2.145) "Ventilation by high and low air inlets" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Ventilation3CL_DPE/Hybrid.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Ventilation3CL_DPE/Hybrid.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Ventilation3CL_DPE/Hybrid.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Ventilation3CL_DPE/Hybrid.mo" 2022-03-10 09:58:33.740151188 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.Building.AirFlow.HeatTransfer.Ventilation3CL_DPE; +within BuildSysPro.Building.AirFlow.HeatTransfer.Ventilation3CL_DPE; record Hybrid = GenericVentilationDPE ( SmeaConv= 3, QvarepConv=2.0625) "Hybrid ventilation" annotation (Documentation( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Ventilation3CL_DPE/HygroHybrid.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Ventilation3CL_DPE/HygroHybrid.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Ventilation3CL_DPE/HygroHybrid.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Ventilation3CL_DPE/HygroHybrid.mo" 2022-03-10 09:58:33.676151180 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.Building.AirFlow.HeatTransfer.Ventilation3CL_DPE; +within BuildSysPro.Building.AirFlow.HeatTransfer.Ventilation3CL_DPE; record HygroHybrid = GenericVentilationDPE ( SmeaConv= 2, QvarepConv=2.0625) diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Ventilation3CL_DPE/HygroNatural.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Ventilation3CL_DPE/HygroNatural.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Ventilation3CL_DPE/HygroNatural.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Ventilation3CL_DPE/HygroNatural.mo" 2022-03-10 09:58:33.668151179 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.Building.AirFlow.HeatTransfer.Ventilation3CL_DPE; +within BuildSysPro.Building.AirFlow.HeatTransfer.Ventilation3CL_DPE; record HygroNatural = GenericVentilationDPE ( SmeaConv= 3, QvarepConv=2.145) diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Ventilation3CL_DPE/NaturalByPipe.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Ventilation3CL_DPE/NaturalByPipe.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Ventilation3CL_DPE/NaturalByPipe.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Ventilation3CL_DPE/NaturalByPipe.mo" 2022-03-10 09:58:33.664151178 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.Building.AirFlow.HeatTransfer.Ventilation3CL_DPE; +within BuildSysPro.Building.AirFlow.HeatTransfer.Ventilation3CL_DPE; record NaturalByPipe = GenericVentilationDPE ( SmeaConv= 4, QvarepConv=2.145) "Natural ventilation by duct" annotation ( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Ventilation3CL_DPE/VMCAfter82.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Ventilation3CL_DPE/VMCAfter82.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Ventilation3CL_DPE/VMCAfter82.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Ventilation3CL_DPE/VMCAfter82.mo" 2022-03-10 09:58:33.656151178 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.Building.AirFlow.HeatTransfer.Ventilation3CL_DPE; +within BuildSysPro.Building.AirFlow.HeatTransfer.Ventilation3CL_DPE; record VMCAfter82 = GenericVentilationDPE ( SmeaConv= 2, QvarepConv=1.65) "Self-adjusting mechanical ventilation after 1982" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Ventilation3CL_DPE/VMCBefore82.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Ventilation3CL_DPE/VMCBefore82.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Ventilation3CL_DPE/VMCBefore82.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Ventilation3CL_DPE/VMCBefore82.mo" 2022-03-10 09:58:33.648151176 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.Building.AirFlow.HeatTransfer.Ventilation3CL_DPE; +within BuildSysPro.Building.AirFlow.HeatTransfer.Ventilation3CL_DPE; record VMCBefore82 = GenericVentilationDPE ( SmeaConv= 2, QvarepConv=1.8975) "Self-adjusting mechanical ventilation before 1982" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Ventilation3CL_DPE/VMCHygroA.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Ventilation3CL_DPE/VMCHygroA.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Ventilation3CL_DPE/VMCHygroA.mo" 2022-03-10 09:57:39.652144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Ventilation3CL_DPE/VMCHygroA.mo" 2022-03-10 09:58:33.644151176 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.Building.AirFlow.HeatTransfer.Ventilation3CL_DPE; +within BuildSysPro.Building.AirFlow.HeatTransfer.Ventilation3CL_DPE; record VMCHygroA = GenericVentilationDPE ( SmeaConv= 2, QvarepConv=1.2375) diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Ventilation3CL_DPE/VMCHygroB.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Ventilation3CL_DPE/VMCHygroB.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Ventilation3CL_DPE/VMCHygroB.mo" 2022-03-10 09:57:39.656144335 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Ventilation3CL_DPE/VMCHygroB.mo" 2022-03-10 09:58:33.636151175 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.Building.AirFlow.HeatTransfer.Ventilation3CL_DPE; +within BuildSysPro.Building.AirFlow.HeatTransfer.Ventilation3CL_DPE; record VMCHygroB = GenericVentilationDPE ( SmeaConv= 1.5, QvarepConv=1.0725) diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Ventilation3CL_DPE/VMCHygroGas.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Ventilation3CL_DPE/VMCHygroGas.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Ventilation3CL_DPE/VMCHygroGas.mo" 2022-03-10 09:57:39.656144335 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Ventilation3CL_DPE/VMCHygroGas.mo" 2022-03-10 09:58:33.632151174 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.Building.AirFlow.HeatTransfer.Ventilation3CL_DPE; +within BuildSysPro.Building.AirFlow.HeatTransfer.Ventilation3CL_DPE; record VMCHygroGas = GenericVentilationDPE ( SmeaConv= 2, QvarepConv=1.4025) "Hygro-adjustable gas mechanical ventilation" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Ventilation3CL_DPE/package.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Ventilation3CL_DPE/package.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Ventilation3CL_DPE/package.mo" 2022-03-10 09:57:39.656144335 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/Ventilation3CL_DPE/package.mo" 2022-03-10 09:58:33.796151195 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.Building.AirFlow.HeatTransfer; +within BuildSysPro.Building.AirFlow.HeatTransfer; package Ventilation3CL_DPE diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/VentilationFlow3CL_DPE.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/VentilationFlow3CL_DPE.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/VentilationFlow3CL_DPE.mo" 2022-03-10 09:57:39.656144335 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/VentilationFlow3CL_DPE.mo" 2022-03-10 09:58:33.624151174 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.Building.AirFlow.HeatTransfer; +within BuildSysPro.Building.AirFlow.HeatTransfer; model VentilationFlow3CL_DPE "Ventilation model with default values from 3CL DPE v1.3 method" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/WindowNaturalVentilation.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/WindowNaturalVentilation.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/WindowNaturalVentilation.mo" 2022-03-10 09:57:39.656144335 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/AirFlow/HeatTransfer/WindowNaturalVentilation.mo" 2022-03-10 09:58:33.608151171 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.Building.AirFlow.HeatTransfer; +within BuildSysPro.Building.AirFlow.HeatTransfer; model WindowNaturalVentilation parameter Modelica.Units.SI.Area Sfenetre=1.5 "Average surface of a window" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/BuildingEnvelope/Functions/CalculAlphaTauDoubleGlazing.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/BuildingEnvelope/Functions/CalculAlphaTauDoubleGlazing.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/BuildingEnvelope/Functions/CalculAlphaTauDoubleGlazing.mo" 2022-03-10 09:57:39.656144335 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/BuildingEnvelope/Functions/CalculAlphaTauDoubleGlazing.mo" 2022-03-10 09:58:33.576151167 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.Building.BuildingEnvelope.Functions; +within BuildSysPro.Building.BuildingEnvelope.Functions; function CalculAlphaTauDoubleGlazing "Calculation of absorption and transmission coefficients of a double glazing window" @@ -29,19 +29,18 @@ Real b2; Real b3; -algorithm - //Direct coefficients (standard EN 410) - //First glazing - alpha_dir := (g-tau0)/(1+Uw*((1/Hext)-(1/Hint))); +algorithm +//Direct coefficients (standard EN 410) +//First glazing + alpha_dir := (g - tau0) / (1 + Uw * (1 / Hext - 1 / Hint)); tau_dir := ((2*tau0*(1-alpha_dir))+sqrt((2*tau0*(1-alpha_dir))^2+4*(1+tau0)*tau0*alpha_dir*(2-alpha_dir)))/(2*(1+tau0)); - rho_dir := 1-alpha_dir-tau_dir; - //Global glazing - tau_dir := (tau_dir)^2/(1-(rho_dir)^2); + rho_dir := 1-alpha_dir-tau_dir; +//Global glazing + tau_dir := tau_dir ^ 2 / (1 - rho_dir ^ 2); rho_dir := rho_dir*(1+tau_dir); - alpha_dir := 1-tau_dir-rho_dir; - - //Diffuse coefficients (method Th-S from RT) - alpha_30 := -8.5884e-4+1.0869*alpha_dir-6.1151e-2*(alpha_dir^2); + alpha_dir := 1-tau_dir-rho_dir; +//Diffuse coefficients (method Th-S from RT) + alpha_30 := (-8.5884e-4) + 1.0869 * alpha_dir - 6.1151e-2 * alpha_dir ^ 2; alpha_60 := -1.7566e-3+1.2352*alpha_dir-2.7231e-1*(alpha_dir^2); tau_30 := -7.068e-4+9.3967e-1*tau_dir+7.0476e-2*(tau_dir^2); tau_60 := -1.6265e-2+6.9767e-1*tau_dir+2.4509e-1*(tau_dir^2); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/BuildingEnvelope/Functions/U_Wall.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/BuildingEnvelope/Functions/U_Wall.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/BuildingEnvelope/Functions/U_Wall.mo" 2022-03-10 09:57:39.656144335 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/BuildingEnvelope/Functions/U_Wall.mo" 2022-03-10 09:58:33.564151165 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.Building.BuildingEnvelope.Functions; +within BuildSysPro.Building.BuildingEnvelope.Functions; function U_Wall "U-value calculated from the wall composition (GenericWall record)" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/BuildingEnvelope/HeatTransfer/B_Coefficient.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/BuildingEnvelope/HeatTransfer/B_Coefficient.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/BuildingEnvelope/HeatTransfer/B_Coefficient.mo" 2022-03-10 09:57:39.656144335 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/BuildingEnvelope/HeatTransfer/B_Coefficient.mo" 2022-03-10 09:58:33.552151164 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.Building.BuildingEnvelope.HeatTransfer; +within BuildSysPro.Building.BuildingEnvelope.HeatTransfer; model B_Coefficient "Simple boundary conditions (linear combination of temperature) for unheated space" parameter Real b=0.1 "Weighting coefficient"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/BuildingEnvelope/HeatTransfer/DoubleGlazingWindow.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/BuildingEnvelope/HeatTransfer/DoubleGlazingWindow.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/BuildingEnvelope/HeatTransfer/DoubleGlazingWindow.mo" 2022-03-10 09:57:39.656144335 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/BuildingEnvelope/HeatTransfer/DoubleGlazingWindow.mo" 2022-03-10 09:58:33.520151160 +0000 @@ -1,8 +1,8 @@ -within BuildSysPro.Building.BuildingEnvelope.HeatTransfer; +within BuildSysPro.Building.BuildingEnvelope.HeatTransfer; model DoubleGlazingWindow "Double glazing with as only parameters U, tau and g" -//// Model parameters to fill -parameter Boolean useVolet=false annotation(Dialog(group="Options",compact=true),choices(choice=true +//// Model parameters to fill + parameter Boolean useVolet=false annotation(Dialog(group="Options",compact=true),choices(choice=true "With shutter", choice=false "Without shutter", radioButtons=true)); parameter Boolean useOuverture=false annotation(Dialog(group="Options",compact=true),choices(choice=true @@ -35,7 +35,7 @@ "Additional thermal resistance (shutters closed))" annotation (Dialog(enable=useVolet)); -//// FenetreRad model parameters calculated +//// FenetreRad model parameters calculated protected parameter Modelica.Units.SI.CoefficientOfHeatTransfer k=1/(1/U - 1/heEN673 - 1/hi) @@ -59,8 +59,8 @@ parameter Real AbsDif=1.17*AbsDir-0.24*AbsDir^2 "Coefficient of diffuse absorption of the glazing"; -// Reduction factors of direct and diffuse fluxes (masking, frame, ...) -parameter Boolean useReduction=false "Inclusion or not of reduction factors" +// Reduction factors of direct and diffuse fluxes (masking, frame, ...) + parameter Boolean useReduction=false "Inclusion or not of reduction factors" annotation (Dialog(tab="Type of glazing")); parameter Integer TypeFenetrePF=1 "Choice of type of window or French window" annotation (Dialog(tab="Type of glazing",enable=useReduction,group="Parameters"), @@ -92,7 +92,7 @@ parameter Real r2=1 "Reduction factor for the diffuse if useReduction = false" annotation (Dialog(tab="Type of glazing",enable=not useReduction,group="Reduction factors if useReduction = false")); -// Consideration of radiative flux within the window +// Consideration of radiative flux within the window public parameter Boolean RadInterne=false "Consideration radiative fluxes inside" annotation(Dialog(tab="Advanced parameters",compact=true),choices(choice=true "yes", choice=false "no", radioButtons=true)); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/BuildingEnvelope/HeatTransfer/Examples/DynamicTestLightedWall.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/BuildingEnvelope/HeatTransfer/Examples/DynamicTestLightedWall.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/BuildingEnvelope/HeatTransfer/Examples/DynamicTestLightedWall.mo" 2022-03-10 09:57:39.656144335 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/BuildingEnvelope/HeatTransfer/Examples/DynamicTestLightedWall.mo" 2022-03-10 09:58:33.448151151 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.Building.BuildingEnvelope.HeatTransfer.Examples; +within BuildSysPro.Building.BuildingEnvelope.HeatTransfer.Examples; model DynamicTestLightedWall "Computation of the heat flow passing through a wall" extends Modelica.Icons.Example; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/BuildingEnvelope/HeatTransfer/Examples/IlluminanceExample.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/BuildingEnvelope/HeatTransfer/Examples/IlluminanceExample.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/BuildingEnvelope/HeatTransfer/Examples/IlluminanceExample.mo" 2022-03-10 09:57:39.656144335 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/BuildingEnvelope/HeatTransfer/Examples/IlluminanceExample.mo" 2022-03-10 09:58:33.440151149 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.Building.BuildingEnvelope.HeatTransfer.Examples; +within BuildSysPro.Building.BuildingEnvelope.HeatTransfer.Examples; model IlluminanceExample "Example of glazings assembly to compute natural lighting" extends Modelica.Icons.Example; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/BuildingEnvelope/HeatTransfer/FloorOnSlab.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/BuildingEnvelope/HeatTransfer/FloorOnSlab.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/BuildingEnvelope/HeatTransfer/FloorOnSlab.mo" 2022-03-10 09:57:39.656144335 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/BuildingEnvelope/HeatTransfer/FloorOnSlab.mo" 2022-03-10 09:58:33.420151147 +0000 @@ -1,10 +1,10 @@ -within BuildSysPro.Building.BuildingEnvelope.HeatTransfer; +within BuildSysPro.Building.BuildingEnvelope.HeatTransfer; model FloorOnSlab "Slab-on-grade floor model - generic floor model - conventional, resistive or water-based heating floor" import Modelica.Units.SI; -// Choice of model parameters +// Choice of model parameters parameter Integer ParoiActive=1 "Type of floor" annotation(Dialog(group="Type of floor",compact=true), choices(choice=1 "Conventional floor", @@ -22,7 +22,7 @@ parameter Boolean CLfixe=true "Time-invariant temperature of the ground" annotation(Dialog(group="Type of model",compact=true),choices(radioButtons=true)); -// Thermophysical parameters +// Thermophysical parameters replaceable parameter BuildSysPro.Utilities.Records.GenericWall caracParoi "Floor characteristics (including those of the ground under the floor if SurEquiValentTerre = False)" annotation (choicesAllMatching=true, Dialog(group= @@ -41,13 +41,13 @@ "Coefficient of global surface exchange on the inner face" annotation (Dialog(group="Floor parameters")); parameter SI.Temperature Ts=293.15 "Ground temperature" annotation (Dialog(enable=CLfixe,group="Ground parameters")); -// Parameter common to the water-based heating floor and the electric radiant floor +// Parameter common to the water-based heating floor and the electric radiant floor parameter Integer nP=1 "Number of the layer whose upper boundary is the site of power injection - must be strictly lower than n" annotation (Dialog(enable=not (ParoiActive==1), group="Type of floor")); -// Parameters specific to the water-based heating floor +// Parameters specific to the water-based heating floor parameter Integer nD=8 "Number of water floor discretization slices" annotation(Dialog(enable=ParoiActive==2, tab="Water-based heating floor parameters")); parameter SI.Distance Ltube=128 "Floor heating coil length" @@ -61,25 +61,25 @@ "Thermal conductivity of the tube" annotation (Dialog(enable=ParoiActive==2, tab="Water-based heating floor parameters")); -// Initialisation parameters +// Initialisation parameters parameter SI.Temperature Tp=293.15 "Initial temperature of the floor" annotation (Dialog(group="Initialisation parameters")); parameter BuildSysPro.Utilities.Types.InitCond InitType=BuildSysPro.Utilities.Types.InitCond.SteadyState annotation (Dialog(group="Initialisation parameters")); -// Ground parameters +// Ground parameters parameter SI.Length eSol=0.2 "Ground thickness" annotation (Dialog(enable=SurEquivalentTerre,group="Ground parameters")); parameter Integer mSol=5 "Number of meshes to model the ground" annotation (Dialog(group="Ground parameters",enable=SurEquivalentTerre)); - // Wall U-value + // Wall U-value final parameter SI.SurfaceCoefficientOfHeatTransfer U_value = BuildSysPro.Building.BuildingEnvelope.Functions.U_Wall( wall_record=caracParoi, hs_int=hs_int, hs_ext=1e6) "Wall U-value"; -// Components +// Components BuildSysPro.BaseClasses.HeatTransfer.Interfaces.HeatPort_b T_int annotation (Placement(transformation(extent={{80,-10},{100,10}}))); BuildSysPro.BaseClasses.HeatTransfer.Interfaces.HeatPort_b Ts_int annotation ( @@ -199,25 +199,25 @@ origin={2,-40}))); equation -if ParoiActive==1 then - //connection of slices in the case of a conventional floor - connect(plancherClassique.port_a, NoeudTsolPlanch); +if ParoiActive==1 then +//connection of slices in the case of a conventional floor + connect(plancherClassique.port_a, NoeudTsolPlanch); connect(plancherClassique.port_b, Ts_int); -elseif ParoiActive==2 then - //connection of the nD slices in the case of a water heating floor - for i in 1:nD loop - connect(PlancherActifEau[i].Ts_b, Ts_int); - connect(PlancherActifEau[i].Ts_a, NoeudTsolPlanch); - end for; +elseif ParoiActive==2 then +//connection of the nD slices in the case of a water heating floor + for i in 1:nD loop + connect(PlancherActifEau[i].Ts_b, Ts_int); + connect(PlancherActifEau[i].Ts_a, NoeudTsolPlanch); + end for; connect(PlancherActifEau[1].WaterIn, WaterIn); for i in 2:nD loop connect(PlancherActifEau[i - 1].WaterOut, PlancherActifEau[i].WaterIn); end for; connect(PlancherActifEau[nD].WaterOut, WaterOut); -else // ParoiActive==3 - //connection of slices in the case of an electric heating floor -end if; +else // ParoiActive==3 +//connection of slices in the case of an electric heating floor + end if; if not SurEquivalentTerre then connect(NoeudTsolPlanch, NoeudTsol) diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/BuildingEnvelope/HeatTransfer/SimpleWall.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/BuildingEnvelope/HeatTransfer/SimpleWall.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/BuildingEnvelope/HeatTransfer/SimpleWall.mo" 2022-03-10 09:57:39.656144335 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/BuildingEnvelope/HeatTransfer/SimpleWall.mo" 2022-03-10 09:58:33.388151143 +0000 @@ -1,9 +1,9 @@ -within BuildSysPro.Building.BuildingEnvelope.HeatTransfer; +within BuildSysPro.Building.BuildingEnvelope.HeatTransfer; model SimpleWall "Wall simple model" import Modelica.Units.SI; - // Optional parameters +// Optional parameters parameter Boolean RadInterne=false "Inclusion of irradiation which is absorbed on the inner face" annotation (Dialog(group="Options"),choices(choice=true "yes", choice=false "no", radioButtons=true)); @@ -14,7 +14,7 @@ "Inclusion of LW radiation (infrared) between the wall, the environment and the sky" annotation (Dialog(group="Options"),choices(choice=true "yes", choice=false "no", radioButtons=true)); - // General properties +// General properties parameter SI.Area S=1 "Wall surface without windows" annotation (Dialog(group="General properties of the wall")); replaceable parameter BuildSysPro.Utilities.Records.GenericWall caracParoi @@ -35,21 +35,21 @@ parameter Real eps=0.9 "Emissivity of the outer surface of the wall in LWR (concrete 0.9)" annotation (Dialog(enable=GLOext, group="General properties of the wall")); - // Initialization +// Initialization parameter SI.Temperature Tp=293.15 "Initial temperature of the wall" annotation (Dialog(group="Initialization")); parameter BuildSysPro.Utilities.Types.InitCond InitType=BuildSysPro.Utilities.Types.InitCond.SteadyState annotation (Dialog(group="Initialization")); - // Wall U-value +// Wall U-value final parameter SI.SurfaceCoefficientOfHeatTransfer U_value = BuildSysPro.Building.BuildingEnvelope.Functions.U_Wall( wall_record=caracParoi, hs_int=hs_int, hs_ext=hs_ext) "Wall U-value"; - // Heat ports +// Heat ports BuildSysPro.BaseClasses.HeatTransfer.Interfaces.HeatPort_a T_ext "Outdoor air temperature" annotation (Placement(transformation(extent={{-100,-40},{-80,-20}}), @@ -80,9 +80,8 @@ annotation (Placement(transformation(extent={{140,50},{100,90}}), iconTransformation(extent={{40,40},{20,60}}))); - // Internal components - - // Solar irradiation +// Internal components + // Solar irradiation protected Modelica.Blocks.Math.Gain AbsMurExt(k=alpha_ext*S) if RadExterne annotation (Placement( @@ -102,7 +101,7 @@ rotation=90, origin={40,50}))); - // Surface heat transfer on both wall faces +// Surface heat transfer on both wall faces BuildSysPro.BaseClasses.HeatTransfer.Components.LinearExtLWR EchangesGLOext( S=S, eps=eps, @@ -115,7 +114,7 @@ G=hs_int*S) annotation (Placement(transformation(extent={{56,-40},{76,-20}}, rotation=0))); - // Conduction heat transfer through the wall +// Conduction heat transfer through the wall BuildSysPro.BaseClasses.HeatTransfer.Components.HomogeneousNLayersWall ParoiNCouchesHomogenes( S=S, Tinit=Tp, @@ -126,16 +125,13 @@ mat=caracParoi.mat) annotation (Placement(transformation(extent={{-10,0},{10,20}}))); -equation - //slices connection in the case of a conventional wall +equation +//slices connection in the case of a conventional wall connect(ParoiNCouchesHomogenes.port_a, Ts_ext); - connect(ParoiNCouchesHomogenes.port_b, Ts_int); - - // Solar irradiation - connect(FluxIncExt, AbsMurExt.u) annotation (Line( - points={{-100,30},{-72,30}}, - color={0,0,127}, - smooth=Smooth.None)); + connect(ParoiNCouchesHomogenes.port_b, Ts_int); +// Solar irradiation + connect(FluxIncExt, AbsMurExt.u) annotation( + Line(points = {{-100, 30}, {-72, 30}}, color = {0, 0, 127}, smooth = Smooth.None)); connect(AbsMurExt.y, prescribedCLOAbsExt.Q_flow) annotation (Line( points={{-49,30},{-49,30.5},{-30,30.5},{-30,20}}, color={0,0,127}, @@ -151,13 +147,10 @@ connect(prescribedCLOAbsInt.port, Ts_int) annotation (Line( points={{40,40},{40,-30}}, color={191,0,0}, - smooth=Smooth.None)); - - // Surface heat transfer on both wall faces - connect(T_sky, EchangesGLOext.T_sky) annotation (Line( - points={{-90,-90},{-80,-90},{-80,-64},{-69,-64}}, - color={191,0,0}, - smooth=Smooth.None)); + smooth=Smooth.None)); +// Surface heat transfer on both wall faces + connect(T_sky, EchangesGLOext.T_sky) annotation( + Line(points = {{-90, -90}, {-80, -90}, {-80, -64}, {-69, -64}}, color = {191, 0, 0}, smooth = Smooth.None)); connect(T_ext, EchangesGLOext.T_ext) annotation (Line( points={{-90,-30},{-80,-30},{-80,-56},{-69,-56}}, color={191,0,0}, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/BuildingEnvelope/HeatTransfer/SimpleWindow.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/BuildingEnvelope/HeatTransfer/SimpleWindow.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/BuildingEnvelope/HeatTransfer/SimpleWindow.mo" 2022-03-10 09:57:39.656144335 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/BuildingEnvelope/HeatTransfer/SimpleWindow.mo" 2022-03-10 09:58:33.364151140 +0000 @@ -1,7 +1,7 @@ -within BuildSysPro.Building.BuildingEnvelope.HeatTransfer; +within BuildSysPro.Building.BuildingEnvelope.HeatTransfer; model SimpleWindow "Simple model of glazing" -// General properties +// General properties parameter Boolean useVolet=false "Presence of a shutter" annotation(Dialog(group="Options",compact=true),choices(choice=true "yes", choice=false "no", radioButtons=true)); parameter Boolean GLOext=false @@ -25,11 +25,11 @@ "Sky view factor between glazings and the sky (exemple: skyViewFactor(flat roof)=1, skyViewfactor(vertical wall in clear environment)=0.5)" annotation(Dialog(enable=GLOext,group="General properties")); -// Optical properties -parameter Real Abs=0.1 "Window absorption coefficient" annotation(Dialog(group="Optical properties")); +// Optical properties + parameter Real Abs=0.1 "Window absorption coefficient" annotation(Dialog(group="Optical properties")); parameter Real eps=0.9 "Glazing emissivity in LWR" annotation(Dialog(enable=GLOext,group="Optical properties")); -// Public components +// Public components BuildSysPro.BoundaryConditions.Solar.Interfaces.SolarFluxInput FluxTr "Global solar flux information for the transmission. Must integrate the impact of incidence." annotation (Placement(transformation(extent={{-120,50},{-80,90}}), @@ -68,8 +68,7 @@ origin={6,110}), iconTransformation(extent={{-100,66},{-72,94}}, rotation=0))); -// Internal components - +// Internal components protected BaseClasses.HeatTransfer.Components.ControlledThermalConductor echange_a1 annotation (Placement(transformation(extent={{-12,-70},{8,-50}}))); @@ -113,20 +112,18 @@ rotation=0, origin={-140,0}), iconTransformation(extent={{-88,66},{-60,94}}, rotation=0))); -equation - - // The flux is transmitted only through the window (blackout shutter) - FluxTransmis.u=(1-volet_internal)*FluxTr; - - // Calculation of the full window thermal conductance (glazing + shutters) excluding convection - if useVolet then - if volet_internal>=0.95 then - G_internal=S/(1/k+R_volet); - else - G_internal=k*S; - end if; - else - G_internal=k*S; +equation +// The flux is transmitted only through the window (blackout shutter) + FluxTransmis.u = (1 - volet_internal) * FluxTr; +// Calculation of the full window thermal conductance (glazing + shutters) excluding convection + if useVolet then + if volet_internal >= 0.95 then + G_internal = S / (1 / k + R_volet); + else + G_internal = k * S; + end if; + else + G_internal = k * S; end if; if not useVolet then diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/BuildingEnvelope/HeatTransfer/Wall.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/BuildingEnvelope/HeatTransfer/Wall.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/BuildingEnvelope/HeatTransfer/Wall.mo" 2022-03-10 09:57:39.656144335 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/BuildingEnvelope/HeatTransfer/Wall.mo" 2022-03-10 09:58:33.296151132 +0000 @@ -1,10 +1,10 @@ -within BuildSysPro.Building.BuildingEnvelope.HeatTransfer; +within BuildSysPro.Building.BuildingEnvelope.HeatTransfer; model Wall "Generic wall model - conventional, resistive or water-based heating wall" import Modelica.Units.SI; - // Type of wall +// Type of wall parameter Integer ParoiActive=1 annotation (Dialog(group="Type of wall"), choices(choice=1 "Conventional wall", @@ -15,7 +15,7 @@ annotation (Dialog(group="Type of wall"),choices(choice=true "Internal wall", choice=false "Outer wall", radioButtons=true)); - // Optional parameters +// Optional parameters parameter Boolean RadInterne=false "Inclusion of irradiation which is absorbed on the inner face" annotation (Dialog(group="Options"),choices(choice=true "yes", choice=false "no", radioButtons=true)); @@ -26,7 +26,7 @@ "Inclusion of LW radiation (infrared) between the wall, the environment and the sky" annotation (Dialog(group="Options"),choices(choice=true "yes", choice=false "no", radioButtons=true)); - // General properties +// General properties parameter Modelica.Units.NonSI.Angle_deg incl=90 "Tilt of the surface relative to the horizontal - toward the ground=180°, toward the sky=0°, vertical=90°" annotation (Dialog(enable=GLOext, group="General properties of the wall")); @@ -47,19 +47,19 @@ parameter Real eps=0.9 "Emissivity of the outer surface of the wall in LWR (concrete 0.9)" annotation (Dialog(enable=GLOext, group="General properties of the wall")); - // Initialization +// Initialization parameter SI.Temperature Tp=293.15 "Initial temperature of the wall" annotation (Dialog(group="Initialization")); parameter BuildSysPro.Utilities.Types.InitCond InitType=BuildSysPro.Utilities.Types.InitCond.SteadyState annotation (Dialog(group="Initialization")); - // Parameter common to resistive and water-based heating walls +// Parameter common to resistive and water-based heating walls parameter Integer nP=1 "Number of the layer whose upper border is the site of power injection - must be strictly lower than n" annotation (Dialog(enable=not (ParoiActive==1), group="Type of wall")); - // Parameters specific to a water-based heating wall +// Parameters specific to a water-based heating wall parameter Integer nD=8 "Number of discretization slices of the water floor" annotation (Dialog(enable=ParoiActive==2, tab="Water-based heating wall parameters")); parameter SI.Distance Ltube=128 "Floor heating coil length" @@ -73,14 +73,14 @@ "Thermal conductivity of the tube" annotation (Dialog(enable=ParoiActive==2, tab="Water-based heating wall parameters")); - // Wall U-value +// Wall U-value final parameter SI.SurfaceCoefficientOfHeatTransfer U_value = BuildSysPro.Building.BuildingEnvelope.Functions.U_Wall( wall_record=caracParoi, hs_int=hs_int, hs_ext=hs_ext) "Wall U-value"; - // Heat ports +// Heat ports BuildSysPro.BaseClasses.HeatTransfer.Interfaces.HeatPort_a T_ext "Outdoor air temperature" annotation (Placement(transformation(extent={{-100,-40},{-80,-20}}), @@ -102,7 +102,7 @@ annotation (Placement(transformation(extent={{-100,-100},{-80,-80}}), iconTransformation(extent={{-100,-100},{-80,-80}}))); - // Solar irradiation +// Solar irradiation BuildSysPro.BoundaryConditions.Solar.Interfaces.SolarFluxInput FluxIncExt[3] if not ParoiInterne "Surface incident solar flux information 1-Diffuse Flux [W/m2], 2-Direct Flux [W/m2], 3-Cosi" @@ -143,7 +143,7 @@ rotation=180, origin={-60,30}))); - // Surface heat transfer on both wall faces +// Surface heat transfer on both wall faces BuildSysPro.BaseClasses.HeatTransfer.Components.ExtLWR EchangesGLOext( S=S, eps=eps, @@ -158,7 +158,7 @@ G=hs_int*S) annotation (Placement(transformation(extent={{56,-40},{76,-20}}, rotation=0))); - // Conduction heat transfer through the wall +// Conduction heat transfer through the wall BuildSysPro.BaseClasses.HeatTransfer.Components.HomogeneousNLayersWall ParoiNCouchesHomogenes( S=S, Tinit=Tp, @@ -169,7 +169,7 @@ mat=caracParoi.mat) if ParoiActive == 1 annotation (Placement(transformation(extent={{-10,0},{10,20}}))); - // Water-based heating wall +// Water-based heating wall BuildSysPro.Systems.HVAC.Emission.RadiantFloor.RadiantHeatingFloor paroiActiveEau[nD]( Ltube=Ltube/nD*(0.1:1.8/(nD - 1):1.9), @@ -197,7 +197,7 @@ annotation (Placement(transformation(extent={{80,-80},{100,-60}}), iconTransformation(extent={{80,-80},{100,-60}}))); - // Electric radiant wall +// Electric radiant wall BuildSysPro.Systems.HVAC.Emission.RadiantFloor.RadiantHeatingFloor ParoiChauffanteElec( S=S, @@ -225,35 +225,32 @@ rotation=0, origin={-90,0}))); -equation -if ParoiActive==1 then - //slices connection in the case of a conventional wall - connect(ParoiNCouchesHomogenes.port_a, Ts_ext); - connect(ParoiNCouchesHomogenes.port_b, Ts_int); -elseif ParoiActive==2 then -//connection of the nD slices in the case of a heating with water wall - for i in 1:nD loop - connect(paroiActiveEau[i].Ts_b, Ts_int); - connect(paroiActiveEau[i].Ts_a, Ts_ext); - end for; - connect(paroiActiveEau[1].WaterIn, WaterIn); - for i in 2:nD loop - connect(paroiActiveEau[i - 1].WaterOut, paroiActiveEau[i].WaterIn); - end for; - connect(paroiActiveEau[nD].WaterOut, WaterOut); - -else // ParoiActive==3 - //slices connection in the case of a electric heating wall - connect(Ts_ext, ParoiChauffanteElec.Ts_a); - connect(ParoiChauffanteElec.Ts_b, Ts_int); - connect(PelecPRE, ParoiChauffanteElec.PelecIn); -end if; - - // Solar irradiation - connect(add.u1, FluxIncExt[2]) annotation (Line( - points={{-73.4,75.2},{-88.7,75.2},{-88.7,71},{-100,71}}, - color={0,0,127}, - smooth=Smooth.None)); +equation + if ParoiActive == 1 then +//slices connection in the case of a conventional wall + connect(ParoiNCouchesHomogenes.port_a, Ts_ext); + connect(ParoiNCouchesHomogenes.port_b, Ts_int); + elseif ParoiActive == 2 then +//connection of the nD slices in the case of a heating with water wall + for i in 1:nD loop + connect(paroiActiveEau[i].Ts_b, Ts_int); + connect(paroiActiveEau[i].Ts_a, Ts_ext); + end for; + connect(paroiActiveEau[1].WaterIn, WaterIn); + for i in 2:nD loop + connect(paroiActiveEau[i - 1].WaterOut, paroiActiveEau[i].WaterIn); + end for; + connect(paroiActiveEau[nD].WaterOut, WaterOut); + else +// ParoiActive==3 +//slices connection in the case of a electric heating wall + connect(Ts_ext, ParoiChauffanteElec.Ts_a); + connect(ParoiChauffanteElec.Ts_b, Ts_int); + connect(PelecPRE, ParoiChauffanteElec.PelecIn); + end if; +// Solar irradiation + connect(add.u1, FluxIncExt[2]) annotation( + Line(points = {{-73.4, 75.2}, {-88.7, 75.2}, {-88.7, 71}, {-100, 71}}, color = {0, 0, 127}, smooth = Smooth.None)); connect(add.u2, FluxIncExt[1]) annotation (Line( points={{-73.4,66.8},{-100,66.8},{-100,58.3333}}, color={0,0,127}, @@ -285,13 +282,10 @@ connect(prescribedCLOAbsInt.port, Ts_int) annotation (Line( points={{40,40},{40,-30}}, color={191,0,0}, - smooth=Smooth.None)); - - // Surface heat transfer on both wall faces - connect(T_sky, EchangesGLOext.T_sky) annotation (Line( - points={{-90,-90},{-80,-90},{-80,-64},{-69,-64}}, - color={191,0,0}, - smooth=Smooth.None)); + smooth=Smooth.None)); +// Surface heat transfer on both wall faces + connect(T_sky, EchangesGLOext.T_sky) annotation( + Line(points = {{-90, -90}, {-80, -90}, {-80, -64}, {-69, -64}}, color = {191, 0, 0}, smooth = Smooth.None)); connect(T_ext, EchangesGLOext.T_ext) annotation (Line( points={{-90,-30},{-80,-30},{-80,-56},{-69,-56}}, color={191,0,0}, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/BuildingEnvelope/HeatTransfer/Window.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/BuildingEnvelope/HeatTransfer/Window.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/BuildingEnvelope/HeatTransfer/Window.mo" 2022-03-10 09:57:39.656144335 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/BuildingEnvelope/HeatTransfer/Window.mo" 2022-03-10 09:58:33.240151125 +0000 @@ -1,7 +1,7 @@ -within BuildSysPro.Building.BuildingEnvelope.HeatTransfer; +within BuildSysPro.Building.BuildingEnvelope.HeatTransfer; model Window "Generic window model" - // Glazing options -parameter Boolean useVolet=false annotation(Dialog(group="Options",compact=true),choices(choice=true + // Glazing options + parameter Boolean useVolet=false annotation(Dialog(group="Options",compact=true),choices(choice=true "With shutter", choice=false "Without shutter", radioButtons=true)); parameter Boolean useOuverture=false @@ -16,7 +16,7 @@ annotation(Dialog(group="Options",compact=true),choices(choice=true "With calculation of natural lighting", choice=false "Without calculation of natural lighting", radioButtons=true)); - // General parameters + // General parameters parameter Modelica.Units.SI.Area S=1 "Glazing surface" annotation (Dialog(group="General parameters")); parameter Modelica.Units.SI.Length H=1 "Height of the window" @@ -24,7 +24,7 @@ parameter Modelica.Units.SI.Length L=1 "Width of the window" annotation (Dialog(enable=useEclairement, group="General parameters")); -// Coefficient of transmission and exchanges such as Uglazing = 3 +// Coefficient of transmission and exchanges such as Uglazing = 3 parameter Modelica.Units.SI.CoefficientOfHeatTransfer k=6.06 "Surface transmission coefficient k of the glazing - without convective exchanges; by default, k, hs_ext and hs_int lead to a Uvalue = 3 W/m2/K" annotation (Dialog(group="General parameters")); @@ -47,15 +47,15 @@ choice=3 "Cardonnel", choice=4 "Linear with cosi")); -// Optical parameters -parameter Real TrDir=0.747 "Direct transmission coefficient of the window" annotation(Dialog(group="Optical properties")); +// Optical parameters + parameter Real TrDir=0.747 "Direct transmission coefficient of the window" annotation(Dialog(group="Optical properties")); parameter Real TrDif=0.665 "Diffuse transmission coefficient of the window" annotation(Dialog(group="Optical properties")); parameter Real AbsDir=0.100 "Direct absorption coefficient of the window" annotation(Dialog(group="Optical properties")); parameter Real AbsDif=0.108 "Diffuse absorption coefficient of the window" annotation(Dialog(group="Optical properties")); parameter Real eps=0.9 "Glazing emissivity in LWR" annotation(Dialog(group="Optical properties")); -// Reduction factors of direct and diffuse fluxes (masking, frame, ...) -parameter Integer TypeFenetrePF=1 "Choice of type of window or French window" +// Reduction factors of direct and diffuse fluxes (masking, frame, ...) + parameter Integer TypeFenetrePF=1 "Choice of type of window or French window" annotation (Dialog(tab="Type of glazing",enable=useReduction,group="Parameters"), choices( choice= 1 "I do not know - no frame", choice= 2 "Wood window sashes", @@ -87,8 +87,8 @@ "Reduction factor for diffuse radiation if useReduction = false" annotation (Dialog(tab="Type of glazing",enable=not useReduction,group="Reduction factor if useReduction = false")); - // Consideration of radiative flux within the window -parameter Boolean RadInterne=false "Consideration of flux absorbed inside" +// Consideration of radiative flux within the window + parameter Boolean RadInterne=false "Consideration of flux absorbed inside" annotation(Dialog(tab="Advanced parameters",compact=true),choices(choice=true "yes", choice=false "no", radioButtons=true)); parameter Boolean DifDirOut=false "Output of direct and diffuse fluxes instead of the total flux" annotation(Dialog(tab="Advanced parameters",compact=true),choices(choice=true "yes", choice=false "no", radioButtons=true)); @@ -108,7 +108,7 @@ Real part_vitrage; Real part_vide; - //Light transmission factors +//Light transmission factors Real Tlii_sp=TransLum.CoeffTransLum[1]-TransLum.CoeffTransLum[2] if useEclairement "Light transmission factor of direct incident flux transmitted into a direct flux through the glazing without awning or blind"; Real Tlii_ap_dir=Tld_ap_dif-Tlid_ap_dir if useEclairement @@ -126,7 +126,7 @@ Real Tlii_ap_ref=Tld_ap_dif-Tlid_ap_ref if useEclairement "Light transmission factor of incident flux reflected by the ground and transmitted into a direct flux through the glazing with awning or blind"; -// Connectors +// Connectors public BuildSysPro.BoundaryConditions.Solar.Interfaces.SolarFluxInput FluxIncExt[3] "Incident solar surface flux information 1-Diffuse flux [W/m2], 2-Direct flux [W/m2], 3-Cosi" @@ -183,8 +183,7 @@ transformation(extent={{-120,60},{-80,100}}), iconTransformation(extent={{-100, -10},{-80,10}}))); -// Components - +// Components BuildSysPro.BaseClasses.HeatTransfer.Components.ControlledThermalConductor conduction annotation (Placement(transformation(extent={{-12,-70},{8,-50}}))); @@ -333,13 +332,10 @@ BoundaryConditions.Solar.Irradiation.DirectAbs absDirect(choix=choix, AbsDir= AbsDir) annotation (Placement(transformation(extent={{-46,32},{-30,48}}))); -equation - //Calculation of thermal conductance of the full window (glazing + shutters) excluding convection - connect(G_internal,conduction. G) annotation (Line( - points={{-150,0},{-76,0},{-76,-18},{-2,-18},{-2,-52}}, - color={0,0,127}, - smooth=Smooth.None, - pattern=LinePattern.Dot)); +equation +//Calculation of thermal conductance of the full window (glazing + shutters) excluding convection + connect(G_internal, conduction.G) annotation( + Line(points = {{-150, 0}, {-76, 0}, {-76, -18}, {-2, -18}, {-2, -52}}, color = {0, 0, 127}, smooth = Smooth.None, pattern = LinePattern.Dot)); if useVolet then if volet_internal>=0.95 then G_internal=S/(1/k+R_volet); @@ -378,12 +374,10 @@ connect(Ts_int, echange_int.port_a) annotation (Line( points={{30,-30},{30,-60},{41,-60}}, color={255,0,0}, - smooth=Smooth.None)); -// SWR exchanges - connect(prescribedCLOAbsExt.Q_flow, AbsFenExt.y) annotation (Line( - points={{-68,5},{-59.4,5},{-59.4,4},{-59,4}}, - color={0,0,127}, - smooth=Smooth.None)); + smooth=Smooth.None)); +// SWR exchanges + connect(prescribedCLOAbsExt.Q_flow, AbsFenExt.y) annotation( + Line(points = {{-68, 5}, {-59.4, 5}, {-59.4, 4}, {-59, 4}}, color = {0, 0, 127}, smooth = Smooth.None)); connect(Transmission.y, CLOTr) annotation (Line( points={{69,72},{74,72},{74,70},{80,70}}, color={0,0,127}, @@ -392,28 +386,23 @@ annotation (Line( points={{58,10},{65.6,10},{65.6,9},{101,9}}, color={0,0,127}, - smooth=Smooth.None)); - - //Impact of occultations on transmitted and absorbed fluxes - //The flux is transmitted only through the window (blackout shutter) - if S>0 then - part_vitrage=(if useOuverture then (if ouverture_internal then (if useReduction then (1-R_ouv_max) else 0) else 1) else 1)*S; - part_vide=S-part_vitrage; - FluxDirectTr.u=reduc_dir*(1 - volet_internal)*(transDirect.FluxTrDir* - part_vitrage + FluxIncExt[2]*part_vide)/S; - FluxDiffusTr.u=reduc_dif*(1 - volet_internal)*FluxIncExt[1]*(TrDif* - part_vitrage + part_vide)/S; - AbsFenExt.u1=reduc_dir*(1 - volet_internal)*(absDirect.FluxAbsDir* - part_vitrage + FluxIncExt[2]*part_vide)/S; - AbsFenExt.u2=reduc_dif*(1 - volet_internal)*FluxIncExt[1]*(AbsDif* - part_vitrage + part_vide)/S; - else - part_vitrage=0; - part_vide=0; - FluxDirectTr.u=0; - FluxDiffusTr.u=0; - AbsFenExt.u1=0; - AbsFenExt.u2=0; + smooth=Smooth.None)); +//Impact of occultations on transmitted and absorbed fluxes +//The flux is transmitted only through the window (blackout shutter) + if S > 0 then + part_vitrage = (if useOuverture then if ouverture_internal then if useReduction then 1 - R_ouv_max else 0 else 1 else 1) * S; + part_vide = S - part_vitrage; + FluxDirectTr.u = reduc_dir * (1 - volet_internal) * (transDirect.FluxTrDir * part_vitrage + FluxIncExt[2] * part_vide) / S; + FluxDiffusTr.u = reduc_dif * (1 - volet_internal) * FluxIncExt[1] * (TrDif * part_vitrage + part_vide) / S; + AbsFenExt.u1 = reduc_dir * (1 - volet_internal) * (absDirect.FluxAbsDir * part_vitrage + FluxIncExt[2] * part_vide) / S; + AbsFenExt.u2 = reduc_dif * (1 - volet_internal) * FluxIncExt[1] * (AbsDif * part_vitrage + part_vide) / S; + else + part_vitrage = 0; + part_vide = 0; + FluxDirectTr.u = 0; + FluxDiffusTr.u = 0; + AbsFenExt.u1 = 0; + AbsFenExt.u2 = 0; end if; connect(prescribedCLOAbsExt.port, Ts_ext) annotation (Line( @@ -448,13 +437,10 @@ connect(FluxIncExt, transDirect.FluxIncExt) annotation (Line( points={{-100,40},{-70,40},{-70,78.32},{-46.8,78.32}}, color={255,192,1}, - smooth=Smooth.None)); - - // LWR exchanges - connect(EchangesGLOext.T_ext, T_ext) annotation (Line( - points={{-69,-84},{-76,-84},{-76,-30},{-90,-30}}, - color={191,0,0}, - smooth=Smooth.None)); + smooth=Smooth.None)); +// LWR exchanges + connect(EchangesGLOext.T_ext, T_ext) annotation( + Line(points = {{-69, -84}, {-76, -84}, {-76, -30}, {-90, -30}}, color = {191, 0, 0}, smooth = Smooth.None)); connect(EchangesGLOext.T_sky, T_sky) annotation (Line( points={{-69,-92},{-79.5,-92},{-79.5,-90},{-90,-90}}, color={191,0,0}, @@ -462,15 +448,10 @@ connect(EchangesGLOext.Ts_ext, Ts_ext) annotation (Line( points={{-51,-88},{-30,-88},{-30,-30}}, color={255,0,0}, - smooth=Smooth.None)); - - // Opening of the window - - connect(V, fenetreVentilationNaturelle.V) annotation (Line( - points={{-100,80},{-60,80},{-60,30},{-10,30},{-10,8}}, - color={0,0,127}, - smooth=Smooth.None, - pattern=LinePattern.Dot)); + smooth=Smooth.None)); +// Opening of the window + connect(V, fenetreVentilationNaturelle.V) annotation( + Line(points = {{-100, 80}, {-60, 80}, {-60, 30}, {-10, 30}, {-10, 8}}, color = {0, 0, 127}, smooth = Smooth.None, pattern = LinePattern.Dot)); connect(T_ext, SensorText.port) annotation (Line( points={{-90,-30},{-83,-30},{-83,-26},{-76,-26}}, color={191,0,0}, @@ -525,23 +506,16 @@ points={{-19.4,-52},{-14,-52},{-14,-118},{-136,-118},{-136,36},{-150,36}}, color={255,0,255}, smooth=Smooth.None, - pattern=LinePattern.Dot)); -//Shutter - connect(volet_internal, fermeture_volet) annotation (Line( - points={{-150,80},{2,80},{2,116}}, - color={0,0,127}, - smooth=Smooth.None, - pattern=LinePattern.Dot)); + pattern=LinePattern.Dot)); +//Shutter + connect(volet_internal, fermeture_volet) annotation( + Line(points = {{-150, 80}, {2, 80}, {2, 116}}, color = {0, 0, 127}, smooth = Smooth.None, pattern = LinePattern.Dot)); if not useVolet then volet_internal=0; - end if; - -// Others - - connect(CalculETP.y, Etp) annotation (Line( - points={{9,-100},{13,-100},{13,-129}}, - color={0,0,127}, - smooth=Smooth.None)); + end if; +// Others + connect(CalculETP.y, Etp) annotation( + Line(points = {{9, -100}, {13, -100}, {13, -129}}, color = {0, 0, 127}, smooth = Smooth.None)); connect(CalculFlum.y, Flum) annotation (Line( points={{87,-100},{96,-100},{96,-69},{123,-69}}, color={0,0,127}, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/Examples/OneZone.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/Examples/OneZone.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/Examples/OneZone.mo" 2022-03-10 09:57:39.656144335 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/Examples/OneZone.mo" 2022-03-10 09:58:33.096151106 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.Building.Examples; +within BuildSysPro.Building.Examples; model OneZone "Pure thermal modelling for a one-zone model" extends Modelica.Icons.Example; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/Examples/TestZoneNWalls.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/Examples/TestZoneNWalls.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/Examples/TestZoneNWalls.mo" 2022-03-10 09:57:39.656144335 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/Examples/TestZoneNWalls.mo" 2022-03-10 09:58:33.080151105 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.Building.Examples; +within BuildSysPro.Building.Examples; model TestZoneNWalls extends Modelica.Icons.Example; BuildSysPro.Building.Zones.HeatTransfer.ZoneNWalls zoneNparois( @@ -167,13 +167,10 @@ annotation (Placement(transformation(extent={{62,46},{82,66}}))); BuildSysPro.Building.AirFlow.HeatTransfer.AirRenewal RenouvellementAir(Qv=53) annotation (Placement(transformation(extent={{12,84},{32,104}}))); -equation - - // Multizone - connect(meteofile.T_dry, zoneNparois.T_ext) annotation (Line( - points={{-71,-29},{-46,-29},{-46,-69.1},{19.9,-69.1}}, - color={255,0,0}, - smooth=Smooth.None)); +equation +// Multizone + connect(meteofile.T_dry, zoneNparois.T_ext) annotation( + Line(points = {{-71, -29}, {-46, -29}, {-46, -69.1}, {19.9, -69.1}}, color = {255, 0, 0}, smooth = Smooth.None)); connect(meteofile.G, zoneNparois.G) annotation (Line( points={{-71,-34},{-48.5,-34},{-48.5,-59.6},{18,-59.6}}, color={0,0,127}, @@ -181,14 +178,11 @@ connect(fixedTemperature.port,zoneNparois.T_ground) annotation (Line( points={{-64,-84},{-38,-84},{-38,-90},{25.6,-90}}, color={191,0,0}, - smooth=Smooth.None)); - - // Models assembling - //Connection outer thermal port - connect(Plafond.T_ext, Text) annotation (Line( - points={{-17,77},{-17,26.5},{-49,26.5},{-49,27}}, - color={191,0,0}, - smooth=Smooth.None)); + smooth=Smooth.None)); +// Models assembling +//Connection outer thermal port + connect(Plafond.T_ext, Text) annotation( + Line(points = {{-17, 77}, {-17, 26.5}, {-49, 26.5}, {-49, 27}}, color = {191, 0, 0}, smooth = Smooth.None)); connect(Sud.T_ext, Text) annotation (Line( points={{-17,49},{-16.5,49},{-16.5,27},{-49,27}}, color={191,0,0}, @@ -221,13 +215,10 @@ connect(EstVitrage.T_ext, Text) annotation (Line( points={{11,-25},{-17.5,-25},{-17.5,27},{-49,27}}, color={191,0,0}, - smooth=Smooth.None)); - - // Connection inner thermal port - connect(SudVitrage.T_int, Tint) annotation (Line( - points={{29,59},{28.5,59},{28.5,31},{61,31}}, - color={255,0,0}, - smooth=Smooth.None)); + smooth=Smooth.None)); +// Connection inner thermal port + connect(SudVitrage.T_int, Tint) annotation( + Line(points = {{29, 59}, {28.5, 59}, {28.5, 31}, {61, 31}}, color = {255, 0, 0}, smooth = Smooth.None)); connect(OuestVitrage.T_int, Tint) annotation (Line( points={{29,31},{61,31}}, color={255,0,0}, @@ -263,30 +254,19 @@ connect(Plafond.T_int, Tint) annotation (Line( points={{1,77},{1.5,77},{1.5,31},{61,31}}, color={255,0,0}, - smooth=Smooth.None)); - - //Sum of SWR to distribute - connect(pintDistribRad.RayEntrant, multiSum.y) annotation (Line( - points={{66,1},{66,14},{65.02,14}}, - color={255,192,1}, - smooth=Smooth.None)); - - // Meteo data to Text - connect(meteofile.T_dry, Text) annotation (Line( - points={{-71,-29},{-60,-29},{-60,27},{-49,27}}, - color={255,0,0}, - smooth=Smooth.None)); - // Connection floor temperature - connect(Plancher.Ts_ext, fixedTemperature.port) annotation (Line( - points={{-11,-49},{-10.5,-49},{-10.5,-84},{-64,-84}}, - color={191,0,0}, - smooth=Smooth.None)); - - //Solar flux to walls - connect(fLUXsurf.FluxIncExt, Plafond.FluxIncExt) annotation (Line( - points={{-29.4,89.94},{-28.7,89.94},{-28.7,89},{-11,89}}, - color={255,192,1}, - smooth=Smooth.None)); + smooth=Smooth.None)); +//Sum of SWR to distribute + connect(pintDistribRad.RayEntrant, multiSum.y) annotation( + Line(points = {{66, 1}, {66, 14}, {65.02, 14}}, color = {255, 192, 1}, smooth = Smooth.None)); +// Meteo data to Text + connect(meteofile.T_dry, Text) annotation( + Line(points = {{-71, -29}, {-60, -29}, {-60, 27}, {-49, 27}}, color = {255, 0, 0}, smooth = Smooth.None)); +// Connection floor temperature + connect(Plancher.Ts_ext, fixedTemperature.port) annotation( + Line(points = {{-11, -49}, {-10.5, -49}, {-10.5, -84}, {-64, -84}}, color = {191, 0, 0}, smooth = Smooth.None)); +//Solar flux to walls + connect(fLUXsurf.FluxIncExt, Plafond.FluxIncExt) annotation( + Line(points = {{-29.4, 89.94}, {-28.7, 89.94}, {-28.7, 89}, {-11, 89}}, color = {255, 192, 1}, smooth = Smooth.None)); connect(fLUXsurf.G, meteofile.G) annotation (Line( points={{-42.6,90},{-58,90},{-58,-34},{-71,-34}}, color={0,0,127}, @@ -326,12 +306,10 @@ connect(fLUXsurf4.G, meteofile.G) annotation (Line( points={{-48.6,-10},{-62,-10},{-62,-34},{-71,-34}}, color={0,0,127}, - smooth=Smooth.None)); - // Solar flux to glazings - connect(fLUXsurf4.FluxIncExt, EstVitrage.FluxIncExt) annotation (Line( - points={{-35.4,-10.06},{8.3,-10.06},{8.3,-17},{17,-17}}, - color={255,192,1}, - smooth=Smooth.None)); + smooth=Smooth.None)); +// Solar flux to glazings + connect(fLUXsurf4.FluxIncExt, EstVitrage.FluxIncExt) annotation( + Line(points = {{-35.4, -10.06}, {8.3, -10.06}, {8.3, -17}, {17, -17}}, color = {255, 192, 1}, smooth = Smooth.None)); connect(NordVitrage.FluxIncExt, fLUXsurf3.FluxIncExt) annotation (Line( points={{17,11},{-8.5,11},{-8.5,11.94},{-33.4,11.94}}, @@ -346,13 +324,10 @@ connect(SudVitrage.FluxIncExt, fLUXsurf1.FluxIncExt) annotation (Line( points={{17,67},{-6.5,67},{-6.5,59.94},{-29.4,59.94}}, color={255,192,1}, - smooth=Smooth.None)); - - // Distri SWR to wall - connect(pintDistribRad.FLUXParois[1], Sud.FluxAbsInt) annotation (Line( - points={{63.1667,-19},{32,-19},{32,57},{-5,57}}, - color={255,192,1}, - smooth=Smooth.None)); + smooth=Smooth.None)); +// Distri SWR to wall + connect(pintDistribRad.FLUXParois[1], Sud.FluxAbsInt) annotation( + Line(points = {{63.1667, -19}, {32, -19}, {32, 57}, {-5, 57}}, color = {255, 192, 1}, smooth = Smooth.None)); connect(pintDistribRad.FLUXParois[2], Ouest.FluxAbsInt) annotation (Line( points={{63.5,-19},{32,-19},{32,33},{-5,33}}, color={255,192,1}, @@ -372,13 +347,10 @@ connect(pintDistribRad.FLUXParois[6], Plafond.FluxAbsInt) annotation (Line( points={{64.8333,-19},{34,-19},{34,85},{-5,85}}, color={255,192,1}, - smooth=Smooth.None)); - //Distri SWR to glazing - connect(pintDistribRad.FLUXFenetres[1], SudVitrage.FluxAbsInt) annotation ( - Line( - points={{67.25,-19},{48,-19},{48,65},{23,65}}, - color={255,192,1}, - smooth=Smooth.None)); + smooth=Smooth.None)); +//Distri SWR to glazing + connect(pintDistribRad.FLUXFenetres[1], SudVitrage.FluxAbsInt) annotation( + Line(points = {{67.25, -19}, {48, -19}, {48, 65}, {23, 65}}, color = {255, 192, 1}, smooth = Smooth.None)); connect(pintDistribRad.FLUXFenetres[2], OuestVitrage.FluxAbsInt) annotation ( Line( points={{67.75,-19},{46,-19},{46,37},{23,37}}, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/Examples/ValidationDMvsSM.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/Examples/ValidationDMvsSM.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/Examples/ValidationDMvsSM.mo" 2022-03-10 09:57:39.656144335 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/Examples/ValidationDMvsSM.mo" 2022-03-10 09:58:33.012151096 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.Building.Examples; +within BuildSysPro.Building.Examples; model ValidationDMvsSM "Comparison between DetailedMonozone and SimplifiedMonozone models" extends Modelica.Icons.Example; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/Zones/HeatTransfer/DetailedMonozone.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/Zones/HeatTransfer/DetailedMonozone.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/Zones/HeatTransfer/DetailedMonozone.mo" 2022-03-10 09:57:39.656144335 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/Zones/HeatTransfer/DetailedMonozone.mo" 2022-03-10 09:58:32.992151094 +0000 @@ -1,8 +1,8 @@ -within BuildSysPro.Building.Zones.HeatTransfer; +within BuildSysPro.Building.Zones.HeatTransfer; model DetailedMonozone "Single zone detailed model with adjustable inertia and average thermal transmission coefficient (Ubat, W/K.m²)" -// General parameters +// General parameters parameter Modelica.Units.SI.CoefficientOfHeatTransfer Ubat "Ubat: surface thermal losses by transmission" annotation (Dialog(group="Global parameters")); @@ -13,7 +13,7 @@ annotation (Dialog(group="Global parameters")); parameter Real renouv(unit="1/h") "Ventilation and/or infiltration flow" annotation(Dialog(group="Global parameters")); -// Glazing parameters +// Glazing parameters parameter Modelica.Units.SI.Area[4] SurfaceVitree "Glazed surface (North, South, East, West)" annotation (Dialog(group="Glazing")); @@ -22,7 +22,7 @@ parameter Real Tr=0.544 "Glazing transmission coefficient" annotation(Dialog(group="Glazing")); parameter Real AbsVitrage=0.1 "Glazing absorption coefficient" annotation(Dialog(group="Glazing")); parameter Real epsWindows=0.9 "Emissivity" annotation(Dialog(group="Glazing")); -// Walls parameters + // Walls parameters replaceable parameter BuildSysPro.Utilities.Records.GenericWall paraPlafond "Ceiling parameters" annotation (choicesAllMatching=true, Dialog(group="Walls")); @@ -57,11 +57,11 @@ "Absorption coefficient of outer walls in the visible" annotation(Dialog(group="Walls")); parameter Real epsParois=0.7 "Outer walls emissivity in LWR" annotation(Dialog(group="Walls")); -// Initialisation +// Initialisation parameter Modelica.Units.SI.Temperature Tinit=292.15 "Initialisation temperature" annotation (Dialog(tab="Initialisation")); -// Internal parameters +// Internal parameters protected parameter Modelica.Units.SI.Length hTotal=Vair*(NbNiveau/SH) "Total building height"; @@ -79,8 +79,8 @@ parameter Modelica.Units.SI.CoefficientOfHeatTransfer Ug=1/(1/k + 1/ hs_ext_paroiV + 1/hs_int_paroiV) "Glazings Uvalue"; - // Second order polynomial system resolution to find the value of alpha, multiplying factor of insulating layers in vertical walls and the ceiling -parameter Real Anew=Ubat*Sdeper-Swin*Ug-b*Uplancher*Splancher +// Second order polynomial system resolution to find the value of alpha, multiplying factor of insulating layers in vertical walls and the ceiling + parameter Real Anew=Ubat*Sdeper-Swin*Ug-b*Uplancher*Splancher "Ubat decomposition"; parameter Real coefN1=(Sop-2*Splancher); parameter Real coefN2=Splancher; @@ -96,14 +96,14 @@ parameter Real alpha=abs((-COEF2+sqrt(COEF2^2-4*COEF1*COEF3))/(2*COEF1)) "Multiplying factor of insulating layers (vertical walls and ceiling)"; - // Computation of Ubat extreme values -parameter Real Umin=(Swin*Ug+Uplancher*b*Splancher)/Sdeper +// Computation of Ubat extreme values + parameter Real Umin=(Swin*Ug+Uplancher*b*Splancher)/Sdeper "Ubat minimum value for the considered type of floor and glazing"; parameter Real Umax=(Swin*Ug+Uplancher*b*Splancher+(Sop-2*Splancher)/(sum(paraParoiV.e./paraParoiV.mat.lambda.*(ones(paraParoiV.n)-paraParoiV.positionIsolant))+1/hs_ext_paroiV+1/hs_int_paroiV)+b*Splancher/(sum(paraPlafond.e./paraPlafond.mat.lambda.*(ones(paraPlafond.n)-paraPlafond.positionIsolant))+1/hs_ext_Plafond+1/hs_int_Plafond))/Sdeper "Ubat maximal value for the considered type of wall and glazing"; -// Internal components -BuildSysPro.Building.BuildingEnvelope.HeatTransfer.Wall plafond( +// Internal components + BuildSysPro.Building.BuildingEnvelope.HeatTransfer.Wall plafond( caracParoi( n=paraPlafond.n, mat=paraPlafond.mat, @@ -304,7 +304,7 @@ BuildSysPro.Building.AirFlow.HeatTransfer.AirNode noeudAir(V=Vair, Tair( displayUnit="K") = Tinit) annotation (Placement(transformation(extent={{50,4},{70,24}}))); -// Public components + // Public components public BuildSysPro.BaseClasses.HeatTransfer.Interfaces.HeatPort_a T_ext annotation ( Placement(transformation(extent={{-100,-20},{-80,0}}), iconTransformation( @@ -334,7 +334,7 @@ annotation (Placement(transformation(extent={{-120,10},{-80,50}}), iconTransformation(extent={{-100,-10},{-80,10}}))); -// For validation in stationary operation: set the parameters to have SWR, LWR (abs and eps), renew at zero and 1°C of difference between outdoor and indoor) +// For validation in stationary operation: set the parameters to have SWR, LWR (abs and eps), renew at zero and 1°C of difference between outdoor and indoor) Real UbatEffectif=T_int.Q_flow/Sdeper; BuildSysPro.BoundaryConditions.Solar.Interfaces.SolarFluxInput FluxIncExtRoof[3] diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/Zones/HeatTransfer/SimplifiedZone1.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/Zones/HeatTransfer/SimplifiedZone1.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/Zones/HeatTransfer/SimplifiedZone1.mo" 2022-03-10 09:57:39.656144335 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Building/Zones/HeatTransfer/SimplifiedZone1.mo" 2022-03-10 09:58:32.904151083 +0000 @@ -1,8 +1,8 @@ -within BuildSysPro.Building.Zones.HeatTransfer; +within BuildSysPro.Building.Zones.HeatTransfer; model SimplifiedZone1 "One-zone simplified model with equivalent building envelope component (wall, floor) and user-defined Uvalue" -// General properties +// General properties parameter Modelica.Units.SI.CoefficientOfHeatTransfer Ubat "Deperditive coefficient for for thermal losses by transmission" annotation (Dialog(group="Global parameters")); @@ -14,7 +14,7 @@ parameter Real renouv(unit="1/h") "Ventilation and/or infiltration flow [vol/h]" annotation(Dialog(group="Global parameters")); -// Glazing parameters +// Glazing parameters parameter Modelica.Units.SI.Area SurfaceVitree "Total glazed surface" annotation (Dialog(group="Glazing")); parameter Modelica.Units.SI.CoefficientOfHeatTransfer k @@ -25,7 +25,7 @@ parameter Real AbsVitrage=0.1 "Absorptance" annotation(Dialog(group="Glazing")); parameter Real epsWindows=0.9 "LWR emissivity" annotation(Dialog(group="Glazing")); -// Walls parameters +// Walls parameters replaceable parameter BuildSysPro.Utilities.Records.GenericWall paraParoiExt "External walls definition" annotation (choicesAllMatching=true, Dialog(group="Walls")); @@ -53,11 +53,11 @@ annotation(Dialog(group="Walls")); parameter Real epsParois=0.7 "Outer walls emissivity in LWR" annotation(Dialog(group="Walls")); -// Initialisation +// Initialisation parameter Modelica.Units.SI.Temperature Tinit=292.15 "Initialisation temperature" annotation (Dialog(tab="Initialisation")); -// Internal parameters +// Internal parameters protected parameter Modelica.Units.SI.Length hTotal=Vair*(NbNiveau/SH) "Total building height"; @@ -75,8 +75,8 @@ parameter Modelica.Units.SI.CoefficientOfHeatTransfer Ug=1/(1/k + 1/ hs_ext_paroiExt + 1/hs_int_paroiExt) "Glazing Uvalue"; - // First order polynomial system resolution to find the value of alpha, multiplying factor of insulating layers in vertical walls and the roof -parameter Real Anew=Ubat*Sdeper-Swin*Ug-b*Uplancher*Splancher +// First order polynomial system resolution to find the value of alpha, multiplying factor of insulating layers in vertical walls and the roof + parameter Real Anew=Ubat*Sdeper-Swin*Ug-b*Uplancher*Splancher "Ubat decomposition"; parameter Real coefN1=(Sop-Splancher); parameter Real coefD1=sum(paraParoiExt.e./paraParoiExt.mat.lambda.*paraParoiExt.positionIsolant); @@ -85,13 +85,13 @@ parameter Real alpha=(coefN1-Anew*coefD2)/(Anew*coefD1) "Factor of insulating layers (vertical walls and roof)"; - // Computation of Ubat extreme values -parameter Real Umin=(Swin*Ug+Uplancher*b*Splancher)/Sdeper +// Computation of Ubat extreme values + parameter Real Umin=(Swin*Ug+Uplancher*b*Splancher)/Sdeper "Ubat minimum value for the considered type of floor and glazing"; parameter Real Umax=(Swin*Ug+Uplancher*b*Splancher+(Sop-Splancher)/(sum(paraParoiExt.e./paraParoiExt.mat.lambda.*(ones(paraParoiExt.n)-paraParoiExt.positionIsolant))+1/hs_ext_paroiExt+1/hs_int_paroiExt))/Sdeper "Ubat maximal value for the considered type of wall and glazing"; -// Internal components +// Internal components BuildSysPro.Building.AirFlow.HeatTransfer.AirNode noeudAir(V=Vair, Tair( displayUnit="K") = Tinit) "Air node" annotation (Placement(transformation(extent={{50,4},{70,24}}))); @@ -179,7 +179,8 @@ extent={{-6,-6},{6,6}}, rotation=270, origin={38,-60}))); -// Public components + +// Public components public BuildSysPro.BaseClasses.HeatTransfer.Interfaces.HeatPort_a T_ext "Air temperature" annotation (Placement(transformation(extent={{-110,30},{ @@ -205,19 +206,16 @@ annotation (Placement(transformation(extent={{-50,110},{-30,130}}), iconTransformation(extent={{-50,110},{-30,130}}))); -// For validation in stationary operation: set the parameters to have SWR, LWR (abs and eps), air renewal at zero and 1°C of difference between outdoor and indoor) +// For validation in stationary operation: set the parameters to have SWR, LWR (abs and eps), air renewal at zero and 1°C of difference between outdoor and indoor) Real UbatEffectif=T_int.Q_flow/Sdeper; equation assert(max(paraParoiExt.positionIsolant)==1, "No insulating layer specified for outer walls. Edit paraParoiExt.positionIsolant"); assert(max(paraPlancher.positionIsolant)==1, "No insulating layer specified for floors. Edit paraPlancher.positionIsolant"); -assert(UbatUmin,"The value of Ubat depends on selected types of glazing and walls. Given the current configuration, "+String(Umin)+"Umin,"The value of Ubat depends on selected types of glazing and walls. Given the current configuration, "+String(Umin)+"=7 then true else false; -// Weighting coefficients +// Weighting coefficients protected BuildSysPro.Building.BuildingEnvelope.HeatTransfer.B_Coefficient TauPlancher( b=paraMaisonRT.bPlancher) @@ -103,7 +103,7 @@ paraMaisonRT.bLNC) annotation (Placement(transformation(extent={{-58,-60},{-38,-40}}))); -// Horizontal walls +// Horizontal walls BuildSysPro.Building.BuildingEnvelope.HeatTransfer.Wall Plafond( S=BuildSysPro.BuildingStock.Utilities.Records.Geometry.CollectiveHousing.SettingsMatisse.Surf_PlafondHaut, ParoiInterne=true, @@ -176,7 +176,7 @@ rotation=90, origin={71,-92}))); -// Exterior vertical walls +// Exterior vertical walls BuildSysPro.Building.BuildingEnvelope.HeatTransfer.Wall Porte( S=BuildSysPro.BuildingStock.Utilities.Records.Geometry.CollectiveHousing.SettingsMatisse.Surf_PorteEntree, Tp=Tp, @@ -250,8 +250,7 @@ positionIsolant=paraMaisonRT.MurExt.positionIsolant)) if EmplacementOuest annotation (Placement(transformation(extent={{-7,-20},{7,-6}}))); -// Internal vertical walls - +// Internal vertical walls BuildSysPro.Building.BuildingEnvelope.HeatTransfer.Wall Cloisons( ParoiInterne=true, S=BuildSysPro.BuildingStock.Utilities.Records.Geometry.CollectiveHousing.SettingsMatisse.Surf_Cloison, @@ -349,8 +348,7 @@ not EmplacementOuest annotation (Placement(transformation(extent={{-7,-2},{7,12}}))); -// Glazings - +// Glazings BuildSysPro.Building.BuildingEnvelope.HeatTransfer.Window VitrageNord( S=BuildSysPro.BuildingStock.Utilities.Records.Geometry.CollectiveHousing.SettingsMatisse.Surf_VitrageNord, GLOext=GLOEXT, @@ -373,12 +371,12 @@ useReduction=useReduction) annotation (Placement(transformation(extent={{-37,16},{-23,30}}))); -// Thermal bridges +// Thermal bridges BuildSysPro.BaseClasses.HeatTransfer.Components.ThermalConductor PontsThermiques(G=G_ponts) annotation (Placement(transformation(extent={{-58,-80},{-43,-65}}))); -// Components for LW/SW radiations +// Components for LW/SW radiations public BuildSysPro.BaseClasses.HeatTransfer.Interfaces.HeatPort_a T_sky if GLOEXT==true annotation (Placement(transformation(extent={{-100,0},{-80,20}}), @@ -401,8 +399,8 @@ rotation=-90, origin={-14,-66}))); -// Base components -Modelica.Blocks.Interfaces.RealInput G[10] +// Base components + Modelica.Blocks.Interfaces.RealInput G[10] "DIFH, DIRN, DIRH, GLOH, t0, CosDir[1:3], solar azimuth angle, solar elevation angle" annotation (Placement(transformation(extent={{-140,70},{-100,110}}), iconTransformation(extent={{-140,120},{-100,160}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/CollectiveHousing/Matisse/MatisseMultizone.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/CollectiveHousing/Matisse/MatisseMultizone.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/CollectiveHousing/Matisse/MatisseMultizone.mo" 2022-03-10 09:57:39.656144335 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/CollectiveHousing/Matisse/MatisseMultizone.mo" 2022-03-10 09:58:31.740150934 +0000 @@ -1,20 +1,20 @@ -within BuildSysPro.BuildingStock.CollectiveHousing.Matisse; +within BuildSysPro.BuildingStock.CollectiveHousing.Matisse; model MatisseMultizone import BuildSysPro; - // Choice of RT (French building regulation) +// Choice of RT (French building regulation) replaceable parameter BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataMATISSE.BuildingType paraMaisonRT "French building regulation to use" annotation ( choicesAllMatching=true, Dialog(group="Choice of RT")); - // Orientation of the apartment +// Orientation of the apartment parameter Real beta=0 "Correction of azimuth for vertical walls such as azimuth=beta+azimuth, {beta=0 : N=180,S=0,E=-90,O=90}"; parameter Integer EmplacementAppartement=5 "From 1 to 9, define the position of the apartment : 1 to 3 last floor - 4 à 6 intermediate floor - 7 à 9 : ground floor (from west to east)"; - // Thermal flows +// Thermal flows parameter Boolean GLOEXT=false "Integration of LW radiation (infrared) toward the environment and the sky" annotation(Dialog(tab="Thermal flows"), @@ -28,14 +28,14 @@ annotation(Dialog(tab="Thermal flows"), choices(choice=true "Input", choice=false "Constant", radioButtons=true)); - // Walls +// Walls parameter Modelica.Units.SI.Temperature Tp=293.15 "Initial temperature of walls" annotation (Dialog(tab="Walls")); parameter BuildSysPro.Utilities.Types.InitCond InitType=BuildSysPro.Utilities.Types.InitCond.SteadyState "Type of initialization for walls" annotation (Dialog(tab="Walls")); - // Windows +// Windows parameter Boolean useVolet=false "Use of window shutters" annotation(Dialog(tab="Windows"), choices(choice=true "Yes", choice=false "No", radioButtons=true)); @@ -80,14 +80,14 @@ annotation (Dialog(tab="Windows",group="Reduction factor if useReduction = false", enable=not useReduction)); - // Protected parameters +// Protected parameters protected parameter Boolean EmplacementEst= if EmplacementAppartement==3 or EmplacementAppartement==6 or EmplacementAppartement==9 then true else false; parameter Boolean EmplacementOuest= if EmplacementAppartement==1 or EmplacementAppartement==4 or EmplacementAppartement==7 then true else false; parameter Boolean EmplacementHaut= if EmplacementAppartement<=3 then true else false; parameter Boolean EmplacementBas= if EmplacementAppartement>=7 then true else false; -// Zones +// Zones BuildSysPro.BuildingStock.CollectiveHousing.Matisse.MatisseZones.ZoneLiving zoneSejour( paraMaisonRT( PlancherMitoyen( @@ -714,7 +714,7 @@ TauPonts=paraMaisonRT.TauPonts)) annotation (Placement(transformation(extent={{-22,-68},{24,-20}}))); -// Internal vertical walls +// Internal vertical walls BuildSysPro.Building.BuildingEnvelope.HeatTransfer.Wall CloisonSejourCuisine( ParoiInterne=true, RadInterne=not CLOintPlancher, @@ -888,14 +888,14 @@ rotation=-90, origin={16.75,-35.25}))); -// Components for LW/SW radiations +// Components for LW/SW radiations public BuildSysPro.BaseClasses.HeatTransfer.Interfaces.HeatPort_a T_sky if GLOEXT==true annotation (Placement(transformation(extent={{-100,-20},{-80,0}}), iconTransformation(extent={{-120,-40},{-100,-20}}))); -// Base components -Modelica.Blocks.Interfaces.RealInput G[10] +// Base components + Modelica.Blocks.Interfaces.RealInput G[10] "DIFH, DIRN, DIRH, GLOH, t0, CosDir[1:3], solar azimuth angle, solar elevation angle" annotation (Placement(transformation(extent={{-140,50},{-100,90}}), iconTransformation(extent={{-140,80},{-100,120}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/CollectiveHousing/Matisse/MatisseZones/ZoneBathroom.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/CollectiveHousing/Matisse/MatisseZones/ZoneBathroom.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/CollectiveHousing/Matisse/MatisseZones/ZoneBathroom.mo" 2022-03-10 09:57:39.656144335 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/CollectiveHousing/Matisse/MatisseZones/ZoneBathroom.mo" 2022-03-10 09:58:31.120150855 +0000 @@ -1,44 +1,44 @@ -within BuildSysPro.BuildingStock.CollectiveHousing.Matisse.MatisseZones; +within BuildSysPro.BuildingStock.CollectiveHousing.Matisse.MatisseZones; model ZoneBathroom - // Choice of RT (French building regulation) +// Choice of RT (French building regulation) replaceable parameter BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataMATISSE.BuildingType paraMaisonRT "French building regulation to use" annotation ( choicesAllMatching=true, Dialog(group="Choice of RT")); - // Orientation of the apartment -parameter Integer EmplacementAppartement=5 +// Orientation of the apartment + parameter Integer EmplacementAppartement=5 "From 1 to 9, define the position of the apartment : 1 to 3 last floor - 4 à 6 intermediate floor - 7 à 9 : ground floor (from west to east)"; - // Thermal flows -parameter Boolean GLOEXT=false +// Thermal flows + parameter Boolean GLOEXT=false "Integration of LW radiation (infrared) toward the environment and the sky" annotation(Dialog(tab="Thermal flows")); parameter Boolean QVin=false "True : controlled air change rate; False : constant air change rate" annotation(Dialog(tab="Thermal flows")); - // Walls +// Walls parameter Modelica.Units.SI.Temperature Tp=293.15 "Initial temperature of walls" annotation (Dialog(tab="Walls")); parameter BuildSysPro.Utilities.Types.InitCond InitType=BuildSysPro.Utilities.Types.InitCond.SteadyState "Type of initialization for walls" annotation (Dialog(tab="Walls")); - // Thermal bridges +// Thermal bridges parameter Modelica.Units.SI.ThermalConductance G_ponts= Utilities.Functions.CalculGThermalBridges( ValeursK=paraMaisonRT.ValeursK, LongueursPonts=BuildSysPro.BuildingStock.Utilities.Records.Geometry.CollectiveHousing.SettingsMatisse.LongueursPontsSDB, TauPonts=paraMaisonRT.TauPonts) annotation (Dialog(tab="Thermal bridges")); - // Protected parameters +// Protected parameters protected parameter Boolean EmplacementEst= if EmplacementAppartement==3 or EmplacementAppartement==6 or EmplacementAppartement==9 then true else false; parameter Boolean EmplacementOuest= if EmplacementAppartement==1 or EmplacementAppartement==4 or EmplacementAppartement==7 then true else false; parameter Boolean EmplacementHaut= if EmplacementAppartement<=3 then true else false; parameter Boolean EmplacementBas= if EmplacementAppartement>=7 then true else false; -// Weighting coefficients +// Weighting coefficients protected BuildSysPro.Building.BuildingEnvelope.HeatTransfer.B_Coefficient TauPlancher(b= paraMaisonRT.bPlancher) @@ -47,7 +47,7 @@ paraMaisonRT.bLNC) annotation (Placement(transformation(extent={{-58,-60},{-38,-40}}))); -// Horizontal walls +// Horizontal walls BuildSysPro.Building.BuildingEnvelope.HeatTransfer.Wall Plafond( ParoiInterne=true, Tp=Tp, @@ -123,8 +123,7 @@ rotation=90, origin={71,-92}))); -// Exterior vertical walls - +// Exterior vertical walls BuildSysPro.Building.BuildingEnvelope.HeatTransfer.Wall MurEstExt( RadExterne=false, Tp=Tp, @@ -145,8 +144,7 @@ EmplacementEst annotation (Placement(transformation(extent={{-7,34},{7,48}}))); -// Internal vertical walls - +// Internal vertical walls BuildSysPro.Building.BuildingEnvelope.HeatTransfer.Wall MurEst( RadExterne=false, Tp=Tp, @@ -187,21 +185,19 @@ S=BuildSysPro.BuildingStock.Utilities.Records.Geometry.CollectiveHousing.SettingsMatisse.Surf_MurSudSDB) annotation (Placement(transformation(extent={{-7,-38},{7,-24}}))); -// Glazings - -// Thermal bridges +// Glazings + // Thermal bridges BuildSysPro.BaseClasses.HeatTransfer.Components.ThermalConductor PontsThermiques(G=G_ponts) annotation (Placement(transformation(extent={{-58,-80},{-43,-65}}))); -// Components for LW/SW radiations +// Components for LW/SW radiations public BuildSysPro.BaseClasses.HeatTransfer.Interfaces.HeatPort_a T_sky if GLOEXT == true and (EmplacementHaut or EmplacementEst) annotation (Placement( transformation(extent={{-100,0},{-80,20}}), iconTransformation(extent={ {80,-20},{100,0}}))); -// Base components - +// Base components public BuildSysPro.Building.AirFlow.HeatTransfer.AirNode noeudAir(V=BuildSysPro.BuildingStock.Utilities.Records.Geometry.CollectiveHousing.SettingsMatisse.Surf_PlancherPlafondSDB *BuildSysPro.BuildingStock.Utilities.Records.Geometry.CollectiveHousing.SettingsMatisse.HauteurMatisse, Tair= diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/CollectiveHousing/Matisse/MatisseZones/ZoneEntrance.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/CollectiveHousing/Matisse/MatisseZones/ZoneEntrance.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/CollectiveHousing/Matisse/MatisseZones/ZoneEntrance.mo" 2022-03-10 09:57:39.656144335 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/CollectiveHousing/Matisse/MatisseZones/ZoneEntrance.mo" 2022-03-10 09:58:31.064150848 +0000 @@ -1,44 +1,44 @@ -within BuildSysPro.BuildingStock.CollectiveHousing.Matisse.MatisseZones; +within BuildSysPro.BuildingStock.CollectiveHousing.Matisse.MatisseZones; model ZoneEntrance - // Choice of RT (French building regulation) +// Choice of RT (French building regulation) replaceable parameter BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataMATISSE.BuildingType paraMaisonRT "French building regulation to use" annotation ( choicesAllMatching=true, Dialog(group="Choice of RT")); - // Orientation of the apartment -parameter Integer EmplacementAppartement=5 +// Orientation of the apartment + parameter Integer EmplacementAppartement=5 "From 1 to 9, define the position of the apartment : 1 to 3 last floor - 4 à 6 intermediate floor - 7 à 9 : ground floor (from west to east)"; - // Thermal flows -parameter Boolean GLOEXT=false +// Thermal flows + parameter Boolean GLOEXT=false "Integration of LW radiation (infrared) toward the environment and the sky" annotation(Dialog(tab="Thermal flows")); parameter Boolean QVin=false "True : controlled air change rate; False : constant air change rate" annotation(Dialog(tab="Thermal flows")); - // Walls +// Walls parameter Modelica.Units.SI.Temperature Tp=293.15 "Initial temperature of walls" annotation (Dialog(tab="Walls")); parameter BuildSysPro.Utilities.Types.InitCond InitType=BuildSysPro.Utilities.Types.InitCond.SteadyState "Type of initialization for walls" annotation (Dialog(tab="Walls")); - // Thermal bridges +// Thermal bridges parameter Modelica.Units.SI.ThermalConductance G_ponts= Utilities.Functions.CalculGThermalBridges( ValeursK=paraMaisonRT.ValeursK, LongueursPonts=BuildSysPro.BuildingStock.Utilities.Records.Geometry.CollectiveHousing.SettingsMatisse.LongueursPontsEntree, TauPonts=paraMaisonRT.TauPonts) annotation (Dialog(tab="Thermal bridges")); - // Protected parameters +// Protected parameters protected parameter Boolean EmplacementEst= if EmplacementAppartement==3 or EmplacementAppartement==6 or EmplacementAppartement==9 then true else false; parameter Boolean EmplacementOuest= if EmplacementAppartement==1 or EmplacementAppartement==4 or EmplacementAppartement==7 then true else false; parameter Boolean EmplacementHaut= if EmplacementAppartement<=3 then true else false; parameter Boolean EmplacementBas= if EmplacementAppartement>=7 then true else false; -// Weighting coefficients +// Weighting coefficients protected BuildSysPro.Building.BuildingEnvelope.HeatTransfer.B_Coefficient TauPlancher(b= paraMaisonRT.bPlancher) @@ -47,7 +47,7 @@ paraMaisonRT.bLNC) annotation (Placement(transformation(extent={{-58,-60},{-38,-40}}))); -// Horizontal walls +// Horizontal walls BuildSysPro.Building.BuildingEnvelope.HeatTransfer.Wall Plafond( ParoiInterne=true, Tp=Tp, @@ -123,7 +123,7 @@ rotation=90, origin={71,-92}))); -// Exterior vertical walls +// Exterior vertical walls BuildSysPro.Building.BuildingEnvelope.HeatTransfer.Wall Porte( S=BuildSysPro.BuildingStock.Utilities.Records.Geometry.CollectiveHousing.SettingsMatisse.Surf_PorteEntree, Tp=Tp, @@ -142,8 +142,7 @@ hs_ext=paraMaisonRT.hsIntVert) annotation (Placement(transformation(extent={{-7,-57},{7,-42}}))); -// Internal vertical walls - +// Internal vertical walls BuildSysPro.Building.BuildingEnvelope.HeatTransfer.Wall MurSudLNC( Tp=Tp, InitType=InitType, @@ -163,20 +162,18 @@ S=BuildSysPro.BuildingStock.Utilities.Records.Geometry.CollectiveHousing.SettingsMatisse.Surf_MurSudEntree) annotation (Placement(transformation(extent={{-7,-38},{7,-24}}))); -// Glazings - -// Thermal bridges +// Glazings + // Thermal bridges BuildSysPro.BaseClasses.HeatTransfer.Components.ThermalConductor PontsThermiques(G=G_ponts) annotation (Placement(transformation(extent={{-58,-80},{-43,-65}}))); -// Components for LW/SW radiations +// Components for LW/SW radiations public BuildSysPro.BaseClasses.HeatTransfer.Interfaces.HeatPort_a T_sky if GLOEXT == true and EmplacementHaut annotation (Placement(transformation(extent={{ -100,0},{-80,20}}), iconTransformation(extent={{20,-100},{40,-80}}))); -// Base components - +// Base components public BuildSysPro.Building.AirFlow.HeatTransfer.AirNode noeudAir(V=BuildSysPro.BuildingStock.Utilities.Records.Geometry.CollectiveHousing.SettingsMatisse.Surf_PlancherPlafondEntree *BuildSysPro.BuildingStock.Utilities.Records.Geometry.CollectiveHousing.SettingsMatisse.HauteurMatisse, Tair= diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/CollectiveHousing/Matisse/MatisseZones/ZoneKitchen.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/CollectiveHousing/Matisse/MatisseZones/ZoneKitchen.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/CollectiveHousing/Matisse/MatisseZones/ZoneKitchen.mo" 2022-03-10 09:57:39.656144335 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/CollectiveHousing/Matisse/MatisseZones/ZoneKitchen.mo" 2022-03-10 09:58:31.016150843 +0000 @@ -1,18 +1,18 @@ -within BuildSysPro.BuildingStock.CollectiveHousing.Matisse.MatisseZones; +within BuildSysPro.BuildingStock.CollectiveHousing.Matisse.MatisseZones; model ZoneKitchen - // Choice of RT (French building regulation) +// Choice of RT (French building regulation) replaceable parameter BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataMATISSE.BuildingType paraMaisonRT "French building regulation to use" annotation ( choicesAllMatching=true, Dialog(group="Choice of RT")); - // Orientation of the apartment -parameter Integer EmplacementAppartement=5 +// Orientation of the apartment + parameter Integer EmplacementAppartement=5 "From 1 to 9, define the position of the apartment : 1 to 3 last floor - 4 à 6 intermediate floor - 7 à 9 : ground floor (from west to east)"; - // Thermal flows -parameter Boolean GLOEXT=false +// Thermal flows + parameter Boolean GLOEXT=false "Integration of LW radiation (infrared) toward the environment and the sky" annotation(Dialog(tab="Thermal flows")); parameter Boolean CLOintPlancher=true "True : solar fluxes are absorbed by the floor; False : solar fluxes are absorbed by all the walls and partition walls in proportion of surfaces" @@ -20,15 +20,15 @@ parameter Boolean QVin=false "True : controlled air change rate; False : constant air change rate" annotation(Dialog(tab="Thermal flows")); - // Walls +// Walls parameter Modelica.Units.SI.Temperature Tp=293.15 "Initial temperature of walls" annotation (Dialog(tab="Walls")); parameter BuildSysPro.Utilities.Types.InitCond InitType=BuildSysPro.Utilities.Types.InitCond.SteadyState "Type of initialization for walls" annotation (Dialog(tab="Walls")); - // Windows -parameter Boolean useVolet=false "True if shutter, false if not" annotation(Dialog(tab="Windows")); +// Windows + parameter Boolean useVolet=false "True if shutter, false if not" annotation(Dialog(tab="Windows")); parameter Boolean useOuverture=false "True if controlled opening, false if not" annotation(Dialog(tab="Windows")); parameter Boolean useReduction=false @@ -66,27 +66,27 @@ "Reduction factor for diffuse radiation if useReduction = false" annotation (Dialog(tab="Windows",enable=not useReduction,group="Reduction factor if useReduction = false")); - // Thermal bridges +// Thermal bridges parameter Modelica.Units.SI.ThermalConductance G_ponts= Utilities.Functions.CalculGThermalBridges( ValeursK=paraMaisonRT.ValeursK, LongueursPonts=BuildSysPro.BuildingStock.Utilities.Records.Geometry.CollectiveHousing.SettingsMatisse.LongueursPontsCuisine, TauPonts=paraMaisonRT.TauPonts) annotation (Dialog(tab="Thermal bridges")); - // Protected parameters +// Protected parameters protected parameter Boolean EmplacementEst= if EmplacementAppartement==3 or EmplacementAppartement==6 or EmplacementAppartement==9 then true else false; parameter Boolean EmplacementOuest= if EmplacementAppartement==1 or EmplacementAppartement==4 or EmplacementAppartement==7 then true else false; parameter Boolean EmplacementHaut= if EmplacementAppartement<=3 then true else false; parameter Boolean EmplacementBas= if EmplacementAppartement>=7 then true else false; -// Weighting coefficients +// Weighting coefficients protected BuildSysPro.Building.BuildingEnvelope.HeatTransfer.B_Coefficient TauPlancher(b= paraMaisonRT.bPlancher) annotation (Placement(transformation(extent={{-58,-100},{-38,-80}}))); -// Horizontal walls +// Horizontal walls BuildSysPro.Building.BuildingEnvelope.HeatTransfer.Wall Plafond( ParoiInterne=true, Tp=Tp, @@ -162,8 +162,7 @@ rotation=90, origin={71,-92}))); -// Exterior vertical walls - +// Exterior vertical walls BuildSysPro.Building.BuildingEnvelope.HeatTransfer.Wall MurNord( Tp=Tp, InitType=InitType, @@ -182,10 +181,8 @@ S=BuildSysPro.BuildingStock.Utilities.Records.Geometry.CollectiveHousing.SettingsMatisse.Surf_MurNordCuisine) annotation (Placement(transformation(extent={{-7,16},{7,30}}))); -// Internal vertical walls - -// Glazings - +// Internal vertical walls + // Glazings BuildSysPro.Building.BuildingEnvelope.HeatTransfer.Window VitrageNord( GLOext=GLOEXT, RadInterne=not CLOintPlancher, @@ -208,11 +205,11 @@ H=BuildSysPro.BuildingStock.Utilities.Records.Geometry.CollectiveHousing.SettingsMatisse.H_VitrageNordCuisine) annotation (Placement(transformation(extent={{-37,16},{-23,30}}))); -// Thermal bridges +// Thermal bridges BuildSysPro.BaseClasses.HeatTransfer.Components.ThermalConductor PontsThermiques(G=G_ponts) annotation (Placement(transformation(extent={{-58,-80},{-43,-65}}))); -// Components for LW/SW radiations +// Components for LW/SW radiations public BuildSysPro.BaseClasses.HeatTransfer.Interfaces.HeatPort_a T_sky if GLOEXT == true annotation (Placement(transformation(extent={{-100,0},{-80,20}}), @@ -236,8 +233,7 @@ rotation=-90, origin={-14,-66}))); -// Base components - +// Base components public BuildSysPro.Building.AirFlow.HeatTransfer.AirNode noeudAir(V=BuildSysPro.BuildingStock.Utilities.Records.Geometry.CollectiveHousing.SettingsMatisse.Surf_PlancherPlafondCuisine *BuildSysPro.BuildingStock.Utilities.Records.Geometry.CollectiveHousing.SettingsMatisse.HauteurMatisse, Tair= diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/CollectiveHousing/Matisse/MatisseZones/ZoneLiving.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/CollectiveHousing/Matisse/MatisseZones/ZoneLiving.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/CollectiveHousing/Matisse/MatisseZones/ZoneLiving.mo" 2022-03-10 09:57:39.656144335 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/CollectiveHousing/Matisse/MatisseZones/ZoneLiving.mo" 2022-03-10 09:58:30.800150816 +0000 @@ -1,18 +1,18 @@ -within BuildSysPro.BuildingStock.CollectiveHousing.Matisse.MatisseZones; +within BuildSysPro.BuildingStock.CollectiveHousing.Matisse.MatisseZones; model ZoneLiving - // Choice of RT (French building regulation) +// Choice of RT (French building regulation) replaceable parameter BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataMATISSE.BuildingType paraMaisonRT "French building regulation to use" annotation ( choicesAllMatching=true, Dialog(group="Choice of RT")); - // Orientation of the apartment -parameter Integer EmplacementAppartement=5 +// Orientation of the apartment + parameter Integer EmplacementAppartement=5 "From 1 to 9, define the position of the apartment : 1 to 3 last floor - 4 à 6 intermediate floor - 7 à 9 : ground floor (from west to east)"; - // Thermal flows -parameter Boolean GLOEXT=false +// Thermal flows + parameter Boolean GLOEXT=false "Integration of LW radiation (infrared) toward the environment and the sky" annotation(Dialog(tab="Thermal flows")); parameter Boolean CLOintPlancher=true "True : solar fluxes are absorbed by the floor; False : solar fluxes are absorbed by all the walls and partition walls in proportion of surfaces" @@ -20,15 +20,15 @@ parameter Boolean QVin=false "True : controlled air change rate; False : constant air change rate" annotation(Dialog(tab="Thermal flows")); - // Walls +// Walls parameter Modelica.Units.SI.Temperature Tp=293.15 "Initial temperature of walls" annotation (Dialog(tab="Walls")); parameter BuildSysPro.Utilities.Types.InitCond InitType=BuildSysPro.Utilities.Types.InitCond.SteadyState "Type of initialization for walls" annotation (Dialog(tab="Walls")); - // Windows -parameter Boolean useVolet=false "True if shutter, false if not" annotation(Dialog(tab="Windows")); +// Windows + parameter Boolean useVolet=false "True if shutter, false if not" annotation(Dialog(tab="Windows")); parameter Boolean useOuverture=false "True if controlled opening, false if not" annotation(Dialog(tab="Windows")); parameter Boolean useReduction=false @@ -66,21 +66,21 @@ "Reduction factor for diffuse radiation if useReduction = false" annotation (Dialog(tab="Windows",enable=not useReduction,group="Reduction factor if useReduction = false")); - // Thermal bridges +// Thermal bridges parameter Modelica.Units.SI.ThermalConductance G_ponts= Utilities.Functions.CalculGThermalBridges( ValeursK=paraMaisonRT.ValeursK, LongueursPonts=BuildSysPro.BuildingStock.Utilities.Records.Geometry.CollectiveHousing.SettingsMatisse.LongueursPontsSejour, TauPonts=paraMaisonRT.TauPonts) annotation (Dialog(tab="Thermal bridges")); - // Protected parameters +// Protected parameters protected parameter Boolean EmplacementEst= if EmplacementAppartement==3 or EmplacementAppartement==6 or EmplacementAppartement==9 then true else false; parameter Boolean EmplacementOuest= if EmplacementAppartement==1 or EmplacementAppartement==4 or EmplacementAppartement==7 then true else false; parameter Boolean EmplacementHaut= if EmplacementAppartement<=3 then true else false; parameter Boolean EmplacementBas= if EmplacementAppartement>=7 then true else false; -// Weighting coefficients +// Weighting coefficients protected BuildSysPro.Building.BuildingEnvelope.HeatTransfer.B_Coefficient TauPlancher(b= paraMaisonRT.bPlancher) @@ -89,7 +89,7 @@ paraMaisonRT.bLNC) annotation (Placement(transformation(extent={{-58,-60},{-38,-40}}))); -// Horizontal walls +// Horizontal walls BuildSysPro.Building.BuildingEnvelope.HeatTransfer.Wall Plafond( ParoiInterne=true, Tp=Tp, @@ -165,8 +165,7 @@ rotation=90, origin={71,-92}))); -// Exterior vertical walls - +// Exterior vertical walls BuildSysPro.Building.BuildingEnvelope.HeatTransfer.Wall MurNord( Tp=Tp, InitType=InitType, @@ -204,8 +203,7 @@ EmplacementOuest annotation (Placement(transformation(extent={{-7,-20},{7,-6}}))); -// Internal vertical walls - +// Internal vertical walls BuildSysPro.Building.BuildingEnvelope.HeatTransfer.Wall MurSudLNC( Tp=Tp, InitType=InitType, @@ -245,8 +243,7 @@ EmplacementOuest annotation (Placement(transformation(extent={{-7,-2},{7,12}}))); -// Glazings - +// Glazings BuildSysPro.Building.BuildingEnvelope.HeatTransfer.Window VitrageNord( GLOext=GLOEXT, RadInterne=not CLOintPlancher, @@ -269,11 +266,11 @@ H=BuildSysPro.BuildingStock.Utilities.Records.Geometry.CollectiveHousing.SettingsMatisse.H_VitrageNordSejour) annotation (Placement(transformation(extent={{-37,16},{-23,30}}))); -// Thermal bridges +// Thermal bridges BuildSysPro.BaseClasses.HeatTransfer.Components.ThermalConductor PontsThermiques(G=G_ponts) annotation (Placement(transformation(extent={{-58,-80},{-43,-65}}))); -// Components for LW/SW radiations +// Components for LW/SW radiations public BuildSysPro.BaseClasses.HeatTransfer.Interfaces.HeatPort_a T_sky if GLOEXT == true annotation (Placement(transformation(extent={{-100,0},{-80,20}}), @@ -298,8 +295,7 @@ rotation=-90, origin={-14,-66}))); -// Base components - +// Base components public BuildSysPro.Building.AirFlow.HeatTransfer.AirNode noeudAir(V=BuildSysPro.BuildingStock.Utilities.Records.Geometry.CollectiveHousing.SettingsMatisse.Surf_PlancherPlafondSejour *BuildSysPro.BuildingStock.Utilities.Records.Geometry.CollectiveHousing.SettingsMatisse.HauteurMatisse, Tair= diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/CollectiveHousing/Matisse/MatisseZones/ZoneR1.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/CollectiveHousing/Matisse/MatisseZones/ZoneR1.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/CollectiveHousing/Matisse/MatisseZones/ZoneR1.mo" 2022-03-10 09:57:39.656144335 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/CollectiveHousing/Matisse/MatisseZones/ZoneR1.mo" 2022-03-10 09:58:30.524150780 +0000 @@ -1,18 +1,18 @@ -within BuildSysPro.BuildingStock.CollectiveHousing.Matisse.MatisseZones; +within BuildSysPro.BuildingStock.CollectiveHousing.Matisse.MatisseZones; model ZoneR1 - // Choice of RT (French building regulation) +// Choice of RT (French building regulation) replaceable parameter BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataMATISSE.BuildingType paraMaisonRT "French building regulation to use" annotation ( choicesAllMatching=true, Dialog(group="Choice of RT")); - // Orientation of the apartment -parameter Integer EmplacementAppartement=5 +// Orientation of the apartment + parameter Integer EmplacementAppartement=5 "From 1 to 9, define the position of the apartment : 1 to 3 last floor - 4 à 6 intermediate floor - 7 à 9 : ground floor (from west to east)"; - // Thermal flows -parameter Boolean GLOEXT=false +// Thermal flows + parameter Boolean GLOEXT=false "Integration of LW radiation (infrared) toward the environment and the sky" annotation(Dialog(tab="Thermal flows")); parameter Boolean CLOintPlancher=true "True : solar fluxes are absorbed by the floor; False : solar fluxes are absorbed by all the walls and partition walls in proportion of surfaces" @@ -20,15 +20,15 @@ parameter Boolean QVin=false "True : controlled air change rate; False : constant air change rate" annotation(Dialog(tab="Thermal flows")); - // Walls +// Walls parameter Modelica.Units.SI.Temperature Tp=293.15 "Initial temperature of walls" annotation (Dialog(tab="Walls")); parameter BuildSysPro.Utilities.Types.InitCond InitType=BuildSysPro.Utilities.Types.InitCond.SteadyState "Type of initialization for walls" annotation (Dialog(tab="Walls")); - // Windows -parameter Boolean useVolet=false "True if shutter, false if not" annotation(Dialog(tab="Windows")); +// Windows + parameter Boolean useVolet=false "True if shutter, false if not" annotation(Dialog(tab="Windows")); parameter Boolean useOuverture=false "True if controlled opening, false if not" annotation(Dialog(tab="Windows")); parameter Boolean useReduction=false @@ -66,27 +66,27 @@ "Reduction factor for diffuse radiation if useReduction = false" annotation (Dialog(tab="Windows",enable=not useReduction,group="Reduction factor if useReduction = false")); - // Thermal bridges +// Thermal bridges parameter Modelica.Units.SI.ThermalConductance G_ponts= Utilities.Functions.CalculGThermalBridges( ValeursK=paraMaisonRT.ValeursK, LongueursPonts=BuildSysPro.BuildingStock.Utilities.Records.Geometry.CollectiveHousing.SettingsMatisse.LongueursPontsC1, TauPonts=paraMaisonRT.TauPonts) annotation (Dialog(tab="Thermal bridges")); - // Protected parameters +// Protected parameters protected parameter Boolean EmplacementEst= if EmplacementAppartement==3 or EmplacementAppartement==6 or EmplacementAppartement==9 then true else false; parameter Boolean EmplacementOuest= if EmplacementAppartement==1 or EmplacementAppartement==4 or EmplacementAppartement==7 then true else false; parameter Boolean EmplacementHaut= if EmplacementAppartement<=3 then true else false; parameter Boolean EmplacementBas= if EmplacementAppartement>=7 then true else false; -// Weighting coefficientsn +// Weighting coefficientsn protected BuildSysPro.Building.BuildingEnvelope.HeatTransfer.B_Coefficient TauPlancher(b= paraMaisonRT.bPlancher) annotation (Placement(transformation(extent={{-58,-100},{-38,-80}}))); -// Horizontal walls +// Horizontal walls BuildSysPro.Building.BuildingEnvelope.HeatTransfer.Wall Plafond( ParoiInterne=true, Tp=Tp, @@ -162,8 +162,7 @@ rotation=90, origin={71,-92}))); -// Exterior vertical walls - +// Exterior vertical walls BuildSysPro.Building.BuildingEnvelope.HeatTransfer.Wall MurNord( Tp=Tp, InitType=InitType, @@ -182,10 +181,8 @@ S=BuildSysPro.BuildingStock.Utilities.Records.Geometry.CollectiveHousing.SettingsMatisse.Surf_MurNordC1) annotation (Placement(transformation(extent={{-7,16},{7,30}}))); -// Internal vertical walls - -// Glazings - +// Internal vertical walls + // Glazings BuildSysPro.Building.BuildingEnvelope.HeatTransfer.Window VitrageNord( GLOext=GLOEXT, RadInterne=not CLOintPlancher, @@ -208,11 +205,11 @@ H=BuildSysPro.BuildingStock.Utilities.Records.Geometry.CollectiveHousing.SettingsMatisse.H_VitrageNordC1) annotation (Placement(transformation(extent={{-37,16},{-23,30}}))); -// Thermal bridges +// Thermal bridges BuildSysPro.BaseClasses.HeatTransfer.Components.ThermalConductor PontsThermiques(G=G_ponts) annotation (Placement(transformation(extent={{-58,-80},{-43,-65}}))); -// Components for LW/SW radiations +// Components for LW/SW radiations public BuildSysPro.BaseClasses.HeatTransfer.Interfaces.HeatPort_a T_sky if GLOEXT == true annotation (Placement(transformation(extent={{-100,0},{-80,20}}), @@ -236,8 +233,7 @@ rotation=-90, origin={-14,-66}))); -// Base components - +// Base components public BuildSysPro.Building.AirFlow.HeatTransfer.AirNode noeudAir(V=BuildSysPro.BuildingStock.Utilities.Records.Geometry.CollectiveHousing.SettingsMatisse.Surf_PlancherPlafondC1 *BuildSysPro.BuildingStock.Utilities.Records.Geometry.CollectiveHousing.SettingsMatisse.HauteurMatisse, Tair= diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/CollectiveHousing/Matisse/MatisseZones/ZoneR2.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/CollectiveHousing/Matisse/MatisseZones/ZoneR2.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/CollectiveHousing/Matisse/MatisseZones/ZoneR2.mo" 2022-03-10 09:57:39.656144335 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/CollectiveHousing/Matisse/MatisseZones/ZoneR2.mo" 2022-03-10 09:58:30.416150767 +0000 @@ -1,18 +1,18 @@ -within BuildSysPro.BuildingStock.CollectiveHousing.Matisse.MatisseZones; +within BuildSysPro.BuildingStock.CollectiveHousing.Matisse.MatisseZones; model ZoneR2 - // Choice of RT (French building regulation) +// Choice of RT (French building regulation) replaceable parameter BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataMATISSE.BuildingType paraMaisonRT "French building regulation to use" annotation ( choicesAllMatching=true, Dialog(group="Choice of RT")); - // Orientation of the apartment -parameter Integer EmplacementAppartement=5 +// Orientation of the apartment + parameter Integer EmplacementAppartement=5 "From 1 to 9, define the position of the apartment : 1 to 3 last floor - 4 à 6 intermediate floor - 7 à 9 : ground floor (from west to east)"; - // Thermal flows -parameter Boolean GLOEXT=false +// Thermal flows + parameter Boolean GLOEXT=false "Integration of LW radiation (infrared) toward the environment and the sky" annotation(Dialog(tab="Thermal flows")); parameter Boolean CLOintPlancher=true "True : solar fluxes are absorbed by the floor; False : solar fluxes are absorbed by all the walls and partition walls in proportion of surfaces" @@ -20,15 +20,15 @@ parameter Boolean QVin=false "True : controlled air change rate; False : constant air change rate" annotation(Dialog(tab="Thermal flows")); - // Walls +// Walls parameter Modelica.Units.SI.Temperature Tp=293.15 "Initial temperature of walls" annotation (Dialog(tab="Walls")); parameter BuildSysPro.Utilities.Types.InitCond InitType=BuildSysPro.Utilities.Types.InitCond.SteadyState "Type of initialization for walls" annotation (Dialog(tab="Walls")); - // Windows -parameter Boolean useVolet=false "True if shutter, false if not" annotation(Dialog(tab="Windows")); +// Windows + parameter Boolean useVolet=false "True if shutter, false if not" annotation(Dialog(tab="Windows")); parameter Boolean useOuverture=false "True if controlled opening, false if not" annotation(Dialog(tab="Windows")); parameter Boolean useReduction=false @@ -66,27 +66,27 @@ "Reduction factor for diffuse radiation if useReduction = false" annotation (Dialog(tab="Windows",enable=not useReduction,group="Reduction factor if useReduction = false")); - // Thermal bridges +// Thermal bridges parameter Modelica.Units.SI.ThermalConductance G_ponts= Utilities.Functions.CalculGThermalBridges( ValeursK=paraMaisonRT.ValeursK, LongueursPonts=BuildSysPro.BuildingStock.Utilities.Records.Geometry.CollectiveHousing.SettingsMatisse.LongueursPontsC2, TauPonts=paraMaisonRT.TauPonts) annotation (Dialog(tab="Thermal bridges")); - // Protected parameters +// Protected parameters protected parameter Boolean EmplacementEst= if EmplacementAppartement==3 or EmplacementAppartement==6 or EmplacementAppartement==9 then true else false; parameter Boolean EmplacementOuest= if EmplacementAppartement==1 or EmplacementAppartement==4 or EmplacementAppartement==7 then true else false; parameter Boolean EmplacementHaut= if EmplacementAppartement<=3 then true else false; parameter Boolean EmplacementBas= if EmplacementAppartement>=7 then true else false; -// Weighting coefficients +// Weighting coefficients protected BuildSysPro.Building.BuildingEnvelope.HeatTransfer.B_Coefficient TauPlancher(b= paraMaisonRT.bPlancher) annotation (Placement(transformation(extent={{-58,-100},{-38,-80}}))); -// Horizontal walls +// Horizontal walls BuildSysPro.Building.BuildingEnvelope.HeatTransfer.Wall Plafond( ParoiInterne=true, Tp=Tp, @@ -162,8 +162,7 @@ rotation=90, origin={71,-92}))); -// Exterior vertical walls - +// Exterior vertical walls BuildSysPro.Building.BuildingEnvelope.HeatTransfer.Wall MurEstExt( RadExterne=false, Tp=Tp, @@ -202,8 +201,7 @@ S=BuildSysPro.BuildingStock.Utilities.Records.Geometry.CollectiveHousing.SettingsMatisse.Surf_MurNordC2) annotation (Placement(transformation(extent={{-7,16},{7,30}}))); -// Internal vertical walls - +// Internal vertical walls BuildSysPro.Building.BuildingEnvelope.HeatTransfer.Wall MurEst( RadExterne=false, Tp=Tp, @@ -225,8 +223,7 @@ EmplacementEst annotation (Placement(transformation(extent={{-7,52},{7,66}}))); -// Glazings - +// Glazings BuildSysPro.Building.BuildingEnvelope.HeatTransfer.Window VitrageNord( GLOext=GLOEXT, RadInterne=not CLOintPlancher, @@ -249,11 +246,11 @@ H=BuildSysPro.BuildingStock.Utilities.Records.Geometry.CollectiveHousing.SettingsMatisse.H_VitrageNordC2) annotation (Placement(transformation(extent={{-37,16},{-23,30}}))); -// Thermal bridges +// Thermal bridges BuildSysPro.BaseClasses.HeatTransfer.Components.ThermalConductor PontsThermiques(G=G_ponts) annotation (Placement(transformation(extent={{-58,-80},{-43,-65}}))); -// Components for LW/SW radiations +// Components for LW/SW radiations public BuildSysPro.BaseClasses.HeatTransfer.Interfaces.HeatPort_a T_sky if GLOEXT == true annotation (Placement(transformation(extent={{-100,0},{-80,20}}), @@ -278,8 +275,7 @@ rotation=-90, origin={-14,-66}))); -// Base components - +// Base components public BuildSysPro.Building.AirFlow.HeatTransfer.AirNode noeudAir(V=BuildSysPro.BuildingStock.Utilities.Records.Geometry.CollectiveHousing.SettingsMatisse.Surf_PlancherPlafondC2 *BuildSysPro.BuildingStock.Utilities.Records.Geometry.CollectiveHousing.SettingsMatisse.HauteurMatisse, Tair= diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/CollectiveHousing/Picasso/PicassoAssemblyCH.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/CollectiveHousing/Picasso/PicassoAssemblyCH.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/CollectiveHousing/Picasso/PicassoAssemblyCH.mo" 2022-03-10 09:57:39.656144335 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/CollectiveHousing/Picasso/PicassoAssemblyCH.mo" 2022-03-10 09:58:30.300150753 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.CollectiveHousing.Picasso; +within BuildSysPro.BuildingStock.CollectiveHousing.Picasso; model PicassoAssemblyCH "Picasso apartment for complete collective housing assembly" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/CollectiveHousing/Picasso/package.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/CollectiveHousing/Picasso/package.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/CollectiveHousing/Picasso/package.mo" 2022-03-10 09:57:39.656144335 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/CollectiveHousing/Picasso/package.mo" 2022-03-10 09:58:30.308150754 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.CollectiveHousing; +within BuildSysPro.BuildingStock.CollectiveHousing; package Picasso "Picasso" annotation (Documentation(info="

--------------------------------------------------------------
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Examples/BuildingR2.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Examples/BuildingR2.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Examples/BuildingR2.mo" 2022-03-10 09:57:39.656144335 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Examples/BuildingR2.mo" 2022-03-10 09:58:30.240150744 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Examples; +within BuildSysPro.BuildingStock.Examples; model BuildingR2 extends Modelica.Icons.Example; BuildSysPro.BuildingStock.CollectiveHousing.CollectiveHousingBuilding.BuildingR2.BuildingR2 diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Examples/BuildingR2GV.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Examples/BuildingR2GV.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Examples/BuildingR2GV.mo" 2022-03-10 09:57:39.656144335 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Examples/BuildingR2GV.mo" 2022-03-10 09:58:30.232150744 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Examples; +within BuildSysPro.BuildingStock.Examples; model BuildingR2GV "GV calculation of BuildingR2" extends Modelica.Icons.Example; Real GV; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Examples/Floor.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Examples/Floor.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Examples/Floor.mo" 2022-03-10 09:57:39.656144335 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Examples/Floor.mo" 2022-03-10 09:58:30.216150741 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Examples; +within BuildSysPro.BuildingStock.Examples; model Floor extends Modelica.Icons.Example; BuildSysPro.BuildingStock.CollectiveHousing.CollectiveHousingBuilding.BuildingR2.GenericFloor diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Examples/MatisseGV.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Examples/MatisseGV.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Examples/MatisseGV.mo" 2022-03-10 09:57:39.656144335 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Examples/MatisseGV.mo" 2022-03-10 09:58:30.204150739 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Examples; +within BuildSysPro.BuildingStock.Examples; model MatisseGV "GV calculation of MatisseMonozone" extends Modelica.Icons.Example; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Examples/MozartGV.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Examples/MozartGV.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Examples/MozartGV.mo" 2022-03-10 09:57:39.656144335 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Examples/MozartGV.mo" 2022-03-10 09:58:30.188150739 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Examples; +within BuildSysPro.BuildingStock.Examples; model MozartGV "GV calculation of MozartMonozone" extends Modelica.Icons.Example; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/IndividualHousing/Mozart/MozartMultizone.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/IndividualHousing/Mozart/MozartMultizone.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/IndividualHousing/Mozart/MozartMultizone.mo" 2022-03-10 09:57:39.656144335 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/IndividualHousing/Mozart/MozartMultizone.mo" 2022-03-10 09:58:30.100150727 +0000 @@ -1,18 +1,18 @@ -within BuildSysPro.BuildingStock.IndividualHousing.Mozart; +within BuildSysPro.BuildingStock.IndividualHousing.Mozart; model MozartMultizone import BuildSysPro; - // Choice of RT (French building regulation) +// Choice of RT (French building regulation) replaceable parameter BuildSysPro.BuildingStock.Utilities.Records.BuildingData.IndividualHousing.BuildingDataMOZART.BuildingType paraMaisonRT "French building regulation to use" annotation ( choicesAllMatching=true, Dialog(group="Choice of RT")); - // Orientation of the house +// Orientation of the house parameter Real beta=0 "Correction of azimuth for vertical walls such as azimuth=beta+azimuth, {beta=0 : N=180,S=0,E=-90,O=90}"; - // Thermal flows +// Thermal flows parameter Boolean GLOEXT=false "Integration of LW radiation (infrared) toward the environment and the sky" annotation(Dialog(tab="Thermal flows"), @@ -26,14 +26,14 @@ annotation(Dialog(tab="Thermal flows"), choices(choice=true "Input", choice=false "Constant", radioButtons=true)); - // Walls +// Walls parameter Modelica.Units.SI.Temperature Tp=293.15 "Initial temperature of walls" annotation (Dialog(tab="Walls")); parameter BuildSysPro.Utilities.Types.InitCond InitType=BuildSysPro.Utilities.Types.InitCond.SteadyState "Type of initialization for walls" annotation (Dialog(tab="Walls")); - // Windows +// Windows parameter Boolean useVolet=false "Use of window shutters" annotation(Dialog(tab="Windows"), choices(choice=true "Yes", choice=false "No", radioButtons=true)); @@ -78,7 +78,7 @@ annotation (Dialog(tab="Windows",group="Reduction factor if useReduction = false", enable=not useReduction)); - // French windows +// French windows parameter Boolean useVoletPF=false "Use of window shutters" annotation(Dialog(tab="French windows"), choices(choice=true "Yes", choice=false "No", radioButtons=true)); @@ -123,7 +123,7 @@ annotation (Dialog(tab="French windows",group="Reduction factor if useReduction = false", enable=not useReduction1)); -// Zones +// Zones protected BuildSysPro.BuildingStock.IndividualHousing.Mozart.MozartZones.ZoneLiving zoneSejour( paraMaisonRT( @@ -687,7 +687,7 @@ TauPonts=paraMaisonRT.TauPonts)) annotation (Placement(transformation(extent={{2,-54},{50,-6}}))); -// Internal vertical walls +// Internal vertical walls BuildSysPro.Building.BuildingEnvelope.HeatTransfer.Wall CloisonEntreeCuisine( ParoiInterne=true, RadInterne=not CLOintPlancher, @@ -995,15 +995,14 @@ rotation=90, origin={50.5,-41}))); - -// Components for LW/SW radiations +// Components for LW/SW radiations public BuildSysPro.BaseClasses.HeatTransfer.Interfaces.HeatPort_a T_sky if GLOEXT==true annotation (Placement(transformation(extent={{-100,0},{-80,20}}), iconTransformation(extent={{-120,-40},{-100,-20}}))); -// Base components -Modelica.Blocks.Interfaces.RealInput G[10] +// Base components + Modelica.Blocks.Interfaces.RealInput G[10] "DIFH, DIRN, DIRH, GLOH, t0, CosDir[1:3], Solar azimuth angle , Solar elevation angle" annotation (Placement(transformation(extent={{-140,70},{-100,110}}), iconTransformation(extent={{-140,80},{-100,120}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/IndividualHousing/Mozart/MozartZones/ZoneBathroom.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/IndividualHousing/Mozart/MozartZones/ZoneBathroom.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/IndividualHousing/Mozart/MozartZones/ZoneBathroom.mo" 2022-03-10 09:57:39.656144335 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/IndividualHousing/Mozart/MozartZones/ZoneBathroom.mo" 2022-03-10 09:58:29.644150670 +0000 @@ -1,14 +1,14 @@ -within BuildSysPro.BuildingStock.IndividualHousing.Mozart.MozartZones; +within BuildSysPro.BuildingStock.IndividualHousing.Mozart.MozartZones; model ZoneBathroom - // Choice of RT (French building regulation) +// Choice of RT (French building regulation) replaceable parameter BuildSysPro.BuildingStock.Utilities.Records.BuildingData.IndividualHousing.BuildingDataMOZART.BuildingType paraMaisonRT "French building regulation to use" annotation ( choicesAllMatching=true, Dialog(group="Choice of RT")); - // Thermal flows -parameter Boolean GLOEXT=false +// Thermal flows + parameter Boolean GLOEXT=false "Integration of LW radiation (infrared) toward the environment and the sky" annotation(Dialog(tab="Thermal flows")); parameter Boolean CLOintPlancher=true "True : solar fluxes are absorbed by the floor; False : solar fluxes are absorbed by all the walls and partition walls in proportion of surfaces" @@ -16,15 +16,15 @@ parameter Boolean QVin=false "True : controlled air change rate; False : constant air change rate" annotation(Dialog(tab="Thermal flows")); - // Walls +// Walls parameter Modelica.Units.SI.Temperature Tp=293.15 "Initial temperature of walls" annotation (Dialog(tab="Walls")); parameter BuildSysPro.Utilities.Types.InitCond InitType=BuildSysPro.Utilities.Types.InitCond.SteadyState "Type of initialization for walls" annotation (Dialog(tab="Walls")); - // Windows -parameter Boolean useVolet=false "True if shutter, false if not" annotation(Dialog(tab="Windows")); +// Windows + parameter Boolean useVolet=false "True if shutter, false if not" annotation(Dialog(tab="Windows")); parameter Boolean useReduction=false "True if solar reduction factors (masking, frame), false if not" annotation (Dialog(tab="Windows")); @@ -60,7 +60,7 @@ "Reduction factor for diffuse radiation if useReduction = false" annotation (Dialog(tab="Windows",enable=not useReduction,group="Reduction factor if useReduction = false")); - // Thermal bridges +// Thermal bridges parameter Modelica.Units.SI.ThermalConductance G_ponts= Utilities.Functions.CalculGThermalBridges( ValeursK=paraMaisonRT.ValeursK, @@ -68,7 +68,7 @@ TauPonts=paraMaisonRT.TauPonts) "Thermal bridges" annotation (Dialog(tab="Thermal bridges")); - // Weighting coefficients +// Weighting coefficients protected BuildSysPro.Building.BuildingEnvelope.HeatTransfer.B_Coefficient TauPlancher(b= paraMaisonRT.bPlancher) @@ -77,7 +77,7 @@ paraMaisonRT.bSousCombles) annotation (Placement(transformation(extent={{-58,80},{-38,100}}))); -// Horizontal walls +// Horizontal walls BuildSysPro.Building.BuildingEnvelope.HeatTransfer.Wall ParoiSousCombles( ParoiInterne=true, Tp=Tp, @@ -112,7 +112,7 @@ rotation=90, origin={51,-92}))); -// Exterior vertical walls +// Exterior vertical walls BuildSysPro.Building.BuildingEnvelope.HeatTransfer.Wall MurSud( Tp=Tp, InitType=InitType, @@ -131,9 +131,8 @@ S=BuildSysPro.BuildingStock.Utilities.Records.Geometry.IndividualHousing.SettingsMozart.Surf_MurSudSDB) annotation (Placement(transformation(extent={{-7,-18},{7,-4}}))); -// Internal vertical walls - -// Glazings +// Internal vertical walls + // Glazings BuildSysPro.Building.BuildingEnvelope.HeatTransfer.Window VitrageSudSF( GLOext=GLOEXT, RadInterne=not CLOintPlancher, @@ -155,11 +154,11 @@ H=BuildSysPro.BuildingStock.Utilities.Records.Geometry.IndividualHousing.SettingsMozart.H_VitrageSudSDB) annotation (Placement(transformation(extent={{-36,-18},{-22,-4}}))); -// Thermal bridges +// Thermal bridges BuildSysPro.BaseClasses.HeatTransfer.Components.ThermalConductor PontsThermiques(G=G_ponts) annotation (Placement(transformation(extent={{-58,-80},{-43,-65}}))); -// Components for LW/SW radiations +// Components for LW/SW radiations public BuildSysPro.BaseClasses.HeatTransfer.Interfaces.HeatPort_a T_sky if GLOEXT == true annotation (Placement(transformation(extent={{-100,0},{-80,20}}), @@ -177,7 +176,7 @@ CLOintPlancher annotation (Placement(transformation(extent={{-2,-92},{18,-72}}))); -// Base components +// Base components protected Modelica.Blocks.Math.MultiSum multiSum(nu=1) annotation (Placement(transformation(extent={{-6,-6},{6,6}}, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/IndividualHousing/Mozart/MozartZones/ZoneEntrance.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/IndividualHousing/Mozart/MozartZones/ZoneEntrance.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/IndividualHousing/Mozart/MozartZones/ZoneEntrance.mo" 2022-03-10 09:57:39.656144335 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/IndividualHousing/Mozart/MozartZones/ZoneEntrance.mo" 2022-03-10 09:58:29.556150658 +0000 @@ -1,26 +1,26 @@ within BuildSysPro.BuildingStock.IndividualHousing.Mozart.MozartZones; model ZoneEntrance - // Choice of RT (French building regulation) +// Choice of RT (French building regulation) replaceable parameter BuildSysPro.BuildingStock.Utilities.Records.BuildingData.IndividualHousing.BuildingDataMOZART.BuildingType paraMaisonRT "French building regulation to use" annotation ( choicesAllMatching=true, Dialog(group="Choice of RT")); - // Thermal flows -parameter Boolean GLOEXT=false +// Thermal flows + parameter Boolean GLOEXT=false "Integration of LW radiation (infrared) toward the environment and the sky" annotation(Dialog(tab="Thermal flows")); parameter Boolean QVin=false "True : controlled air change rate; False : constant air change rate" annotation(Dialog(tab="Thermal flows")); - // Walls +// Walls parameter Modelica.Units.SI.Temperature Tp=293.15 "Initial temperature of walls" annotation (Dialog(tab="Walls")); parameter BuildSysPro.Utilities.Types.InitCond InitType=BuildSysPro.Utilities.Types.InitCond.SteadyState "Type of initialization for walls" annotation (Dialog(tab="Walls")); - // Thermal bridges +// Thermal bridges parameter Modelica.Units.SI.ThermalConductance G_ponts= Utilities.Functions.CalculGThermalBridges( ValeursK=paraMaisonRT.ValeursK, @@ -28,7 +28,7 @@ TauPonts=paraMaisonRT.TauPonts) "Thermal bridges" annotation (Dialog(tab="Thermal bridges")); - // Weighting coefficients +// Weighting coefficients protected BuildSysPro.Building.BuildingEnvelope.HeatTransfer.B_Coefficient TauPlancher(b= paraMaisonRT.bPlancher) @@ -37,7 +37,7 @@ paraMaisonRT.bSousCombles) annotation (Placement(transformation(extent={{-58,80},{-38,100}}))); -// Horizontal walls +// Horizontal walls BuildSysPro.Building.BuildingEnvelope.HeatTransfer.Wall ParoiSousCombles( ParoiInterne=true, Tp=Tp, @@ -72,7 +72,7 @@ rotation=90, origin={51,-92}))); -// Exterior vertical walls +// Exterior vertical walls BuildSysPro.Building.BuildingEnvelope.HeatTransfer.Wall Porte( S=BuildSysPro.BuildingStock.Utilities.Records.Geometry.IndividualHousing.SettingsMozart.Surf_PorteEntree, Tp=Tp, @@ -126,21 +126,19 @@ S=BuildSysPro.BuildingStock.Utilities.Records.Geometry.IndividualHousing.SettingsMozart.Surf_MurSudEntree) annotation (Placement(transformation(extent={{-7,-18},{7,-4}}))); -// Internal vertical walls - -// Glazings - -// Thermal bridges +// Internal vertical walls + // Glazings + // Thermal bridges BuildSysPro.BaseClasses.HeatTransfer.Components.ThermalConductor PontsThermiques(G=G_ponts) annotation (Placement(transformation(extent={{-58,-80},{-43,-65}}))); -// Components for LW/SW radiations +// Components for LW/SW radiations public BuildSysPro.BaseClasses.HeatTransfer.Interfaces.HeatPort_a T_sky if GLOEXT == true annotation (Placement(transformation(extent={{-100,0},{-80,20}}), iconTransformation(extent={{40,-100},{60,-80}}))); -// Base components +// Base components public BuildSysPro.Building.AirFlow.HeatTransfer.AirNode noeudAir(V=BuildSysPro.BuildingStock.Utilities.Records.Geometry.IndividualHousing.SettingsMozart.Surf_PlancherPlafondEntree *BuildSysPro.BuildingStock.Utilities.Records.Geometry.IndividualHousing.SettingsMozart.HauteurMozart, Tair=293.15) diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/IndividualHousing/Mozart/MozartZones/ZoneKitchen.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/IndividualHousing/Mozart/MozartZones/ZoneKitchen.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/IndividualHousing/Mozart/MozartZones/ZoneKitchen.mo" 2022-03-10 09:57:39.660144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/IndividualHousing/Mozart/MozartZones/ZoneKitchen.mo" 2022-03-10 09:58:29.492150650 +0000 @@ -1,14 +1,14 @@ -within BuildSysPro.BuildingStock.IndividualHousing.Mozart.MozartZones; +within BuildSysPro.BuildingStock.IndividualHousing.Mozart.MozartZones; model ZoneKitchen - // Choice of RT (French building regulation) +// Choice of RT (French building regulation) replaceable parameter BuildSysPro.BuildingStock.Utilities.Records.BuildingData.IndividualHousing.BuildingDataMOZART.BuildingType paraMaisonRT "French building regulation to use" annotation ( choicesAllMatching=true, Dialog(group="Choice of RT")); - // Thermal flows -parameter Boolean GLOEXT=false +// Thermal flows + parameter Boolean GLOEXT=false "Integration of LW radiation (infrared) toward the environment and the sky" annotation(Dialog(tab="Thermal flows")); parameter Boolean CLOintPlancher=true "True : solar fluxes are absorbed by the floor; False : solar fluxes are absorbed by all the walls and partition walls in proportion of surfaces" @@ -16,15 +16,15 @@ parameter Boolean QVin=false "True : controlled air change rate; False : constant air change rate" annotation(Dialog(tab="Thermal flows")); - // Walls +// Walls parameter Modelica.Units.SI.Temperature Tp=293.15 "Initial temperature of walls" annotation (Dialog(tab="Walls")); parameter BuildSysPro.Utilities.Types.InitCond InitType=BuildSysPro.Utilities.Types.InitCond.SteadyState "Type of initialization for walls" annotation (Dialog(tab="Walls")); - // Windows -parameter Boolean useVolet=false "True if shutter, false if not" annotation(Dialog(tab="Windows")); +// Windows + parameter Boolean useVolet=false "True if shutter, false if not" annotation(Dialog(tab="Windows")); parameter Boolean useOuverture=false "True if controlled opening, false if not" annotation(Dialog(tab="Windows")); parameter Boolean useReduction=false @@ -62,7 +62,7 @@ "Reduction factor for diffuse radiation if useReduction = false" annotation (Dialog(tab="Windows",enable=not useReduction,group="Reduction factor if useReduction = false")); - // Thermal bridges +// Thermal bridges parameter Modelica.Units.SI.ThermalConductance G_ponts= Utilities.Functions.CalculGThermalBridges( ValeursK=paraMaisonRT.ValeursK, @@ -70,7 +70,7 @@ TauPonts=paraMaisonRT.TauPonts) "Thermal bridges" annotation (Dialog(tab="Thermal bridges")); - // Weighting coefficients +// Weighting coefficients protected BuildSysPro.Building.BuildingEnvelope.HeatTransfer.B_Coefficient TauPlancher(b= paraMaisonRT.bPlancher) @@ -79,7 +79,7 @@ paraMaisonRT.bSousCombles) annotation (Placement(transformation(extent={{-58,80},{-38,100}}))); -// Horizontal walls +// Horizontal walls BuildSysPro.Building.BuildingEnvelope.HeatTransfer.Wall ParoiSousCombles( ParoiInterne=true, Tp=Tp, @@ -114,7 +114,7 @@ rotation=90, origin={51,-92}))); -// Exterior vertical walls +// Exterior vertical walls BuildSysPro.Building.BuildingEnvelope.HeatTransfer.Wall MurNord( Tp=Tp, InitType=InitType, @@ -133,9 +133,8 @@ S=BuildSysPro.BuildingStock.Utilities.Records.Geometry.IndividualHousing.SettingsMozart.Surf_MurNordCuisine) annotation (Placement(transformation(extent={{-7,22},{7,36}}))); -// Internal vertical walls - -// Glazings +// Internal vertical walls + // Glazings BuildSysPro.Building.BuildingEnvelope.HeatTransfer.Window VitrageNord( GLOext=GLOEXT, RadInterne=not CLOintPlancher, @@ -158,11 +157,11 @@ H=BuildSysPro.BuildingStock.Utilities.Records.Geometry.IndividualHousing.SettingsMozart.H_VitrageNordCuisine) annotation (Placement(transformation(extent={{-37,22},{-23,36}}))); -// Thermal bridges +// Thermal bridges BuildSysPro.BaseClasses.HeatTransfer.Components.ThermalConductor PontsThermiques(G=G_ponts) annotation (Placement(transformation(extent={{-58,-80},{-43,-65}}))); -// Components for LW/SW radiations +// Components for LW/SW radiations public BuildSysPro.BaseClasses.HeatTransfer.Interfaces.HeatPort_a T_sky if GLOEXT == true annotation (Placement(transformation(extent={{-100,0},{-80,20}}), @@ -181,7 +180,7 @@ CLOintPlancher annotation (Placement(transformation(extent={{-2,-92},{18,-72}}))); -// Base components +// Base components protected Modelica.Blocks.Math.MultiSum multiSum(nu=1) annotation (Placement(transformation(extent={{-6,-6},{6,6}}, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/IndividualHousing/Mozart/MozartZones/ZoneLiving.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/IndividualHousing/Mozart/MozartZones/ZoneLiving.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/IndividualHousing/Mozart/MozartZones/ZoneLiving.mo" 2022-03-10 09:57:39.660144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/IndividualHousing/Mozart/MozartZones/ZoneLiving.mo" 2022-03-10 09:58:29.352150633 +0000 @@ -1,14 +1,14 @@ -within BuildSysPro.BuildingStock.IndividualHousing.Mozart.MozartZones; +within BuildSysPro.BuildingStock.IndividualHousing.Mozart.MozartZones; model ZoneLiving - // Choice of RT (French building regulation) +// Choice of RT (French building regulation) replaceable parameter BuildSysPro.BuildingStock.Utilities.Records.BuildingData.IndividualHousing.BuildingDataMOZART.BuildingType paraMaisonRT "French building regulation to use" annotation ( choicesAllMatching=true, Dialog(group="Choice of RT")); - // Thermal flows -parameter Boolean GLOEXT=false +// Thermal flows + parameter Boolean GLOEXT=false "Integration of LW radiation (infrared) toward the environment and the sky" annotation(Dialog(tab="Thermal flows")); parameter Boolean CLOintPlancher=true "True : solar fluxes are absorbed by the floor; False : solar fluxes are absorbed by all the walls and partition walls in proportion of surfaces" @@ -16,15 +16,15 @@ parameter Boolean QVin=false "True : controlled air change rate; False : constant air change rate" annotation(Dialog(tab="Thermal flows")); - // Walls +// Walls parameter Modelica.Units.SI.Temperature Tp=293.15 "Initial temperature of walls" annotation (Dialog(tab="Walls")); parameter BuildSysPro.Utilities.Types.InitCond InitType=BuildSysPro.Utilities.Types.InitCond.SteadyState "Type of initialization for walls" annotation (Dialog(tab="Walls")); - // Windows -parameter Boolean useVoletPF=false "True if shutter, false if not" annotation(Dialog(tab="Windows")); +// Windows + parameter Boolean useVoletPF=false "True if shutter, false if not" annotation(Dialog(tab="Windows")); parameter Boolean useOuverturePF=false "True if controlled opening, false if not" annotation(Dialog(tab="Windows")); parameter Boolean useReduction1=false @@ -62,7 +62,7 @@ "Reduction factor for diffuse radiation if useReduction = false" annotation (Dialog(tab="Windows",enable=not useReduction1,group="Reduction factor if useReduction = false")); - // Thermal bridges +// Thermal bridges parameter Modelica.Units.SI.ThermalConductance G_ponts= Utilities.Functions.CalculGThermalBridges( ValeursK=paraMaisonRT.ValeursK, @@ -70,7 +70,7 @@ TauPonts=paraMaisonRT.TauPonts) "Thermal bridges" annotation (Dialog(tab="Thermal bridges")); - // Weighting coefficients +// Weighting coefficients protected BuildSysPro.Building.BuildingEnvelope.HeatTransfer.B_Coefficient TauPlancher(b= paraMaisonRT.bPlancher) @@ -82,7 +82,7 @@ paraMaisonRT.bSousCombles) annotation (Placement(transformation(extent={{-58,80},{-38,100}}))); -// Horizontal walls +// Horizontal walls BuildSysPro.Building.BuildingEnvelope.HeatTransfer.Wall ParoiSousCombles( ParoiInterne=true, Tp=Tp, @@ -117,7 +117,7 @@ rotation=90, origin={51,-92}))); -// Exterior vertical walls +// Exterior vertical walls BuildSysPro.Building.BuildingEnvelope.HeatTransfer.Wall MurNord( Tp=Tp, InitType=InitType, @@ -170,7 +170,7 @@ S=BuildSysPro.BuildingStock.Utilities.Records.Geometry.IndividualHousing.SettingsMozart.Surf_MurSudSejour) annotation (Placement(transformation(extent={{-7,-18},{7,-4}}))); -// Internal vertical walls +// Internal vertical walls BuildSysPro.Building.BuildingEnvelope.HeatTransfer.Wall MurLNC( ParoiInterne=true, Tp=Tp, @@ -187,7 +187,7 @@ S=BuildSysPro.BuildingStock.Utilities.Records.Geometry.IndividualHousing.SettingsMozart.Surf_MurLNCSejour) annotation (Placement(transformation(extent={{-7,-58},{7,-44}}))); -// Glazings +// Glazings BuildSysPro.Building.BuildingEnvelope.HeatTransfer.Window VitrageOuest( GLOext=GLOEXT, RadInterne=not CLOintPlancher, @@ -232,11 +232,11 @@ H=BuildSysPro.BuildingStock.Utilities.Records.Geometry.IndividualHousing.SettingsMozart.H_VitrageSudSejour) annotation (Placement(transformation(extent={{-36,-38},{-22,-24}}))); -// Thermal bridges +// Thermal bridges BuildSysPro.BaseClasses.HeatTransfer.Components.ThermalConductor PontsThermiques(G=G_ponts) annotation (Placement(transformation(extent={{-58,-80},{-43,-65}}))); -// Components for LW/SW radiations +// Components for LW/SW radiations public BuildSysPro.BaseClasses.HeatTransfer.Interfaces.HeatPort_a T_sky if GLOEXT == true annotation (Placement(transformation(extent={{-100,0},{-80,20}}), @@ -258,7 +258,7 @@ CLOintPlancher annotation (Placement(transformation(extent={{-2,-92},{18,-72}}))); -// Base components +// Base components protected Modelica.Blocks.Math.MultiSum multiSum(nu=2) annotation (Placement(transformation(extent={{-6,-6},{6,6}}, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/IndividualHousing/Mozart/MozartZones/ZoneR1.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/IndividualHousing/Mozart/MozartZones/ZoneR1.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/IndividualHousing/Mozart/MozartZones/ZoneR1.mo" 2022-03-10 09:57:39.660144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/IndividualHousing/Mozart/MozartZones/ZoneR1.mo" 2022-03-10 09:58:29.176150610 +0000 @@ -1,14 +1,14 @@ -within BuildSysPro.BuildingStock.IndividualHousing.Mozart.MozartZones; +within BuildSysPro.BuildingStock.IndividualHousing.Mozart.MozartZones; model ZoneR1 - // Choice of RT (French building regulation) +// Choice of RT (French building regulation) replaceable parameter BuildSysPro.BuildingStock.Utilities.Records.BuildingData.IndividualHousing.BuildingDataMOZART.BuildingType paraMaisonRT "French building regulation to use" annotation ( choicesAllMatching=true, Dialog(group="Choice of RT")); - // Thermal flows -parameter Boolean GLOEXT=false +// Thermal flows + parameter Boolean GLOEXT=false "Integration of LW radiation (infrared) toward the environment and the sky" annotation(Dialog(tab="Thermal flows")); parameter Boolean CLOintPlancher=true "True : solar fluxes are absorbed by the floor; False : solar fluxes are absorbed by all the walls and partition walls in proportion of surfaces" @@ -16,15 +16,15 @@ parameter Boolean QVin=false "True : controlled air change rate; False : constant air change rate" annotation(Dialog(tab="Thermal flows")); - // Walls +// Walls parameter Modelica.Units.SI.Temperature Tp=293.15 "Initial temperature of walls" annotation (Dialog(tab="Walls")); parameter BuildSysPro.Utilities.Types.InitCond InitType=BuildSysPro.Utilities.Types.InitCond.SteadyState "Type of initialization for walls" annotation (Dialog(tab="Walls")); - // Windows -parameter Boolean useVolet=false "True if shutter, false if not" annotation(Dialog(tab="Windows")); +// Windows + parameter Boolean useVolet=false "True if shutter, false if not" annotation(Dialog(tab="Windows")); parameter Boolean useOuverture=false "True if controlled opening, false if not" annotation(Dialog(tab="Windows")); parameter Boolean useReduction=false @@ -62,7 +62,7 @@ "Reduction factor for diffuse radiation if useReduction = false" annotation (Dialog(tab="Windows",enable=not useReduction,group="Reduction factor if useReduction = false")); - // Thermal bridges +// Thermal bridges parameter Modelica.Units.SI.ThermalConductance G_ponts= Utilities.Functions.CalculGThermalBridges( ValeursK=paraMaisonRT.ValeursK, @@ -70,7 +70,7 @@ TauPonts=paraMaisonRT.TauPonts) "Thermal bridges" annotation (Dialog(tab="Thermal bridges")); - // Weighting coefficients +// Weighting coefficients protected BuildSysPro.Building.BuildingEnvelope.HeatTransfer.B_Coefficient TauPlancher(b= paraMaisonRT.bPlancher) @@ -79,7 +79,7 @@ paraMaisonRT.bSousCombles) annotation (Placement(transformation(extent={{-58,80},{-38,100}}))); -// Horizontal walls +// Horizontal walls BuildSysPro.Building.BuildingEnvelope.HeatTransfer.Wall ParoiSousCombles( ParoiInterne=true, Tp=Tp, @@ -114,7 +114,7 @@ rotation=90, origin={51,-92}))); -// Exterior vertical walls +// Exterior vertical walls BuildSysPro.Building.BuildingEnvelope.HeatTransfer.Wall MurNord( Tp=Tp, InitType=InitType, @@ -133,9 +133,8 @@ S=BuildSysPro.BuildingStock.Utilities.Records.Geometry.IndividualHousing.SettingsMozart.Surf_MurNordC1) annotation (Placement(transformation(extent={{-7,22},{7,36}}))); -// Internal vertical walls - -// Glazings +// Internal vertical walls + // Glazings BuildSysPro.Building.BuildingEnvelope.HeatTransfer.Window VitrageNord( GLOext=GLOEXT, RadInterne=not CLOintPlancher, @@ -158,11 +157,11 @@ H=BuildSysPro.BuildingStock.Utilities.Records.Geometry.IndividualHousing.SettingsMozart.H_VitrageNordC1) annotation (Placement(transformation(extent={{-37,22},{-23,36}}))); -// Thermal bridges +// Thermal bridges BuildSysPro.BaseClasses.HeatTransfer.Components.ThermalConductor PontsThermiques(G=G_ponts) annotation (Placement(transformation(extent={{-58,-80},{-43,-65}}))); -// Components for LW/SW radiations +// Components for LW/SW radiations public BuildSysPro.BaseClasses.HeatTransfer.Interfaces.HeatPort_a T_sky if GLOEXT == true annotation (Placement(transformation(extent={{-100,0},{-80,20}}), @@ -181,7 +180,7 @@ CLOintPlancher annotation (Placement(transformation(extent={{-2,-92},{18,-72}}))); -// Base components +// Base components protected Modelica.Blocks.Math.MultiSum multiSum(nu=1) annotation (Placement(transformation(extent={{-6,-6},{6,6}}, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/IndividualHousing/Mozart/MozartZones/ZoneR2.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/IndividualHousing/Mozart/MozartZones/ZoneR2.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/IndividualHousing/Mozart/MozartZones/ZoneR2.mo" 2022-03-10 09:57:39.660144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/IndividualHousing/Mozart/MozartZones/ZoneR2.mo" 2022-03-10 09:58:29.116150602 +0000 @@ -1,14 +1,14 @@ -within BuildSysPro.BuildingStock.IndividualHousing.Mozart.MozartZones; +within BuildSysPro.BuildingStock.IndividualHousing.Mozart.MozartZones; model ZoneR2 - // Choice of RT (French building regulation) +// Choice of RT (French building regulation) replaceable parameter BuildSysPro.BuildingStock.Utilities.Records.BuildingData.IndividualHousing.BuildingDataMOZART.BuildingType paraMaisonRT "French building regulation to use" annotation ( choicesAllMatching=true, Dialog(group="Choice of RT")); - // Thermal flows -parameter Boolean GLOEXT=false +// Thermal flows + parameter Boolean GLOEXT=false "Integration of LW radiation (infrared) toward the environment and the sky" annotation(Dialog(tab="Thermal flows")); parameter Boolean CLOintPlancher=true "True : solar fluxes are absorbed by the floor; False : solar fluxes are absorbed by all the walls and partition walls in proportion of surfaces" @@ -16,15 +16,15 @@ parameter Boolean QVin=false "True : controlled air change rate; False : constant air change rate" annotation(Dialog(tab="Thermal flows")); - // Walls +// Walls parameter Modelica.Units.SI.Temperature Tp=293.15 "Initial temperature of walls" annotation (Dialog(tab="Walls")); parameter BuildSysPro.Utilities.Types.InitCond InitType=BuildSysPro.Utilities.Types.InitCond.SteadyState "Type of initialization for walls" annotation (Dialog(tab="Walls")); - // Windows -parameter Boolean useVoletPF=false "True if shutter, false if not" annotation(Dialog(tab="Windows")); +// Windows + parameter Boolean useVoletPF=false "True if shutter, false if not" annotation(Dialog(tab="Windows")); parameter Boolean useOuverturePF=false "True if controlled opening, false if not" annotation(Dialog(tab="Windows")); parameter Boolean useReduction1=false @@ -62,7 +62,7 @@ "Reduction factor for diffuse radiation if useReduction = false" annotation (Dialog(tab="Windows",enable=not useReduction1,group="Reduction factor if useReduction = false")); - // Thermal bridges +// Thermal bridges parameter Modelica.Units.SI.ThermalConductance G_ponts= Utilities.Functions.CalculGThermalBridges( ValeursK=paraMaisonRT.ValeursK, @@ -70,7 +70,7 @@ TauPonts=paraMaisonRT.TauPonts) "Thermal bridges" annotation (Dialog(tab="Thermal bridges")); - // Weighting coefficients +// Weighting coefficients protected BuildSysPro.Building.BuildingEnvelope.HeatTransfer.B_Coefficient TauPlancher(b= paraMaisonRT.bPlancher) @@ -79,7 +79,7 @@ paraMaisonRT.bSousCombles) annotation (Placement(transformation(extent={{-58,80},{-38,100}}))); -// Horizontal walls +// Horizontal walls BuildSysPro.Building.BuildingEnvelope.HeatTransfer.Wall ParoiSousCombles( ParoiInterne=true, Tp=Tp, @@ -114,7 +114,7 @@ rotation=90, origin={51,-92}))); -// Exterior vertical walls +// Exterior vertical walls BuildSysPro.Building.BuildingEnvelope.HeatTransfer.Wall MurEst( RadExterne=false, Tp=Tp, @@ -151,9 +151,8 @@ S=BuildSysPro.BuildingStock.Utilities.Records.Geometry.IndividualHousing.SettingsMozart.Surf_MurNordC2) annotation (Placement(transformation(extent={{-7,22},{7,36}}))); -// Internal vertical walls - -// Glazings +// Internal vertical walls + // Glazings BuildSysPro.Building.BuildingEnvelope.HeatTransfer.Window VitrageEst( RadInterne=not CLOintPlancher, GLOext=GLOEXT, @@ -175,11 +174,11 @@ H=BuildSysPro.BuildingStock.Utilities.Records.Geometry.IndividualHousing.SettingsMozart.H_VitrageEstC2) annotation (Placement(transformation(extent={{-37,42},{-23,56}}))); -// Thermal bridges +// Thermal bridges BuildSysPro.BaseClasses.HeatTransfer.Components.ThermalConductor PontsThermiques(G=G_ponts) annotation (Placement(transformation(extent={{-58,-80},{-43,-65}}))); -// Components for LW/SW radiations +// Components for LW/SW radiations public BuildSysPro.BaseClasses.HeatTransfer.Interfaces.HeatPort_a T_sky if GLOEXT == true annotation (Placement(transformation(extent={{-100,0},{-80,20}}), @@ -198,7 +197,7 @@ CLOintPlancher annotation (Placement(transformation(extent={{-2,-92},{18,-72}}))); -// Base components +// Base components protected Modelica.Blocks.Math.MultiSum multiSum(nu=1) annotation (Placement(transformation(extent={{-6,-6},{6,6}}, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/IndividualHousing/Mozart/MozartZones/ZoneR3.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/IndividualHousing/Mozart/MozartZones/ZoneR3.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/IndividualHousing/Mozart/MozartZones/ZoneR3.mo" 2022-03-10 09:57:39.660144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/IndividualHousing/Mozart/MozartZones/ZoneR3.mo" 2022-03-10 09:58:29.012150590 +0000 @@ -1,14 +1,14 @@ -within BuildSysPro.BuildingStock.IndividualHousing.Mozart.MozartZones; +within BuildSysPro.BuildingStock.IndividualHousing.Mozart.MozartZones; model ZoneR3 - // Choice of RT (French building regulation) +// Choice of RT (French building regulation) replaceable parameter BuildSysPro.BuildingStock.Utilities.Records.BuildingData.IndividualHousing.BuildingDataMOZART.BuildingType paraMaisonRT "French building regulation to use" annotation ( choicesAllMatching=true, Dialog(group="Choice of RT")); - // Thermal flows -parameter Boolean GLOEXT=false +// Thermal flows + parameter Boolean GLOEXT=false "Integration of LW radiation (infrared) toward the environment and the sky" annotation(Dialog(tab="Thermal flows")); parameter Boolean CLOintPlancher=true "True : solar fluxes are absorbed by the floor; False : solar fluxes are absorbed by all the walls and partition walls in proportion of surfaces" @@ -16,15 +16,15 @@ parameter Boolean QVin=false "True : controlled air change rate; False : constant air change rate" annotation(Dialog(tab="Thermal flows")); - // Walls +// Walls parameter Modelica.Units.SI.Temperature Tp=293.15 "Initial temperature of walls" annotation (Dialog(tab="Walls")); parameter BuildSysPro.Utilities.Types.InitCond InitType=BuildSysPro.Utilities.Types.InitCond.SteadyState "Type of initialization for walls" annotation (Dialog(tab="Walls")); - // Windows -parameter Boolean useVoletPF=false "True if shutter, false if not" annotation(Dialog(tab="Windows")); +// Windows + parameter Boolean useVoletPF=false "True if shutter, false if not" annotation(Dialog(tab="Windows")); parameter Boolean useOuverturePF=false "True if controlled opening, false if not" annotation(Dialog(tab="Windows")); parameter Boolean useReduction1=false @@ -62,7 +62,7 @@ "Reduction factor for diffuse radiation if useReduction = false" annotation (Dialog(tab="Windows",enable=not useReduction1,group="Reduction factor if useReduction = false")); - // Thermal bridges +// Thermal bridges parameter Modelica.Units.SI.ThermalConductance G_ponts= Utilities.Functions.CalculGThermalBridges( ValeursK=paraMaisonRT.ValeursK, @@ -70,7 +70,7 @@ TauPonts=paraMaisonRT.TauPonts) "Thermal bridges" annotation (Dialog(tab="Thermal bridges")); - // Weighting coefficients +// Weighting coefficients protected BuildSysPro.Building.BuildingEnvelope.HeatTransfer.B_Coefficient TauPlancher(b= paraMaisonRT.bPlancher) @@ -79,7 +79,7 @@ paraMaisonRT.bSousCombles) annotation (Placement(transformation(extent={{-58,80},{-38,100}}))); -// Horizontal walls +// Horizontal walls BuildSysPro.Building.BuildingEnvelope.HeatTransfer.Wall ParoiSousCombles( ParoiInterne=true, Tp=Tp, @@ -114,7 +114,7 @@ rotation=90, origin={51,-92}))); -// Exterior vertical walls +// Exterior vertical walls BuildSysPro.Building.BuildingEnvelope.HeatTransfer.Wall MurEst( RadExterne=false, Tp=Tp, @@ -151,9 +151,8 @@ S=BuildSysPro.BuildingStock.Utilities.Records.Geometry.IndividualHousing.SettingsMozart.Surf_MurSudC3) annotation (Placement(transformation(extent={{-7,-18},{7,-4}}))); -// Internal vertical walls - -// Glazings +// Internal vertical walls + // Glazings BuildSysPro.Building.BuildingEnvelope.HeatTransfer.Window VitrageEst( RadInterne=not CLOintPlancher, GLOext=GLOEXT, @@ -197,11 +196,11 @@ H=BuildSysPro.BuildingStock.Utilities.Records.Geometry.IndividualHousing.SettingsMozart.H_VitrageSudC3) annotation (Placement(transformation(extent={{-36,-38},{-22,-24}}))); -// Thermal bridges +// Thermal bridges BuildSysPro.BaseClasses.HeatTransfer.Components.ThermalConductor PontsThermiques(G=G_ponts) annotation (Placement(transformation(extent={{-58,-80},{-43,-65}}))); -// Components for LW/SW radiations +// Components for LW/SW radiations public BuildSysPro.BaseClasses.HeatTransfer.Interfaces.HeatPort_a T_sky if GLOEXT == true annotation (Placement(transformation(extent={{-100,0},{-80,20}}), @@ -221,7 +220,7 @@ CLOintPlancher annotation (Placement(transformation(extent={{-2,-92},{18,-72}}))); -// Base components +// Base components protected Modelica.Blocks.Math.MultiSum multiSum(nu=2) annotation (Placement(transformation(extent={{-6,-6},{6,6}}, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/RnCm/Examples/R3C2_PIControlled.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/RnCm/Examples/R3C2_PIControlled.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/RnCm/Examples/R3C2_PIControlled.mo" 2022-03-10 09:57:39.660144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/RnCm/Examples/R3C2_PIControlled.mo" 2022-03-10 09:58:28.916150578 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.RnCm.Examples; +within BuildSysPro.BuildingStock.RnCm.Examples; model R3C2_PIControlled "Test of 2 R3C2 models in parallel" BuildSysPro.BuildingStock.RnCm.R3C2 R3C2_1 annotation (Placement(transformation(extent={{20,2},{40,22}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/RnCm/R3C2.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/RnCm/R3C2.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/RnCm/R3C2.mo" 2022-03-10 09:57:39.660144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/RnCm/R3C2.mo" 2022-03-10 09:58:28.908150575 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.RnCm; +within BuildSysPro.BuildingStock.RnCm; model R3C2 "Simplified R3C2 electric model of a building" parameter Real Cres = 1/9.2178e-07 "Capacity of air" annotation(Dialog(group="Modèle R3C2")); parameter Real Cs = 1/7.1675e-08 "Capacity of heavy walls" annotation(Dialog(group="Modèle R3C2")); @@ -56,7 +56,7 @@ Real TransDir; equation - TransDir = if noEvent(cosi>0) then (if noEvent(cosi>0.8) then TrDir else TrDir*2.5*cosi*(1-0.625*cosi)) else 0; // Cardonnel + TransDir = if noEvent(cosi>0) then (if noEvent(cosi>0.8) then TrDir else TrDir*2.5*cosi*(1-0.625*cosi)) else 0; // Cardonnel Qs.Q_flow =S*(TrDif*fLUXsurf.FluxIncExt[1] + TransDir*fLUXsurf.FluxIncExt[2]); connect(AI.port, Tint.port) annotation (Line(points={{-60,-38},{-30,-38},{-30, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Functions/CalculGThermalBridges.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Functions/CalculGThermalBridges.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Functions/CalculGThermalBridges.mo" 2022-03-10 09:57:39.660144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Functions/CalculGThermalBridges.mo" 2022-03-10 09:58:28.812150563 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Functions; +within BuildSysPro.BuildingStock.Utilities.Functions; function CalculGThermalBridges input Real ValeursK[:]; input Real LongueursPonts[:]; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataGAUGUIN/BuildingType.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataGAUGUIN/BuildingType.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataGAUGUIN/BuildingType.mo" 2022-03-10 09:57:39.660144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataGAUGUIN/BuildingType.mo" 2022-03-10 09:58:28.780150559 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataGAUGUIN; +within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataGAUGUIN; record BuildingType "List of Gauguin collective housing construction dates" parameter Modelica.Units.SI.CoefficientOfHeatTransfer UvitrageAF "Coefficient of heat transfert of the window with closing (conduction+convection)"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataGAUGUIN/Gauguin1974to1982.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataGAUGUIN/Gauguin1974to1982.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataGAUGUIN/Gauguin1974to1982.mo" 2022-03-10 09:57:39.660144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataGAUGUIN/Gauguin1974to1982.mo" 2022-03-10 09:58:28.772150559 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataGAUGUIN; +within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataGAUGUIN; record Gauguin1974to1982 = BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataGAUGUIN.BuildingType ( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataGAUGUIN/Gauguin1982to1989.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataGAUGUIN/Gauguin1982to1989.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataGAUGUIN/Gauguin1982to1989.mo" 2022-03-10 09:57:39.660144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataGAUGUIN/Gauguin1982to1989.mo" 2022-03-10 09:58:28.764150557 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataGAUGUIN; +within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataGAUGUIN; record Gauguin1982to1989 = BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataGAUGUIN.BuildingType ( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataGAUGUIN/Gauguin1989to2000.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataGAUGUIN/Gauguin1989to2000.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataGAUGUIN/Gauguin1989to2000.mo" 2022-03-10 09:57:39.660144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataGAUGUIN/Gauguin1989to2000.mo" 2022-03-10 09:58:28.756150556 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataGAUGUIN; +within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataGAUGUIN; record Gauguin1989to2000 = BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataGAUGUIN.BuildingType ( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataGAUGUIN/Gauguin2000.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataGAUGUIN/Gauguin2000.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataGAUGUIN/Gauguin2000.mo" 2022-03-10 09:57:39.660144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataGAUGUIN/Gauguin2000.mo" 2022-03-10 09:58:28.748150555 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataGAUGUIN; +within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataGAUGUIN; record Gauguin2000 = BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataGAUGUIN.BuildingType ( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataGAUGUIN/Gauguin2005.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataGAUGUIN/Gauguin2005.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataGAUGUIN/Gauguin2005.mo" 2022-03-10 09:57:39.660144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataGAUGUIN/Gauguin2005.mo" 2022-03-10 09:58:28.740150555 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataGAUGUIN; +within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataGAUGUIN; record Gauguin2005 = BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataGAUGUIN.BuildingType ( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataGAUGUIN/Gauguin2012_MTD.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataGAUGUIN/Gauguin2012_MTD.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataGAUGUIN/Gauguin2012_MTD.mo" 2022-03-10 09:57:39.660144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataGAUGUIN/Gauguin2012_MTD.mo" 2022-03-10 09:58:28.732150553 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataGAUGUIN; +within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataGAUGUIN; record Gauguin2012_MTD = BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataGAUGUIN.BuildingType ( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataGAUGUIN/Gauguin2012_STD.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataGAUGUIN/Gauguin2012_STD.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataGAUGUIN/Gauguin2012_STD.mo" 2022-03-10 09:57:39.660144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataGAUGUIN/Gauguin2012_STD.mo" 2022-03-10 09:58:28.724150552 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataGAUGUIN; +within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataGAUGUIN; record Gauguin2012_STD = BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataGAUGUIN.BuildingType ( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataGAUGUIN/GauguinBBCEffinergie.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataGAUGUIN/GauguinBBCEffinergie.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataGAUGUIN/GauguinBBCEffinergie.mo" 2022-03-10 09:57:39.660144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataGAUGUIN/GauguinBBCEffinergie.mo" 2022-03-10 09:58:28.712150551 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataGAUGUIN; +within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataGAUGUIN; record GauguinBBCEffinergie = BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataGAUGUIN.BuildingType ( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataGAUGUIN/GauguinBefore1974.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataGAUGUIN/GauguinBefore1974.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataGAUGUIN/GauguinBefore1974.mo" 2022-03-10 09:57:39.660144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataGAUGUIN/GauguinBefore1974.mo" 2022-03-10 09:58:28.708150551 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataGAUGUIN; +within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataGAUGUIN; record GauguinBefore1974 = BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataGAUGUIN.BuildingType ( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataGAUGUIN/package.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataGAUGUIN/package.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataGAUGUIN/package.mo" 2022-03-10 09:57:39.660144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataGAUGUIN/package.mo" 2022-03-10 09:58:28.788150560 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing; +within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing; package BuildingDataGAUGUIN "Settings of Gauguin collective housing depending on the date of construction" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataMATISSE/BuildingType.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataMATISSE/BuildingType.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataMATISSE/BuildingType.mo" 2022-03-10 09:57:39.660144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataMATISSE/BuildingType.mo" 2022-03-10 09:58:28.692150548 +0000 @@ -1,8 +1,8 @@ -within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataMATISSE; +within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataMATISSE; record BuildingType "List of Matisse collective housing construction dates" -// Walls - // Wall type +// Walls + // Wall type replaceable parameter BuildSysPro.Utilities.Records.GenericWall PlancherMitoyen "Common floor" annotation (Dialog(tab="Walls", group= "Interior walls"), choicesAllMatching=true); @@ -39,13 +39,13 @@ PlancherImmeuble "Building floor" annotation (Dialog(tab="Walls", group= "Exterior walls"), choicesAllMatching=true); - // Optical properties +// Optical properties parameter Real alphaExt=0.3 "Absorption coefficient of exterior walls in the visible spectrum" annotation(Dialog(tab="Walls",group="Exterior walls")); parameter Real eps=0 "Emissivity of exterior walls for long wavelength radiation" annotation(Dialog(tab="Walls",group="Exterior walls")); - // Global exchange coefficients (convective and radiative) +// Global exchange coefficients (convective and radiative) parameter Modelica.Units.SI.CoefficientOfHeatTransfer hsExtVert=25 "Surface exchange coefficient on the outer face of vertical walls" annotation (Dialog(tab="Thermal flows", group= @@ -67,7 +67,7 @@ annotation (Dialog(tab="Thermal flows", group= "Surface exchange coefficients (Warning : take care to consider or not long wavelength radiation exchanges according to GLOEXT parameter)")); -// Glazings +// Glazings parameter Modelica.Units.SI.CoefficientOfHeatTransfer UvitrageAF "Coefficient of heat transfert of the window with closing (conduction+convection)" annotation (Dialog(tab="Windows")); @@ -75,15 +75,15 @@ "Coefficient of heat transfert of the window without closing (conduction+convection)" annotation (Dialog(tab="Windows")); - // Description of windows or French windows +// Description of windows or French windows parameter Real transmissionMenuiserieFenetres=(1-0.3)*0.9 "Light transmission due to window frame" annotation (Dialog(tab="Windows")); parameter Real eps_vitrage=0 "Emissivity in long wavelength radiation" annotation (Dialog(tab="Windows")); -// Air renewal and infiltration +// Air renewal and infiltration parameter Real renouvAir "Air renewal rate in vol/h" annotation(Dialog(tab="Thermal flows", group="Air renewal")); -// Thermal bridges +// Thermal bridges parameter Real ValeursK[8] "K coefficient for each linear heat loss relating to a thermal bridge in [W/(m.K)]" annotation(Dialog(tab="Thermal bridges")); parameter Real TauPonts[8] "Tau reduction coefficient of each thermal bridge" @@ -107,7 +107,7 @@ "Value of thermal bridge specific to an apartment on last floor (used in complete collective housing building assembly)" annotation(Dialog(tab="Thermal bridges")); -// Boundary conditions +// Boundary conditions parameter Real bLNC=0.1 "Weighting coefficient of boundary conditions in temperature for unheated rooms" annotation(Dialog(tab="Boundary conditions in temperature")); parameter Real bPlancher diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataMATISSE/Matisse1974to1982.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataMATISSE/Matisse1974to1982.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataMATISSE/Matisse1974to1982.mo" 2022-03-10 09:57:39.660144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataMATISSE/Matisse1974to1982.mo" 2022-03-10 09:58:28.672150546 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataMATISSE; +within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataMATISSE; record Matisse1974to1982 = BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataMATISSE.BuildingType ( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataMATISSE/Matisse1982to1989.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataMATISSE/Matisse1982to1989.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataMATISSE/Matisse1982to1989.mo" 2022-03-10 09:57:39.660144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataMATISSE/Matisse1982to1989.mo" 2022-03-10 09:58:28.664150546 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataMATISSE; +within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataMATISSE; record Matisse1982to1989 = BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataMATISSE.BuildingType ( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataMATISSE/Matisse1989to2000.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataMATISSE/Matisse1989to2000.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataMATISSE/Matisse1989to2000.mo" 2022-03-10 09:57:39.660144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataMATISSE/Matisse1989to2000.mo" 2022-03-10 09:58:28.628150540 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataMATISSE; +within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataMATISSE; record Matisse1989to2000 = BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataMATISSE.BuildingType ( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataMATISSE/Matisse1989to2000_10pc.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataMATISSE/Matisse1989to2000_10pc.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataMATISSE/Matisse1989to2000_10pc.mo" 2022-03-10 09:57:39.660144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataMATISSE/Matisse1989to2000_10pc.mo" 2022-03-10 09:58:28.620150540 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataMATISSE; +within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataMATISSE; record Matisse1989to2000_10pc = BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataMATISSE.BuildingType ( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataMATISSE/Matisse2000.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataMATISSE/Matisse2000.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataMATISSE/Matisse2000.mo" 2022-03-10 09:57:39.660144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataMATISSE/Matisse2000.mo" 2022-03-10 09:58:28.612150538 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataMATISSE; +within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataMATISSE; record Matisse2000 = BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataMATISSE.BuildingType ( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataMATISSE/Matisse2005.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataMATISSE/Matisse2005.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataMATISSE/Matisse2005.mo" 2022-03-10 09:57:39.660144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataMATISSE/Matisse2005.mo" 2022-03-10 09:58:28.600150538 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataMATISSE; +within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataMATISSE; record Matisse2005 = BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataMATISSE.BuildingType ( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataMATISSE/Matisse2012_MTD.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataMATISSE/Matisse2012_MTD.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataMATISSE/Matisse2012_MTD.mo" 2022-03-10 09:57:39.660144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataMATISSE/Matisse2012_MTD.mo" 2022-03-10 09:58:28.584150535 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataMATISSE; +within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataMATISSE; record Matisse2012_MTD = BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataMATISSE.BuildingType ( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataMATISSE/Matisse2012_STD.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataMATISSE/Matisse2012_STD.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataMATISSE/Matisse2012_STD.mo" 2022-03-10 09:57:39.660144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataMATISSE/Matisse2012_STD.mo" 2022-03-10 09:58:28.544150530 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataMATISSE; +within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataMATISSE; record Matisse2012_STD = BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataMATISSE.BuildingType ( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataMATISSE/MatisseBBCEffinergie.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataMATISSE/MatisseBBCEffinergie.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataMATISSE/MatisseBBCEffinergie.mo" 2022-03-10 09:57:39.660144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataMATISSE/MatisseBBCEffinergie.mo" 2022-03-10 09:58:28.512150526 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataMATISSE; +within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataMATISSE; record MatisseBBCEffinergie = BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataMATISSE.BuildingType ( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataMATISSE/MatisseBefore1974.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataMATISSE/MatisseBefore1974.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataMATISSE/MatisseBefore1974.mo" 2022-03-10 09:57:39.660144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataMATISSE/MatisseBefore1974.mo" 2022-03-10 09:58:28.500150525 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataMATISSE; +within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataMATISSE; record MatisseBefore1974 = BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataMATISSE.BuildingType ( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataPICASSO/BuildingType.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataPICASSO/BuildingType.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataPICASSO/BuildingType.mo" 2022-03-10 09:57:39.660144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataPICASSO/BuildingType.mo" 2022-03-10 09:58:28.484150522 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataPICASSO; +within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataPICASSO; record BuildingType "List of Picasso collective housing construction dates" parameter Modelica.Units.SI.CoefficientOfHeatTransfer UvitrageAF "Coefficient of heat transfert of the window with closing (conduction+convection)"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataPICASSO/Picasso1974to1982.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataPICASSO/Picasso1974to1982.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataPICASSO/Picasso1974to1982.mo" 2022-03-10 09:57:39.660144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataPICASSO/Picasso1974to1982.mo" 2022-03-10 09:58:28.476150521 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataPICASSO; +within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataPICASSO; record Picasso1974to1982 = BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataPICASSO.BuildingType ( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataPICASSO/Picasso1982to1989.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataPICASSO/Picasso1982to1989.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataPICASSO/Picasso1982to1989.mo" 2022-03-10 09:57:39.660144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataPICASSO/Picasso1982to1989.mo" 2022-03-10 09:58:28.468150521 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataPICASSO; +within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataPICASSO; record Picasso1982to1989 = BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataPICASSO.BuildingType ( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataPICASSO/Picasso1989to2000.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataPICASSO/Picasso1989to2000.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataPICASSO/Picasso1989to2000.mo" 2022-03-10 09:57:39.660144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataPICASSO/Picasso1989to2000.mo" 2022-03-10 09:58:28.460150519 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataPICASSO; +within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataPICASSO; record Picasso1989to2000 = BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataPICASSO.BuildingType ( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataPICASSO/Picasso2000.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataPICASSO/Picasso2000.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataPICASSO/Picasso2000.mo" 2022-03-10 09:57:39.660144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataPICASSO/Picasso2000.mo" 2022-03-10 09:58:28.452150518 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataPICASSO; +within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataPICASSO; record Picasso2000 = BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataPICASSO.BuildingType ( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataPICASSO/Picasso2005.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataPICASSO/Picasso2005.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataPICASSO/Picasso2005.mo" 2022-03-10 09:57:39.660144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataPICASSO/Picasso2005.mo" 2022-03-10 09:58:28.444150518 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataPICASSO; +within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataPICASSO; record Picasso2005 = BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataPICASSO.BuildingType ( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataPICASSO/Picasso2012_MTD.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataPICASSO/Picasso2012_MTD.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataPICASSO/Picasso2012_MTD.mo" 2022-03-10 09:57:39.660144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataPICASSO/Picasso2012_MTD.mo" 2022-03-10 09:58:28.436150517 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataPICASSO; +within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataPICASSO; record Picasso2012_MTD = BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataPICASSO.BuildingType ( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataPICASSO/Picasso2012_STD.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataPICASSO/Picasso2012_STD.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataPICASSO/Picasso2012_STD.mo" 2022-03-10 09:57:39.660144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataPICASSO/Picasso2012_STD.mo" 2022-03-10 09:58:28.428150515 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataPICASSO; +within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataPICASSO; record Picasso2012_STD = BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataPICASSO.BuildingType ( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataPICASSO/PicassoBBCEffinergie.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataPICASSO/PicassoBBCEffinergie.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataPICASSO/PicassoBBCEffinergie.mo" 2022-03-10 09:57:39.660144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataPICASSO/PicassoBBCEffinergie.mo" 2022-03-10 09:58:28.420150514 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataPICASSO; +within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataPICASSO; record PicassoBBCEffinergie = BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataPICASSO.BuildingType ( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataPICASSO/PicassoBefore1974.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataPICASSO/PicassoBefore1974.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataPICASSO/PicassoBefore1974.mo" 2022-03-10 09:57:39.660144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataPICASSO/PicassoBefore1974.mo" 2022-03-10 09:58:28.408150512 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataPICASSO; +within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataPICASSO; record PicassoBefore1974 = BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataPICASSO.BuildingType ( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataPICASSO/package.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataPICASSO/package.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataPICASSO/package.mo" 2022-03-10 09:57:39.660144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataPICASSO/package.mo" 2022-03-10 09:58:28.492150523 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing; +within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing; package BuildingDataPICASSO "Settings of Picasso collective housing depending on the date of construction" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataUNHEATEDROOM/BuildingType.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataUNHEATEDROOM/BuildingType.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataUNHEATEDROOM/BuildingType.mo" 2022-03-10 09:57:39.660144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataUNHEATEDROOM/BuildingType.mo" 2022-03-10 09:58:28.324150502 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataUNHEATEDROOM; +within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataUNHEATEDROOM; record BuildingType "List of unheated wall collective housing construction dates" replaceable parameter BuildSysPro.Utilities.Records.GenericWall PlancherBas diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataUNHEATEDROOM/UnheatedRoom1974to1982.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataUNHEATEDROOM/UnheatedRoom1974to1982.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataUNHEATEDROOM/UnheatedRoom1974to1982.mo" 2022-03-10 09:57:39.660144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataUNHEATEDROOM/UnheatedRoom1974to1982.mo" 2022-03-10 09:58:28.312150500 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataUNHEATEDROOM; +within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataUNHEATEDROOM; record UnheatedRoom1974to1982 = BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataUNHEATEDROOM.BuildingType ( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataUNHEATEDROOM/UnheatedRoom1982to1989.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataUNHEATEDROOM/UnheatedRoom1982to1989.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataUNHEATEDROOM/UnheatedRoom1982to1989.mo" 2022-03-10 09:57:39.660144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataUNHEATEDROOM/UnheatedRoom1982to1989.mo" 2022-03-10 09:58:28.300150499 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataUNHEATEDROOM; +within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataUNHEATEDROOM; record UnheatedRoom1982to1989 = BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataUNHEATEDROOM.BuildingType ( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataUNHEATEDROOM/UnheatedRoom1989to2000.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataUNHEATEDROOM/UnheatedRoom1989to2000.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataUNHEATEDROOM/UnheatedRoom1989to2000.mo" 2022-03-10 09:57:39.660144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataUNHEATEDROOM/UnheatedRoom1989to2000.mo" 2022-03-10 09:58:28.292150498 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataUNHEATEDROOM; +within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataUNHEATEDROOM; record UnheatedRoom1989to2000 = BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataUNHEATEDROOM.BuildingType ( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataUNHEATEDROOM/UnheatedRoom2000.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataUNHEATEDROOM/UnheatedRoom2000.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataUNHEATEDROOM/UnheatedRoom2000.mo" 2022-03-10 09:57:39.660144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataUNHEATEDROOM/UnheatedRoom2000.mo" 2022-03-10 09:58:28.288150497 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataUNHEATEDROOM; +within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataUNHEATEDROOM; record UnheatedRoom2000 = BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataUNHEATEDROOM.BuildingType ( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataUNHEATEDROOM/UnheatedRoom2005.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataUNHEATEDROOM/UnheatedRoom2005.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataUNHEATEDROOM/UnheatedRoom2005.mo" 2022-03-10 09:57:39.660144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataUNHEATEDROOM/UnheatedRoom2005.mo" 2022-03-10 09:58:28.284150498 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataUNHEATEDROOM; +within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataUNHEATEDROOM; record UnheatedRoom2005 = BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataUNHEATEDROOM.BuildingType ( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataUNHEATEDROOM/UnheatedRoom2012_MTD.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataUNHEATEDROOM/UnheatedRoom2012_MTD.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataUNHEATEDROOM/UnheatedRoom2012_MTD.mo" 2022-03-10 09:57:39.660144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataUNHEATEDROOM/UnheatedRoom2012_MTD.mo" 2022-03-10 09:58:28.276150495 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataUNHEATEDROOM; +within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataUNHEATEDROOM; record UnheatedRoom2012_MTD = BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataUNHEATEDROOM.BuildingType ( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataUNHEATEDROOM/UnheatedRoom2012_STD.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataUNHEATEDROOM/UnheatedRoom2012_STD.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataUNHEATEDROOM/UnheatedRoom2012_STD.mo" 2022-03-10 09:57:39.660144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataUNHEATEDROOM/UnheatedRoom2012_STD.mo" 2022-03-10 09:58:28.268150495 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataUNHEATEDROOM; +within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataUNHEATEDROOM; record UnheatedRoom2012_STD = BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataUNHEATEDROOM.BuildingType ( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataUNHEATEDROOM/UnheatedRoomBBCEffinergie.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataUNHEATEDROOM/UnheatedRoomBBCEffinergie.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataUNHEATEDROOM/UnheatedRoomBBCEffinergie.mo" 2022-03-10 09:57:39.660144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataUNHEATEDROOM/UnheatedRoomBBCEffinergie.mo" 2022-03-10 09:58:28.264150494 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataUNHEATEDROOM; +within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataUNHEATEDROOM; record UnheatedRoomBBCEffinergie = BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataUNHEATEDROOM.BuildingType ( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataUNHEATEDROOM/UnheatedRoomBefore1974.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataUNHEATEDROOM/UnheatedRoomBefore1974.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataUNHEATEDROOM/UnheatedRoomBefore1974.mo" 2022-03-10 09:57:39.660144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataUNHEATEDROOM/UnheatedRoomBefore1974.mo" 2022-03-10 09:58:28.260150494 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataUNHEATEDROOM; +within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataUNHEATEDROOM; record UnheatedRoomBefore1974 = BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing.BuildingDataUNHEATEDROOM.BuildingType ( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataUNHEATEDROOM/package.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataUNHEATEDROOM/package.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataUNHEATEDROOM/package.mo" 2022-03-10 09:57:39.660144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/CollectiveHousing/BuildingDataUNHEATEDROOM/package.mo" 2022-03-10 09:58:28.396150511 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing; +within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.CollectiveHousing; package BuildingDataUNHEATEDROOM "Settings of unheated room in collective housing depending on the date of construction" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/IndividualHousing/BuildingDataMOZART/Mozart2005.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/IndividualHousing/BuildingDataMOZART/Mozart2005.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/IndividualHousing/BuildingDataMOZART/Mozart2005.mo" 2022-03-10 09:57:39.660144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/IndividualHousing/BuildingDataMOZART/Mozart2005.mo" 2022-03-10 09:58:28.072150470 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.IndividualHousing.BuildingDataMOZART; +within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.IndividualHousing.BuildingDataMOZART; record Mozart2005 = BuildSysPro.BuildingStock.Utilities.Records.BuildingData.IndividualHousing.BuildingDataMOZART.BuildingType ( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/IndividualHousing/BuildingDataMOZART/Mozart2012_MTD.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/IndividualHousing/BuildingDataMOZART/Mozart2012_MTD.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/IndividualHousing/BuildingDataMOZART/Mozart2012_MTD.mo" 2022-03-10 09:57:39.660144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/IndividualHousing/BuildingDataMOZART/Mozart2012_MTD.mo" 2022-03-10 09:58:28.064150470 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.IndividualHousing.BuildingDataMOZART; +within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.IndividualHousing.BuildingDataMOZART; record Mozart2012_MTD = BuildSysPro.BuildingStock.Utilities.Records.BuildingData.IndividualHousing.BuildingDataMOZART.BuildingType ( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/IndividualHousing/BuildingDataMOZART/Mozart2012_STD.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/IndividualHousing/BuildingDataMOZART/Mozart2012_STD.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/IndividualHousing/BuildingDataMOZART/Mozart2012_STD.mo" 2022-03-10 09:57:39.660144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/IndividualHousing/BuildingDataMOZART/Mozart2012_STD.mo" 2022-03-10 09:58:28.056150467 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.IndividualHousing.BuildingDataMOZART; +within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.IndividualHousing.BuildingDataMOZART; record Mozart2012_STD = BuildSysPro.BuildingStock.Utilities.Records.BuildingData.IndividualHousing.BuildingDataMOZART.BuildingType ( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/IndividualHousing/BuildingDataMOZART/MozartBBCEffinergie.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/IndividualHousing/BuildingDataMOZART/MozartBBCEffinergie.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/IndividualHousing/BuildingDataMOZART/MozartBBCEffinergie.mo" 2022-03-10 09:57:39.660144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/IndividualHousing/BuildingDataMOZART/MozartBBCEffinergie.mo" 2022-03-10 09:58:28.048150467 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.IndividualHousing.BuildingDataMOZART; +within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.IndividualHousing.BuildingDataMOZART; record MozartBBCEffinergie = BuildSysPro.BuildingStock.Utilities.Records.BuildingData.IndividualHousing.BuildingDataMOZART.BuildingType ( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/IndividualHousing/BuildingDataMOZART/MozartRenoExisting.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/IndividualHousing/BuildingDataMOZART/MozartRenoExisting.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/IndividualHousing/BuildingDataMOZART/MozartRenoExisting.mo" 2022-03-10 09:57:39.660144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/BuildingData/IndividualHousing/BuildingDataMOZART/MozartRenoExisting.mo" 2022-03-10 09:58:28.032150466 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.IndividualHousing.BuildingDataMOZART; +within BuildSysPro.BuildingStock.Utilities.Records.BuildingData.IndividualHousing.BuildingDataMOZART; record MozartRenoExisting = BuildSysPro.BuildingStock.Utilities.Records.BuildingData.IndividualHousing.BuildingDataMOZART.BuildingType ( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/Geometry/CollectiveHousing/SettingsGauguin.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/Geometry/CollectiveHousing/SettingsGauguin.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/Geometry/CollectiveHousing/SettingsGauguin.mo" 2022-03-10 09:57:39.660144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/Geometry/CollectiveHousing/SettingsGauguin.mo" 2022-03-10 09:58:28.000150462 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.Geometry.CollectiveHousing; +within BuildSysPro.BuildingStock.Utilities.Records.Geometry.CollectiveHousing; record SettingsGauguin constant Modelica.Units.SI.Volume VolumeGauguin=238.48; constant Modelica.Units.SI.Area Surf_Refends=15.75; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/Geometry/CollectiveHousing/SettingsMatisse.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/Geometry/CollectiveHousing/SettingsMatisse.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/Geometry/CollectiveHousing/SettingsMatisse.mo" 2022-03-10 09:57:39.660144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/Geometry/CollectiveHousing/SettingsMatisse.mo" 2022-03-10 09:58:27.988150460 +0000 @@ -1,8 +1,7 @@ -within BuildSysPro.BuildingStock.Utilities.Records.Geometry.CollectiveHousing; +within BuildSysPro.BuildingStock.Utilities.Records.Geometry.CollectiveHousing; record SettingsMatisse -// Geometric parameters - +// Geometric parameters constant Modelica.Units.SI.Volume VolumeMatisse=164.43; constant Modelica.Units.SI.Length HauteurMatisse=2.50; @@ -28,10 +27,8 @@ constant Real LongueursPontsPlancher[:]={11.27,11.27,12.10}; constant Real LongueursPontsPlafond[:]={11.27,11.27,12.10}; -// Multizone data - -// Room 1 - +// Multizone data + // Room 1 constant Modelica.Units.SI.Area Surf_VitrageNordC1=1.95; constant Modelica.Units.SI.Area Surf_MurNordC1=4.3; constant Modelica.Units.SI.Area Surf_PlancherPlafondC1=9.5; @@ -39,8 +36,7 @@ constant Real LongueursPontsC1[:] = {0.00,0.00,2.5,2.5,0.00,0.00,0.00,5.6}; constant Real LongueursPontsC1PlancherPlafond[:]={2.5,0.00,0.00}; -// Room 2 - +// Room 2 constant Modelica.Units.SI.Area Surf_MurNordC2=5.675; constant Modelica.Units.SI.Area Surf_MurEstC2=9.5; constant Modelica.Units.SI.Area Surf_VitrageNordC2=1.95; @@ -49,23 +45,20 @@ constant Real LongueursPontsC2[:] = {2.5,0.00,3.05,3.05,0.00,0.00,0.00,5.6}; constant Real LongueursPontsC2PlancherPlafond[:]={3.05,0.00,3.8}; -// Entrance - +// Entrance constant Modelica.Units.SI.Area Surf_MurSudEntree=7.4; constant Modelica.Units.SI.Area Surf_PlancherPlafondEntree=8.892; constant Real LongueursPontsEntree[:] = {0.00,0.00,0.00,0.00,3.6,3.6,5.6,0.00}; constant Real LongueursPontsEntreePlancherPlafond[:]={0.00,3.6,0.00}; -// Bathroom - +// Bathroom constant Modelica.Units.SI.Area Surf_MurSudSDB=9.675; constant Modelica.Units.SI.Area Surf_MurEstSDB=5.25; constant Modelica.Units.SI.Area Surf_PlancherPlafondSDB=6.867; constant Real LongueursPontsSDB[:] = {0.00,2.5,0.00,0.00,1.4+2.47,1.4+2.47,0.00,0.00}; constant Real LongueursPontsSDBPlancherPlafond[:]={0.00,1.4+2.47,1.2+0.9}; -// Kitchen - +// Kitchen constant Modelica.Units.SI.Area Surf_MurNordCuisine=3.05; constant Modelica.Units.SI.Area Surf_VitrageNordCuisine=1.95; constant Modelica.Units.SI.Area Surf_PlancherPlafondCuisine=7.6; @@ -73,8 +66,7 @@ constant Real LongueursPontsCuisine[:] = {0.00,0.00,2.00,2.00,0.00,0.00,0.00,5.6}; constant Real LongueursPontsCuisinePlancherPlafond[:]={2.00,0.00,0.00}; -// Living - +// Living constant Modelica.Units.SI.Area Surf_MurNordSejour=4.85; constant Modelica.Units.SI.Area Surf_VitrageNordSejour=3.9; constant Modelica.Units.SI.Area Surf_MurOuestSejour=15.125; @@ -84,8 +76,7 @@ constant Real LongueursPontsSejour[:] = {2.5,2.5,3.5,3.5,3.5,3.5,0.00,5.6*2}; constant Real LongueursPontsSejourPlancherPlafond[:]={3.5,3.5,6.05}; -// Partition walls - +// Partition walls constant Modelica.Units.SI.Area Surf_CloisonLegSejourCuisine=9.5; constant Modelica.Units.SI.Area Surf_CloisonLegEntreeSejour=3.75; constant Modelica.Units.SI.Area Surf_CloisonLegC1Cuisine=9.5; @@ -96,8 +87,7 @@ constant Modelica.Units.SI.Area Surf_CloisonLegEntreeC2=2; constant Modelica.Units.SI.Area Surf_CloisonLegEntreeSDB=9.75; -// Internal doors - +// Internal doors constant Modelica.Units.SI.Area Surf_PorteIntEntreeSejour=1.675; constant Modelica.Units.SI.Area Surf_PorteIntEntreeCuisine=1.5; constant Modelica.Units.SI.Area Surf_PorteIntEntreeC2=1.5; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/Geometry/CollectiveHousing/SettingsPicasso.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/Geometry/CollectiveHousing/SettingsPicasso.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/Geometry/CollectiveHousing/SettingsPicasso.mo" 2022-03-10 09:57:39.660144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/Geometry/CollectiveHousing/SettingsPicasso.mo" 2022-03-10 09:58:27.968150456 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.Geometry.CollectiveHousing; +within BuildSysPro.BuildingStock.Utilities.Records.Geometry.CollectiveHousing; record SettingsPicasso constant Modelica.Units.SI.Volume VolumePicasso=71.60; constant Modelica.Units.SI.Area Surf_Cloison=28.05; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/Geometry/CollectiveHousing/SettingsUnheatedRoom.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/Geometry/CollectiveHousing/SettingsUnheatedRoom.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/Geometry/CollectiveHousing/SettingsUnheatedRoom.mo" 2022-03-10 09:57:39.660144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/Geometry/CollectiveHousing/SettingsUnheatedRoom.mo" 2022-03-10 09:58:27.960150455 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.Geometry.CollectiveHousing; +within BuildSysPro.BuildingStock.Utilities.Records.Geometry.CollectiveHousing; record SettingsUnheatedRoom constant Modelica.Units.SI.Volume VolumeLNC=27.5*2.5; constant Modelica.Units.SI.Area Surf_ParoiSousCombles=27.5; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/Geometry/IndividualHousing/SettingsMozart.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/Geometry/IndividualHousing/SettingsMozart.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/Geometry/IndividualHousing/SettingsMozart.mo" 2022-03-10 09:57:39.660144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/Geometry/IndividualHousing/SettingsMozart.mo" 2022-03-10 09:58:27.948150454 +0000 @@ -1,8 +1,7 @@ -within BuildSysPro.BuildingStock.Utilities.Records.Geometry.IndividualHousing; +within BuildSysPro.BuildingStock.Utilities.Records.Geometry.IndividualHousing; record SettingsMozart -// Geometric parameters - +// Geometric parameters constant Modelica.Units.SI.Volume VolumeMozart=249.6; constant Modelica.Units.SI.Length HauteurMozart=2.50; @@ -32,18 +31,15 @@ constant Real LongueursPonts[:] = {20.00,10.00,41.30,41.30,16.40,41.30,41.30,6.20,44.34}; -// Multizone data - -// Room 1 - +// Multizone data + // Room 1 constant Modelica.Units.SI.Area Surf_VitrageNordC1=1.38; constant Modelica.Units.SI.Area Surf_MurNordC1=5.37; constant Modelica.Units.SI.Area Surf_PlancherPlafondC1=10.935; constant Modelica.Units.SI.Length H_VitrageNordC1=1.15; constant Real LongueursPontsC1[:] = {0.00,0.00,2.7,2.7,0.00,2.7,2.7,0.00,4.7}; -// Room 2 - +// Room 2 constant Modelica.Units.SI.Area Surf_MurNordC2=6.875; constant Modelica.Units.SI.Area Surf_MurEstC2=8.185; constant Modelica.Units.SI.Area Surf_VitrageEstC2=1.94; @@ -51,8 +47,7 @@ constant Modelica.Units.SI.Length H_VitrageEstC2=2.15; constant Real LongueursPontsC2[:] = {2*2.50,0.00,2.75+4.05,2.75+4.05,0.00,2.75+4.05,2.75+4.05,0.00,6.1}; -// Room 3 - +// Room 3 constant Modelica.Units.SI.Area Surf_VitrageEstC3=1.94; constant Modelica.Units.SI.Area Surf_MurEstC3=4.81; constant Modelica.Units.SI.Area Surf_MurSudC3=6.795; @@ -62,23 +57,20 @@ constant Modelica.Units.SI.Length H_VitrageSudC3=2.15; constant Real LongueursPontsC3[:] = {2*2.50,0.00,2.7+3.75,2.7+3.75,0.00,2.7+3.75,2.7+3.75,0.00,6.1+6.7}; -// Entrance - +// Entrance constant Modelica.Units.SI.Area Surf_MurSudEntree=1.46; constant Modelica.Units.SI.Area Surf_MurEstEntree=3.375; constant Modelica.Units.SI.Area Surf_PlancherPlafondEntree=14.31; constant Real LongueursPontsEntree[:] = {0.00,2.50,1.4+1.35,1.4+1.35,4.05,1.4+1.35,1.4+1.35,6.20,0.00}; -// Bathroom - +// Bathroom constant Modelica.Units.SI.Area Surf_MurSudSDB=6.185; constant Modelica.Units.SI.Area Surf_VitrageSudSDB=0.44; constant Modelica.Units.SI.Area Surf_PlancherPlafondSDB=7.155; constant Modelica.Units.SI.Length H_VitrageSudSDB=0.7; constant Real LongueursPontsSDB[:] = {0.00,0.00,2.65,2.65,0.00,2.65,2.65,0.00,2.66}; -// Living - +// Living constant Modelica.Units.SI.Area Surf_MurNordSejour=11.25; constant Modelica.Units.SI.Area Surf_MurLNCSejour=14.25; constant Modelica.Units.SI.Area Surf_MurOuestSejour=3.45; @@ -90,21 +82,18 @@ constant Modelica.Units.SI.Length H_VitrageSudSejour=2.15; constant Real LongueursPontsSejour[:] = {4*2.5,2*2.5,8.2+2*4.5,8.2+2*4.5,8.2,8.2+2*4.5,8.2+2*4.5,0.00,7.0+6.9}; -// Kitchen - +// Kitchen constant Modelica.Units.SI.Area Surf_MurNordCuisine=4.835; constant Modelica.Units.SI.Area Surf_VitrageNordCuisine=1.04; constant Modelica.Units.SI.Area Surf_PlancherPlafondCuisine=9.5175; constant Modelica.Units.SI.Length H_VitrageNordCuisine=1.15; constant Real LongueursPontsCuisine[:] = {0.00,2.50,2.35,2.35,4.05,2.35,2.35,0.00,4.1}; -// Supporting walls - +// Supporting walls constant Modelica.Units.SI.Area Surf_RefendSejourCuisine=10.125; constant Modelica.Units.SI.Area Surf_RefendEntreeSejour=8.625; -// Partition walls - +// Partition walls constant Modelica.Units.SI.Area Surf_CloisonLegEntreeCuisine=4.375; constant Modelica.Units.SI.Area Surf_CloisonLegC1C2=10.125; constant Modelica.Units.SI.Area Surf_CloisonLegEntreeC2=5.375; @@ -114,9 +103,7 @@ constant Modelica.Units.SI.Area Surf_CloisonLegEntreeC3=7.875; constant Modelica.Units.SI.Area Surf_CloisonLegC1Cuisine=10.125; - -// Internal doors - +// Internal doors constant Modelica.Units.SI.Area Surf_PorteIntEntreeSejour=1.75; constant Modelica.Units.SI.Area Surf_PorteIntEntreeCuisine=1.5; constant Modelica.Units.SI.Area Surf_PorteIntEntreeC2=1.5; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/HeatTransfer/h_surf_ISO6946.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/HeatTransfer/h_surf_ISO6946.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/HeatTransfer/h_surf_ISO6946.mo" 2022-03-10 09:57:39.660144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/HeatTransfer/h_surf_ISO6946.mo" 2022-03-10 09:58:27.924150452 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.HeatTransfer; +within BuildSysPro.BuildingStock.Utilities.Records.HeatTransfer; record h_surf_ISO6946 "Set of surface heat transfer coefficients from ISO 6946" import Modelica.Units.SI; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/BBCEffinergie/Ceiling.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/BBCEffinergie/Ceiling.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/BBCEffinergie/Ceiling.mo" 2022-03-10 09:57:39.660144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/BBCEffinergie/Ceiling.mo" 2022-03-10 09:58:27.852150442 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.WallData.CollectiveHousing.BBCEffinergie; +within BuildSysPro.BuildingStock.Utilities.Records.WallData.CollectiveHousing.BBCEffinergie; record Ceiling = BuildSysPro.Utilities.Icons.Ceiling ( n=4, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/BBCEffinergie/Door.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/BBCEffinergie/Door.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/BBCEffinergie/Door.mo" 2022-03-10 09:57:39.660144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/BBCEffinergie/Door.mo" 2022-03-10 09:58:27.844150442 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.WallData.CollectiveHousing.BBCEffinergie; +within BuildSysPro.BuildingStock.Utilities.Records.WallData.CollectiveHousing.BBCEffinergie; record Door = BuildSysPro.Utilities.Icons.Door ( n=1, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/BBCEffinergie/ExtWall.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/BBCEffinergie/ExtWall.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/BBCEffinergie/ExtWall.mo" 2022-03-10 09:57:39.660144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/BBCEffinergie/ExtWall.mo" 2022-03-10 09:58:27.840150440 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.WallData.CollectiveHousing.BBCEffinergie; +within BuildSysPro.BuildingStock.Utilities.Records.WallData.CollectiveHousing.BBCEffinergie; record ExtWall = BuildSysPro.Utilities.Icons.ExtWall ( n=3, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/BBCEffinergie/Floor.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/BBCEffinergie/Floor.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/BBCEffinergie/Floor.mo" 2022-03-10 09:57:39.660144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/BBCEffinergie/Floor.mo" 2022-03-10 09:58:27.832150439 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.WallData.CollectiveHousing.BBCEffinergie; +within BuildSysPro.BuildingStock.Utilities.Records.WallData.CollectiveHousing.BBCEffinergie; record Floor = BuildSysPro.Utilities.Icons.Floor ( n=2, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/BBCEffinergie/LandingWall.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/BBCEffinergie/LandingWall.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/BBCEffinergie/LandingWall.mo" 2022-03-10 09:57:39.660144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/BBCEffinergie/LandingWall.mo" 2022-03-10 09:58:27.824150439 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.WallData.CollectiveHousing.BBCEffinergie; +within BuildSysPro.BuildingStock.Utilities.Records.WallData.CollectiveHousing.BBCEffinergie; record LandingWall = BuildSysPro.Utilities.Icons.VerticalInternalWall ( n=3, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/From1982to1989/Floor.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/From1982to1989/Floor.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/From1982to1989/Floor.mo" 2022-03-10 09:57:39.660144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/From1982to1989/Floor.mo" 2022-03-10 09:58:27.632150414 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.WallData.CollectiveHousing.From1982to1989; +within BuildSysPro.BuildingStock.Utilities.Records.WallData.CollectiveHousing.From1982to1989; record Floor = BuildSysPro.Utilities.Icons.Floor ( n=2, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/IntDoor.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/IntDoor.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/IntDoor.mo" 2022-03-10 09:57:39.660144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/IntDoor.mo" 2022-03-10 09:58:27.496150398 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.WallData.CollectiveHousing; +within BuildSysPro.BuildingStock.Utilities.Records.WallData.CollectiveHousing; record IntDoor = BuildSysPro.Utilities.Icons.VerticalInternalWall ( n=1, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/RT2000/Ceiling.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/RT2000/Ceiling.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/RT2000/Ceiling.mo" 2022-03-10 09:57:39.660144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/RT2000/Ceiling.mo" 2022-03-10 09:58:27.452150392 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.WallData.CollectiveHousing.RT2000; +within BuildSysPro.BuildingStock.Utilities.Records.WallData.CollectiveHousing.RT2000; record Ceiling = BuildSysPro.Utilities.Icons.Ceiling ( n=4, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/RT2000/Door.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/RT2000/Door.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/RT2000/Door.mo" 2022-03-10 09:57:39.660144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/RT2000/Door.mo" 2022-03-10 09:58:27.444150391 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.WallData.CollectiveHousing.RT2000; +within BuildSysPro.BuildingStock.Utilities.Records.WallData.CollectiveHousing.RT2000; record Door = BuildSysPro.Utilities.Icons.Door ( n=1, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/RT2000/ExtWall.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/RT2000/ExtWall.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/RT2000/ExtWall.mo" 2022-03-10 09:57:39.660144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/RT2000/ExtWall.mo" 2022-03-10 09:58:27.396150384 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.WallData.CollectiveHousing.RT2000; +within BuildSysPro.BuildingStock.Utilities.Records.WallData.CollectiveHousing.RT2000; record ExtWall = BuildSysPro.Utilities.Icons.ExtWall ( n=3, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/RT2000/Floor.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/RT2000/Floor.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/RT2000/Floor.mo" 2022-03-10 09:57:39.660144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/RT2000/Floor.mo" 2022-03-10 09:58:27.388150384 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.WallData.CollectiveHousing.RT2000; +within BuildSysPro.BuildingStock.Utilities.Records.WallData.CollectiveHousing.RT2000; record Floor = BuildSysPro.Utilities.Icons.Floor ( n=2, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/RT2000/LandingWall.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/RT2000/LandingWall.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/RT2000/LandingWall.mo" 2022-03-10 09:57:39.660144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/RT2000/LandingWall.mo" 2022-03-10 09:58:27.380150382 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.WallData.CollectiveHousing.RT2000; +within BuildSysPro.BuildingStock.Utilities.Records.WallData.CollectiveHousing.RT2000; record LandingWall = BuildSysPro.Utilities.Icons.VerticalInternalWall ( n=3, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/RT2005/Ceiling.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/RT2005/Ceiling.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/RT2005/Ceiling.mo" 2022-03-10 09:57:39.660144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/RT2005/Ceiling.mo" 2022-03-10 09:58:27.364150380 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.WallData.CollectiveHousing.RT2005; +within BuildSysPro.BuildingStock.Utilities.Records.WallData.CollectiveHousing.RT2005; record Ceiling = BuildSysPro.Utilities.Icons.Ceiling ( n=4, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/RT2005/Door.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/RT2005/Door.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/RT2005/Door.mo" 2022-03-10 09:57:39.660144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/RT2005/Door.mo" 2022-03-10 09:58:27.360150379 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.WallData.CollectiveHousing.RT2005; +within BuildSysPro.BuildingStock.Utilities.Records.WallData.CollectiveHousing.RT2005; record Door = BuildSysPro.Utilities.Icons.Door ( n=1, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/RT2005/ExtWall.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/RT2005/ExtWall.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/RT2005/ExtWall.mo" 2022-03-10 09:57:39.660144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/RT2005/ExtWall.mo" 2022-03-10 09:58:27.352150379 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.WallData.CollectiveHousing.RT2005; +within BuildSysPro.BuildingStock.Utilities.Records.WallData.CollectiveHousing.RT2005; record ExtWall = BuildSysPro.Utilities.Icons.ExtWall ( n=3, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/RT2005/Floor.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/RT2005/Floor.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/RT2005/Floor.mo" 2022-03-10 09:57:39.660144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/RT2005/Floor.mo" 2022-03-10 09:58:27.348150378 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.WallData.CollectiveHousing.RT2005; +within BuildSysPro.BuildingStock.Utilities.Records.WallData.CollectiveHousing.RT2005; record Floor = BuildSysPro.Utilities.Icons.Floor ( n=2, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/RT2005/LandingWall.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/RT2005/LandingWall.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/RT2005/LandingWall.mo" 2022-03-10 09:57:39.660144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/RT2005/LandingWall.mo" 2022-03-10 09:58:27.340150377 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.WallData.CollectiveHousing.RT2005; +within BuildSysPro.BuildingStock.Utilities.Records.WallData.CollectiveHousing.RT2005; record LandingWall = BuildSysPro.Utilities.Icons.VerticalInternalWall ( n=3, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/RT2012_MTD/Ceiling.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/RT2012_MTD/Ceiling.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/RT2012_MTD/Ceiling.mo" 2022-03-10 09:57:39.660144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/RT2012_MTD/Ceiling.mo" 2022-03-10 09:58:27.328150375 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.WallData.CollectiveHousing.RT2012_MTD; +within BuildSysPro.BuildingStock.Utilities.Records.WallData.CollectiveHousing.RT2012_MTD; record Ceiling = BuildSysPro.Utilities.Icons.Ceiling ( n=4, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/RT2012_MTD/Door.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/RT2012_MTD/Door.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/RT2012_MTD/Door.mo" 2022-03-10 09:57:39.660144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/RT2012_MTD/Door.mo" 2022-03-10 09:58:27.320150375 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.WallData.CollectiveHousing.RT2012_MTD; +within BuildSysPro.BuildingStock.Utilities.Records.WallData.CollectiveHousing.RT2012_MTD; record Door = BuildSysPro.Utilities.Icons.Door ( n=1, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/RT2012_MTD/ExtWall.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/RT2012_MTD/ExtWall.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/RT2012_MTD/ExtWall.mo" 2022-03-10 09:57:39.660144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/RT2012_MTD/ExtWall.mo" 2022-03-10 09:58:27.316150374 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.WallData.CollectiveHousing.RT2012_MTD; +within BuildSysPro.BuildingStock.Utilities.Records.WallData.CollectiveHousing.RT2012_MTD; record ExtWall = BuildSysPro.Utilities.Icons.ExtWall ( n=3, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/RT2012_MTD/Floor.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/RT2012_MTD/Floor.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/RT2012_MTD/Floor.mo" 2022-03-10 09:57:39.660144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/RT2012_MTD/Floor.mo" 2022-03-10 09:58:27.308150373 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.WallData.CollectiveHousing.RT2012_MTD; +within BuildSysPro.BuildingStock.Utilities.Records.WallData.CollectiveHousing.RT2012_MTD; record Floor = BuildSysPro.Utilities.Icons.Floor ( n=3, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/RT2012_MTD/LandingWall.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/RT2012_MTD/LandingWall.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/RT2012_MTD/LandingWall.mo" 2022-03-10 09:57:39.660144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/RT2012_MTD/LandingWall.mo" 2022-03-10 09:58:27.296150371 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.WallData.CollectiveHousing.RT2012_MTD; +within BuildSysPro.BuildingStock.Utilities.Records.WallData.CollectiveHousing.RT2012_MTD; record LandingWall = BuildSysPro.Utilities.Icons.VerticalInternalWall ( n=3, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/RT2012_STD/Ceiling.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/RT2012_STD/Ceiling.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/RT2012_STD/Ceiling.mo" 2022-03-10 09:57:39.660144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/RT2012_STD/Ceiling.mo" 2022-03-10 09:58:27.284150370 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.WallData.CollectiveHousing.RT2012_STD; +within BuildSysPro.BuildingStock.Utilities.Records.WallData.CollectiveHousing.RT2012_STD; record Ceiling = BuildSysPro.Utilities.Icons.Ceiling ( n=4, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/RT2012_STD/Door.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/RT2012_STD/Door.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/RT2012_STD/Door.mo" 2022-03-10 09:57:39.660144336 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/RT2012_STD/Door.mo" 2022-03-10 09:58:27.272150368 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.WallData.CollectiveHousing.RT2012_STD; +within BuildSysPro.BuildingStock.Utilities.Records.WallData.CollectiveHousing.RT2012_STD; record Door = BuildSysPro.Utilities.Icons.Door ( n=1, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/RT2012_STD/ExtWall.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/RT2012_STD/ExtWall.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/RT2012_STD/ExtWall.mo" 2022-03-10 09:57:39.664144338 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/RT2012_STD/ExtWall.mo" 2022-03-10 09:58:27.264150367 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.WallData.CollectiveHousing.RT2012_STD; +within BuildSysPro.BuildingStock.Utilities.Records.WallData.CollectiveHousing.RT2012_STD; record ExtWall = BuildSysPro.Utilities.Icons.ExtWall ( n=3, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/RT2012_STD/Floor.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/RT2012_STD/Floor.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/RT2012_STD/Floor.mo" 2022-03-10 09:57:39.664144338 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/RT2012_STD/Floor.mo" 2022-03-10 09:58:27.256150367 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.WallData.CollectiveHousing.RT2012_STD; +within BuildSysPro.BuildingStock.Utilities.Records.WallData.CollectiveHousing.RT2012_STD; record Floor = BuildSysPro.Utilities.Icons.Floor ( n=2, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/RT2012_STD/LandingWall.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/RT2012_STD/LandingWall.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/RT2012_STD/LandingWall.mo" 2022-03-10 09:57:39.664144338 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/RT2012_STD/LandingWall.mo" 2022-03-10 09:58:27.248150366 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.WallData.CollectiveHousing.RT2012_STD; +within BuildSysPro.BuildingStock.Utilities.Records.WallData.CollectiveHousing.RT2012_STD; record LandingWall = BuildSysPro.Utilities.Icons.VerticalInternalWall ( n=3, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/SupportingWall.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/SupportingWall.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/SupportingWall.mo" 2022-03-10 09:57:39.664144338 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/SupportingWall.mo" 2022-03-10 09:58:27.240150364 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.WallData.CollectiveHousing; +within BuildSysPro.BuildingStock.Utilities.Records.WallData.CollectiveHousing; record SupportingWall = BuildSysPro.Utilities.Icons.VerticalInternalWall ( n=1, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/package.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/package.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/package.mo" 2022-03-10 09:57:39.664144338 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/CollectiveHousing/package.mo" 2022-03-10 09:58:27.868150445 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.WallData; +within BuildSysPro.BuildingStock.Utilities.Records.WallData; package CollectiveHousing "Wall data for collective housing (Gauguin, Matisse, Picasso and unheated rooms)" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/BBCEffinergie/package.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/BBCEffinergie/package.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/BBCEffinergie/package.mo" 2022-03-10 09:57:39.664144338 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/BBCEffinergie/package.mo" 2022-03-10 09:58:27.192150359 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.WallData.IndividualHousing; +within BuildSysPro.BuildingStock.Utilities.Records.WallData.IndividualHousing; package BBCEffinergie "Wall data for Mozart individual housing : Ubat = 0.3 W/m²/K" annotation (Documentation(info=" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RT2000_H1H2/package.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RT2000_H1H2/package.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RT2000_H1H2/package.mo" 2022-03-10 09:57:39.664144338 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RT2000_H1H2/package.mo" 2022-03-10 09:58:26.856150315 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.WallData.IndividualHousing; +within BuildSysPro.BuildingStock.Utilities.Records.WallData.IndividualHousing; package RT2000_H1H2 "Wall data for Mozart individual housing : RT2000 zone H1 and H2 (Ubat = 0.455 W/m².K)" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RT2000_H1H2_10pc/package.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RT2000_H1H2_10pc/package.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RT2000_H1H2_10pc/package.mo" 2022-03-10 09:57:39.664144338 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RT2000_H1H2_10pc/package.mo" 2022-03-10 09:58:26.816150311 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.WallData.IndividualHousing; +within BuildSysPro.BuildingStock.Utilities.Records.WallData.IndividualHousing; package RT2000_H1H2_10pc "Wall data for Mozart individual housing : RT2000 -10% zone H1 et H2 (Ubat = 0.383 W/m².K)" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RT2000_H1H2_15pc/package.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RT2000_H1H2_15pc/package.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RT2000_H1H2_15pc/package.mo" 2022-03-10 09:57:39.664144338 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RT2000_H1H2_15pc/package.mo" 2022-03-10 09:58:26.784150307 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.WallData.IndividualHousing; +within BuildSysPro.BuildingStock.Utilities.Records.WallData.IndividualHousing; package RT2000_H1H2_15pc "Wall data for Mozart individual housing : MI RT2000 zone H1 and H2 -15% (Ubat = 0.378 W/m².K)" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RT2000_H1H2_5pc/package.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RT2000_H1H2_5pc/package.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RT2000_H1H2_5pc/package.mo" 2022-03-10 09:57:39.664144338 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RT2000_H1H2_5pc/package.mo" 2022-03-10 09:58:26.724150300 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.WallData.IndividualHousing; +within BuildSysPro.BuildingStock.Utilities.Records.WallData.IndividualHousing; package RT2000_H1H2_5pc "Wall data for Mozart individual housing : RT2000 -5% zone H1 and H2 (Ubat = 0.445 W/m².K)" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RT2000_H3/package.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RT2000_H3/package.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RT2000_H3/package.mo" 2022-03-10 09:57:39.664144338 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RT2000_H3/package.mo" 2022-03-10 09:58:26.688150295 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.WallData.IndividualHousing; +within BuildSysPro.BuildingStock.Utilities.Records.WallData.IndividualHousing; package RT2000_H3 "Wall data for Mozart individual housing : RT2000 zone H3 (Ubat = 0.547 W/m².K)" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RT2000_H3_10pc/package.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RT2000_H3_10pc/package.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RT2000_H3_10pc/package.mo" 2022-03-10 09:57:39.664144338 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RT2000_H3_10pc/package.mo" 2022-03-10 09:58:26.660150291 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.WallData.IndividualHousing; +within BuildSysPro.BuildingStock.Utilities.Records.WallData.IndividualHousing; package RT2000_H3_10pc "Wall data for Mozart individual housing : MI RT2000 zone H3 -10% (Ubat = 0.468 W/m².K)" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RT2000_H3_15pc/package.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RT2000_H3_15pc/package.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RT2000_H3_15pc/package.mo" 2022-03-10 09:57:39.664144338 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RT2000_H3_15pc/package.mo" 2022-03-10 09:58:26.632150287 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.WallData.IndividualHousing; +within BuildSysPro.BuildingStock.Utilities.Records.WallData.IndividualHousing; package RT2000_H3_15pc "Wall data for Mozart individual housing : MI RT2000 zone H3 -15% (Ubat = 0.477 W/m².K)" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RT2000_H3_5pc/package.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RT2000_H3_5pc/package.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RT2000_H3_5pc/package.mo" 2022-03-10 09:57:39.664144338 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RT2000_H3_5pc/package.mo" 2022-03-10 09:58:26.544150276 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.WallData.IndividualHousing; +within BuildSysPro.BuildingStock.Utilities.Records.WallData.IndividualHousing; package RT2000_H3_5pc "Wall data for Mozart individual housing : RT2000 -5% zone H3 (Ubat = 0.537 W/m².K)" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RT2005/AtticWall.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RT2005/AtticWall.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RT2005/AtticWall.mo" 2022-03-10 09:57:39.664144338 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RT2005/AtticWall.mo" 2022-03-10 09:58:26.500150271 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.WallData.IndividualHousing.RT2005; +within BuildSysPro.BuildingStock.Utilities.Records.WallData.IndividualHousing.RT2005; record AtticWall = BuildSysPro.Utilities.Icons.Ceiling ( n=2, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RT2005/Door.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RT2005/Door.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RT2005/Door.mo" 2022-03-10 09:57:39.664144338 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RT2005/Door.mo" 2022-03-10 09:58:26.496150271 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.WallData.IndividualHousing.RT2005; +within BuildSysPro.BuildingStock.Utilities.Records.WallData.IndividualHousing.RT2005; record Door = BuildSysPro.Utilities.Icons.Door ( n=1, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RT2005/ExtWall.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RT2005/ExtWall.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RT2005/ExtWall.mo" 2022-03-10 09:57:39.664144338 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RT2005/ExtWall.mo" 2022-03-10 09:58:26.488150269 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.WallData.IndividualHousing.RT2005; +within BuildSysPro.BuildingStock.Utilities.Records.WallData.IndividualHousing.RT2005; record ExtWall = BuildSysPro.Utilities.Icons.ExtWall ( n=3, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RT2005/Floor.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RT2005/Floor.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RT2005/Floor.mo" 2022-03-10 09:57:39.664144338 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RT2005/Floor.mo" 2022-03-10 09:58:26.480150268 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.WallData.IndividualHousing.RT2005; +within BuildSysPro.BuildingStock.Utilities.Records.WallData.IndividualHousing.RT2005; record Floor = BuildSysPro.Utilities.Icons.Floor ( n=3, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RT2005/package.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RT2005/package.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RT2005/package.mo" 2022-03-10 09:57:39.664144338 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RT2005/package.mo" 2022-03-10 09:58:26.508150271 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.WallData.IndividualHousing; +within BuildSysPro.BuildingStock.Utilities.Records.WallData.IndividualHousing; package RT2005 "Wall data for Mozart individual housing : Ubat = 0.3 W/m²/K" annotation (Documentation(info=" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RT2012_MTD/AtticWall.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RT2012_MTD/AtticWall.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RT2012_MTD/AtticWall.mo" 2022-03-10 09:57:39.664144338 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RT2012_MTD/AtticWall.mo" 2022-03-10 09:58:26.468150267 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.WallData.IndividualHousing.RT2012_MTD; +within BuildSysPro.BuildingStock.Utilities.Records.WallData.IndividualHousing.RT2012_MTD; record AtticWall = BuildSysPro.Utilities.Icons.Ceiling ( n=2, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RT2012_MTD/Door.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RT2012_MTD/Door.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RT2012_MTD/Door.mo" 2022-03-10 09:57:39.664144338 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RT2012_MTD/Door.mo" 2022-03-10 09:58:26.460150266 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.WallData.IndividualHousing.RT2012_MTD; +within BuildSysPro.BuildingStock.Utilities.Records.WallData.IndividualHousing.RT2012_MTD; record Door = BuildSysPro.Utilities.Icons.Door ( n=1, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RT2012_MTD/ExtWall.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RT2012_MTD/ExtWall.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RT2012_MTD/ExtWall.mo" 2022-03-10 09:57:39.664144338 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RT2012_MTD/ExtWall.mo" 2022-03-10 09:58:26.452150266 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.WallData.IndividualHousing.RT2012_MTD; +within BuildSysPro.BuildingStock.Utilities.Records.WallData.IndividualHousing.RT2012_MTD; record ExtWall = BuildSysPro.Utilities.Icons.ExtWall ( n=3, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RT2012_MTD/Floor.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RT2012_MTD/Floor.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RT2012_MTD/Floor.mo" 2022-03-10 09:57:39.664144338 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RT2012_MTD/Floor.mo" 2022-03-10 09:58:26.440150264 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.WallData.IndividualHousing.RT2012_MTD; +within BuildSysPro.BuildingStock.Utilities.Records.WallData.IndividualHousing.RT2012_MTD; record Floor = BuildSysPro.Utilities.Icons.Floor ( n=4, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RT2012_STD/AtticWall.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RT2012_STD/AtticWall.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RT2012_STD/AtticWall.mo" 2022-03-10 09:57:39.664144338 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RT2012_STD/AtticWall.mo" 2022-03-10 09:58:26.428150262 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.WallData.IndividualHousing.RT2012_STD; +within BuildSysPro.BuildingStock.Utilities.Records.WallData.IndividualHousing.RT2012_STD; record AtticWall = BuildSysPro.Utilities.Icons.Ceiling ( n=2, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RT2012_STD/Door.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RT2012_STD/Door.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RT2012_STD/Door.mo" 2022-03-10 09:57:39.664144338 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RT2012_STD/Door.mo" 2022-03-10 09:58:26.420150260 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.WallData.IndividualHousing.RT2012_STD; +within BuildSysPro.BuildingStock.Utilities.Records.WallData.IndividualHousing.RT2012_STD; record Door = BuildSysPro.Utilities.Icons.Door ( n=1, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RT2012_STD/ExtWall.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RT2012_STD/ExtWall.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RT2012_STD/ExtWall.mo" 2022-03-10 09:57:39.664144338 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RT2012_STD/ExtWall.mo" 2022-03-10 09:58:26.416150261 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.WallData.IndividualHousing.RT2012_STD; +within BuildSysPro.BuildingStock.Utilities.Records.WallData.IndividualHousing.RT2012_STD; record ExtWall = BuildSysPro.Utilities.Icons.ExtWall ( n=3, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RT2012_STD/Floor.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RT2012_STD/Floor.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RT2012_STD/Floor.mo" 2022-03-10 09:57:39.664144338 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RT2012_STD/Floor.mo" 2022-03-10 09:58:26.408150260 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.WallData.IndividualHousing.RT2012_STD; +within BuildSysPro.BuildingStock.Utilities.Records.WallData.IndividualHousing.RT2012_STD; record Floor = BuildSysPro.Utilities.Icons.Floor ( n=4, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RTExisting_Reno/AtticWall.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RTExisting_Reno/AtticWall.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RTExisting_Reno/AtticWall.mo" 2022-03-10 09:57:39.664144338 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RTExisting_Reno/AtticWall.mo" 2022-03-10 09:58:26.392150257 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.WallData.IndividualHousing.RTExisting_Reno; +within BuildSysPro.BuildingStock.Utilities.Records.WallData.IndividualHousing.RTExisting_Reno; record AtticWall = BuildSysPro.Utilities.Icons.Ceiling ( n=2, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RTExisting_Reno/ExtWall.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RTExisting_Reno/ExtWall.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RTExisting_Reno/ExtWall.mo" 2022-03-10 09:57:39.664144338 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RTExisting_Reno/ExtWall.mo" 2022-03-10 09:58:26.348150251 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.WallData.IndividualHousing.RTExisting_Reno; +within BuildSysPro.BuildingStock.Utilities.Records.WallData.IndividualHousing.RTExisting_Reno; record ExtWall = BuildSysPro.Utilities.Icons.ExtWall ( n=3, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RTExisting_Reno/Floor.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RTExisting_Reno/Floor.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RTExisting_Reno/Floor.mo" 2022-03-10 09:57:39.664144338 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/Records/WallData/IndividualHousing/RTExisting_Reno/Floor.mo" 2022-03-10 09:58:26.340150251 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock.Utilities.Records.WallData.IndividualHousing.RTExisting_Reno; +within BuildSysPro.BuildingStock.Utilities.Records.WallData.IndividualHousing.RTExisting_Reno; record Floor = BuildSysPro.Utilities.Icons.Floor ( n=2, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/package.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/package.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/package.mo" 2022-03-10 09:57:39.664144338 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/BuildingStock/Utilities/package.mo" 2022-03-10 09:58:28.828150566 +0000 @@ -1,4 +1,4 @@ -within BuildSysPro.BuildingStock; +within BuildSysPro.BuildingStock; package Utilities "Contient les records et fonctions utilisés dans les modèles de bâtiments types" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Airflow/Multizone/BaseClasses/DoorDiscretized.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Airflow/Multizone/BaseClasses/DoorDiscretized.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Airflow/Multizone/BaseClasses/DoorDiscretized.mo" 2022-03-10 09:57:39.664144338 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Airflow/Multizone/BaseClasses/DoorDiscretized.mo" 2022-03-10 09:58:26.296150246 +0000 @@ -5,27 +5,27 @@ parameter Integer nCom=10 "Number of compartments for the discretization"; - parameter Modelica.SIunits.PressureDifference dp_turbulent(min=0) = 0.01 + parameter Modelica.Units.SI.PressureDifference dp_turbulent(min=0) = 0.01 "Pressure difference where laminar and turbulent flow relation coincide. Recommended: 0.01"; parameter Real CD=0.65 "Discharge coefficient" annotation (Dialog(group="Orifice characteristics")); - 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,40 +35,38 @@ 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; - - for i in 1:nCom loop - // pressure drop in each compartment - pA[i] = port_a1.p + rho_a1_inflow*hAg[i]; - pB[i] = port_a2.p + rho_a2_inflow*hBg[i]; - dpAB[i] = pA[i] - pB[i]; - v[i] = dV_flow[i]/dA; - // assignment of net volume flows - gaiFlo[i] = IBPSA.Utilities.Math.Functions.smoothHeaviside(x= - dV_flow[i], delta=VZerCom_flow); - dVAB_flow[i] = dV_flow[i] * gaiFlo[i]; - dVBA_flow[i] = -dV_flow[i] * (1-gaiFlo[i]); - end for; - // add positive and negative flows + dA = A/nCom; + for i in 1:nCom loop +// pressure drop in each compartment + pA[i] = port_a1.p + rho_a1_inflow * hAg[i]; + pB[i] = port_a2.p + rho_a2_inflow * hBg[i]; + dpAB[i] = pA[i] - pB[i]; + v[i] = dV_flow[i] / dA; +// assignment of net volume flows + gaiFlo[i] = IBPSA.Utilities.Math.Functions.smoothHeaviside(x = dV_flow[i], delta = VZerCom_flow); + dVAB_flow[i] = dV_flow[i] * gaiFlo[i]; + dVBA_flow[i] = -dV_flow[i] * (1 - gaiFlo[i]); + end for; +// add positive and negative flows VAB_flow = sum(dVAB_flow); VBA_flow = sum(dVBA_flow); vTop = v[nCom]; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Airflow/Multizone/BaseClasses/Examples/PowerLaw.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Airflow/Multizone/BaseClasses/Examples/PowerLaw.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Airflow/Multizone/BaseClasses/Examples/PowerLaw.mo" 2022-03-10 09:57:39.664144338 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Airflow/Multizone/BaseClasses/Examples/PowerLaw.mo" 2022-03-10 09:58:26.264150242 +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 = IBPSA.Airflow.Multizone.BaseClasses.powerLaw( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Airflow/Multizone/BaseClasses/Examples/PowerLawFixedM.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Airflow/Multizone/BaseClasses/Examples/PowerLawFixedM.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Airflow/Multizone/BaseClasses/Examples/PowerLawFixedM.mo" 2022-03-10 09:57:39.664144338 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Airflow/Multizone/BaseClasses/Examples/PowerLawFixedM.mo" 2022-03-10 09:58:26.252150239 +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/BuildSysPro 3.5.0/IBPSA/Airflow/Multizone/BaseClasses/Examples/WindPressureLowRise.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Airflow/Multizone/BaseClasses/Examples/WindPressureLowRise.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Airflow/Multizone/BaseClasses/Examples/WindPressureLowRise.mo" 2022-03-10 09:57:39.664144338 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Airflow/Multizone/BaseClasses/Examples/WindPressureLowRise.mo" 2022-03-10 09:58:26.244150239 +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/BuildSysPro 3.5.0/IBPSA/Airflow/Multizone/BaseClasses/PowerLawResistance.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Airflow/Multizone/BaseClasses/PowerLawResistance.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Airflow/Multizone/BaseClasses/PowerLawResistance.mo" 2022-03-10 09:57:39.664144338 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Airflow/Multizone/BaseClasses/PowerLawResistance.mo" 2022-03-10 09:58:26.232150238 +0000 @@ -10,17 +10,17 @@ parameter Boolean useDefaultProperties=true "Set to false to use density and viscosity based on actual medium state, rather than using default values" annotation(Evaluate=true, Dialog(tab="Advanced")); - parameter Modelica.SIunits.PressureDifference dp_turbulent(min=0, displayUnit="Pa") = 0.1 + parameter Modelica.Units.SI.PressureDifference dp_turbulent(min=0, displayUnit="Pa") = 0.1 "Pressure difference where laminar and turbulent flow relation coincide. Recommended = 0.1" annotation(Dialog(tab="Advanced")); parameter Boolean homotopyInitialization = true "= true, use homotopy method" annotation(Evaluate=true, Dialog(tab="Advanced")); - Modelica.SIunits.VolumeFlowRate V_flow + Modelica.Units.SI.VolumeFlowRate V_flow "Volume flow rate through the component"; - Modelica.SIunits.Velocity v(nominal=1) "Average velocity"; - Modelica.SIunits.Density rho "Fluid density at port_a"; + Modelica.Units.SI.Velocity v(nominal=1) "Average velocity"; + Modelica.Units.SI.Density rho "Fluid density at port_a"; protected constant Real gamma(min=1) = 1.5 @@ -33,9 +33,9 @@ p=Medium.p_default, X=Medium.X_default) "State of the medium at the medium default properties"; - parameter Modelica.SIunits.Density rho_default=Medium.density(sta_default) + parameter Modelica.Units.SI.Density rho_default=Medium.density(sta_default) "Density at the medium default properties"; - parameter Modelica.SIunits.DynamicViscosity dynVis_default= + parameter Modelica.Units.SI.DynamicViscosity dynVis_default= Medium.dynamicViscosity(sta_default) "Dynamic viscosity at the medium default properties"; @@ -49,7 +49,7 @@ "Polynomial coefficient for regularized implementation of flow resistance"; Medium.ThermodynamicState sta "State of the medium in the component"; - Modelica.SIunits.DynamicViscosity dynVis "Dynamic viscosity"; + Modelica.Units.SI.DynamicViscosity dynVis "Dynamic viscosity"; Real mExc(quantity="Mass", final unit="kg") "Air mass exchanged (for purpose of error control only)"; initial equation @@ -91,16 +91,13 @@ d=d, dp_turbulent=dp_turbulent); - port_a.m_flow = rho*V_flow; - - // Isenthalpic state transformation (no storage and no loss of energy) + port_a.m_flow = rho*V_flow; +// Isenthalpic state transformation (no storage and no loss of energy) port_a.h_outflow = inStream(port_b.h_outflow); - port_b.h_outflow = inStream(port_a.h_outflow); - - // Mass balance (no storage) - port_a.m_flow + port_b.m_flow = 0; - - // Transport of substances + port_b.h_outflow = inStream(port_a.h_outflow); +// Mass balance (no storage) + port_a.m_flow + port_b.m_flow = 0; +// Transport of substances port_a.Xi_outflow = inStream(port_b.Xi_outflow); port_b.Xi_outflow = inStream(port_a.Xi_outflow); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Airflow/Multizone/BaseClasses/TwoWayFlowElement.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Airflow/Multizone/BaseClasses/TwoWayFlowElement.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Airflow/Multizone/BaseClasses/TwoWayFlowElement.mo" 2022-03-10 09:57:39.664144338 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Airflow/Multizone/BaseClasses/TwoWayFlowElement.mo" 2022-03-10 09:58:26.216150235 +0000 @@ -13,59 +13,58 @@ Modelica.Media.Interfaces.PartialMedium annotation (choicesAllMatching=true); - 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] "Mass fraction of medium that flows in at port a1"; Medium.MassFraction Xi_a2_inflow[Medium2.nXi] "Mass fraction of medium that flows in at port a2"; -equation - // enforcing error control on both direction rather than on the sum only - // gives higher robustness. The reason may be that for bi-directional flow, - // (VAB_flow - VBA_flow) may be close to zero. - if forceErrorControlOnFlow then - der(mExcAB) = mAB_flow; - der(mExcBA) = mBA_flow; - else - der(mExcAB) = 0; - der(mExcBA) = 0; - end if; - - // Compute the density of the inflowing media. - // Note that Modelica.Media.Air.SimpleAir does not contain moisture, - // and hence we check for Medium?.nXi == 0. - // We first compute temperature and then invoke a density function that - // takes temperature as an argument. Simply calling a density function - // of a medium that takes enthalpy as an argument would be dangerous - // as different media can have different datum for the enthalpy. +equation +// enforcing error control on both direction rather than on the sum only +// gives higher robustness. The reason may be that for bi-directional flow, +// (VAB_flow - VBA_flow) may be close to zero. + if forceErrorControlOnFlow then + der(mExcAB) = mAB_flow; + der(mExcBA) = mBA_flow; + else + der(mExcAB) = 0; + der(mExcBA) = 0; + end if; +// Compute the density of the inflowing media. +// Note that Modelica.Media.Air.SimpleAir does not contain moisture, +// and hence we check for Medium?.nXi == 0. +// We first compute temperature and then invoke a density function that +// takes temperature as an argument. Simply calling a density function +// of a medium that takes enthalpy as an argument would be dangerous +// as different media can have different datum for the enthalpy. Xi_a1_inflow = inStream(port_a1.Xi_outflow); rho_a1_inflow = IBPSA.Utilities.Psychrometrics.Functions.density_pTX( p=port_a1.p, @@ -80,30 +79,27 @@ VZer_flow = vZer*A; mAB_flow = rho_a1_inflow*VAB_flow; - mBA_flow = rho_a2_inflow*VBA_flow; - // Average velocity (using the whole orifice area) - vAB = VAB_flow/A; + mBA_flow = rho_a2_inflow*VBA_flow; +// Average velocity (using the whole orifice area) + vAB = VAB_flow / A; vBA = VBA_flow/A; port_a1.m_flow = mAB_flow; - port_a2.m_flow = mBA_flow; - - // Energy balance (no storage, no heat loss/gain) + port_a2.m_flow = mBA_flow; +// Energy balance (no storage, no heat loss/gain) port_a1.h_outflow = inStream(port_b1.h_outflow); port_b1.h_outflow = inStream(port_a1.h_outflow); port_a2.h_outflow = inStream(port_b2.h_outflow); - port_b2.h_outflow = inStream(port_a2.h_outflow); - - // Mass balance (no storage) + port_b2.h_outflow = inStream(port_a2.h_outflow); +// Mass balance (no storage) port_a1.m_flow = -port_b1.m_flow; port_a2.m_flow = -port_b2.m_flow; port_a1.Xi_outflow = inStream(port_b1.Xi_outflow); port_b1.Xi_outflow = inStream(port_a1.Xi_outflow); port_a2.Xi_outflow = inStream(port_b2.Xi_outflow); - port_b2.Xi_outflow = inStream(port_a2.Xi_outflow); - - // Transport of trace substances + port_b2.Xi_outflow = inStream(port_a2.Xi_outflow); +// Transport of trace substances port_a1.C_outflow = inStream(port_b1.C_outflow); port_b1.C_outflow = inStream(port_a1.C_outflow); port_a2.C_outflow = inStream(port_b2.C_outflow); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Airflow/Multizone/BaseClasses/TwoWayFlowElementBuoyancy.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Airflow/Multizone/BaseClasses/TwoWayFlowElementBuoyancy.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Airflow/Multizone/BaseClasses/TwoWayFlowElementBuoyancy.mo" 2022-03-10 09:57:39.664144338 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Airflow/Multizone/BaseClasses/TwoWayFlowElementBuoyancy.mo" 2022-03-10 09:58:26.192150231 +0000 @@ -3,18 +3,18 @@ "Flow resistance that uses the power law" extends IBPSA.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/BuildSysPro 3.5.0/IBPSA/Airflow/Multizone/BaseClasses/ZonalFlow.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Airflow/Multizone/BaseClasses/ZonalFlow.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Airflow/Multizone/BaseClasses/ZonalFlow.mo" 2022-03-10 09:57:39.664144338 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Airflow/Multizone/BaseClasses/ZonalFlow.mo" 2022-03-10 09:58:26.180150231 +0000 @@ -12,23 +12,21 @@ Modelica.Media.Interfaces.PartialMedium annotation (choicesAllMatching = true); -equation - // Energy balance (no storage, no heat loss/gain) +equation +// Energy balance (no storage, no heat loss/gain) port_a1.h_outflow = inStream(port_b1.h_outflow); port_b1.h_outflow = inStream(port_a1.h_outflow); port_a2.h_outflow = inStream(port_b2.h_outflow); - port_b2.h_outflow = inStream(port_a2.h_outflow); - - // Mass balance (no storage) + port_b2.h_outflow = inStream(port_a2.h_outflow); +// Mass balance (no storage) port_a1.m_flow = -port_b1.m_flow; port_a2.m_flow = -port_b2.m_flow; port_a1.Xi_outflow = inStream(port_b1.Xi_outflow); port_b1.Xi_outflow = inStream(port_a1.Xi_outflow); port_a2.Xi_outflow = inStream(port_b2.Xi_outflow); - port_b2.Xi_outflow = inStream(port_a2.Xi_outflow); - - // Transport of trace substances + port_b2.Xi_outflow = inStream(port_a2.Xi_outflow); +// Transport of trace substances port_a1.C_outflow = inStream(port_b1.C_outflow); port_b1.C_outflow = inStream(port_a1.C_outflow); port_a2.C_outflow = inStream(port_b2.C_outflow); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Airflow/Multizone/BaseClasses/powerLaw.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Airflow/Multizone/BaseClasses/powerLaw.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Airflow/Multizone/BaseClasses/powerLaw.mo" 2022-03-10 09:57:39.664144338 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Airflow/Multizone/BaseClasses/powerLaw.mo" 2022-03-10 09:58:26.168150230 +0000 @@ -1,13 +1,13 @@ within BuildSysPro.IBPSA.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/BuildSysPro 3.5.0/IBPSA/Airflow/Multizone/BaseClasses/powerLawFixedM.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Airflow/Multizone/BaseClasses/powerLawFixedM.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Airflow/Multizone/BaseClasses/powerLawFixedM.mo" 2022-03-10 09:57:39.664144338 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Airflow/Multizone/BaseClasses/powerLawFixedM.mo" 2022-03-10 09:58:26.152150227 +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/BuildSysPro 3.5.0/IBPSA/Airflow/Multizone/BaseClasses/windPressureLowRise.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Airflow/Multizone/BaseClasses/windPressureLowRise.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Airflow/Multizone/BaseClasses/windPressureLowRise.mo" 2022-03-10 09:57:39.664144338 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Airflow/Multizone/BaseClasses/windPressureLowRise.mo" 2022-03-10 09:58:26.140150225 +0000 @@ -2,67 +2,53 @@ 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"; -algorithm - // Restrict incAng to [0...pi] - - // Change sign to positive - aR := if incAng < 0 then -incAng else incAng; - // Constrain to [0...2*pi] - if aR > pi2 then - aR := aR - integer(aR/pi2)*pi2; - end if; - // Constrain to [0...pi] - if aR > Modelica.Constants.pi then - aR := pi2-aR; - end if; - - // Evaluate eqn. 2-1 from FSEC-CR-163-86 - incAng2 :=aR/2; +algorithm +// Restrict incAng to [0...pi] +// Change sign to positive + aR := if incAng < 0 then -incAng else incAng; +// Constrain to [0...2*pi] + if aR > pi2 then + aR := aR - integer(aR / pi2) * pi2; + end if; +// Constrain to [0...pi] + if aR > Modelica.Constants.pi then + aR := pi2 - aR; + end if; +// Evaluate eqn. 2-1 from FSEC-CR-163-86 + incAng2 := aR / 2; sinA2 :=Modelica.Math.sin(incAng2); - cosA2 :=Modelica.Math.cos(incAng2); - // Implementation of the wind pressure coefficient that is once - // continuously differentiable for all incidence angles - if aR < aRDel then - Cp := Cp0*IBPSA.Utilities.Math.Functions.regStep( - y1=Modelica.Math.log(1.248 - 0.703*sinA2 - 1.175* - Modelica.Math.sin(aR)^2 + 0.131*Modelica.Math.sin(2*aR*G)^3 + 0.769 - *cosA2 + 0.071*G^2*sinA2^2 + 0.717*cosA2^2), - y2=1, - x=aR - aRDel2, - x_small=aRDel2); - elseif aR > aRMax then - Cp := Cp0*IBPSA.Utilities.Math.Functions.regStep( - y1=a180, - y2=Modelica.Math.log(1.248 - 0.703*sinA2 - 1.175* - Modelica.Math.sin(aR)^2 + 0.131*Modelica.Math.sin(2*aR*G)^3 + 0.769 - *cosA2 + 0.071*G^2*sinA2^2 + 0.717*cosA2^2), - x=aR + aRDel2 - Modelica.Constants.pi, - x_small=aRDel2); - else - Cp :=Cp0*Modelica.Math.log(1.248 - 0.703*sinA2 - 1.175*Modelica.Math.sin(aR)^2 + - 0.131*Modelica.Math.sin(2*aR*G)^3 + 0.769*cosA2 + 0.071*G^2*sinA2^2 + 0.717*cosA2^2); - end if; + cosA2 :=Modelica.Math.cos(incAng2); +// Implementation of the wind pressure coefficient that is once +// continuously differentiable for all incidence angles + if aR < aRDel then + Cp := Cp0 * IBPSA.Utilities.Math.Functions.regStep(y1 = Modelica.Math.log(1.248 - 0.703 * sinA2 - 1.175 * Modelica.Math.sin(aR) ^ 2 + 0.131 * Modelica.Math.sin(2 * aR * G) ^ 3 + 0.769 * cosA2 + 0.071 * G ^ 2 * sinA2 ^ 2 + 0.717 * cosA2 ^ 2), y2 = 1, x = aR - aRDel2, x_small = aRDel2); + elseif aR > aRMax then + Cp := Cp0 * IBPSA.Utilities.Math.Functions.regStep(y1 = a180, y2 = Modelica.Math.log(1.248 - 0.703 * sinA2 - 1.175 * Modelica.Math.sin(aR) ^ 2 + 0.131 * Modelica.Math.sin(2 * aR * G) ^ 3 + 0.769 * cosA2 + 0.071 * G ^ 2 * sinA2 ^ 2 + 0.717 * cosA2 ^ 2), x = aR + aRDel2 - Modelica.Constants.pi, x_small = aRDel2); + else + Cp := Cp0 * Modelica.Math.log(1.248 - 0.703 * sinA2 - 1.175 * Modelica.Math.sin(aR) ^ 2 + 0.131 * Modelica.Math.sin(2 * aR * G) ^ 3 + 0.769 * cosA2 + 0.071 * G ^ 2 * sinA2 ^ 2 + 0.717 * cosA2 ^ 2); + end if; + annotation ( smoothOrder=1, Documentation(info=" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Airflow/Multizone/DoorDiscretizedOpen.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Airflow/Multizone/DoorDiscretizedOpen.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Airflow/Multizone/DoorDiscretizedOpen.mo" 2022-03-10 09:57:39.664144338 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Airflow/Multizone/DoorDiscretizedOpen.mo" 2022-03-10 09:58:26.088150219 +0000 @@ -19,7 +19,7 @@ m=mFixed; A = wOpe*hOpe; kVal = CD*dA*sqrt(2/rho_default); - // orifice equation +// orifice equation for i in 1:nCom loop dV_flow[i] = IBPSA.Airflow.Multizone.BaseClasses.powerLawFixedM( k=kVal, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Airflow/Multizone/DoorDiscretizedOperable.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Airflow/Multizone/DoorDiscretizedOperable.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Airflow/Multizone/DoorDiscretizedOperable.mo" 2022-03-10 09:57:39.664144338 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Airflow/Multizone/DoorDiscretizedOperable.mo" 2022-03-10 09:58:26.080150218 +0000 @@ -3,7 +3,7 @@ "Door model using discretization along height coordinate" extends IBPSA.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"; @@ -42,24 +42,17 @@ equation fraOpe =y; kClo = CDClo * AClo/nCom * sqrt(2/rho_default); - kOpe = CDOpe * AOpe/nCom * sqrt(2/rho_default); - - // flow exponent - m = fraOpe*mOpe + (1-fraOpe)*mClo; - // opening area - A = fraOpe*AOpe + (1-fraOpe)*AClo; - // friction coefficient for power law - kVal = fraOpe*kOpe + (1-fraOpe)*kClo; - - // orifice equation - for i in 1:nCom loop - dV_flow[i] = IBPSA.Airflow.Multizone.BaseClasses.powerLaw( - k=kVal, - dp=dpAB[i], - m=m, - dp_turbulent=dp_turbulent); + kOpe = CDOpe * AOpe/nCom * sqrt(2/rho_default); +// flow exponent + m = fraOpe * mOpe + (1 - fraOpe) * mClo; +// opening area + A = fraOpe * AOpe + (1 - fraOpe) * AClo; +// friction coefficient for power law + kVal = fraOpe * kOpe + (1 - fraOpe) * kClo; +// orifice equation + for i in 1:nCom loop + dV_flow[i] = IBPSA.Airflow.Multizone.BaseClasses.powerLaw(k = kVal, dp = dpAB[i], m = m, dp_turbulent = dp_turbulent); end for; - annotation (Icon(graphics={ Text( extent={{-118,34},{-98,16}}, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Airflow/Multizone/EffectiveAirLeakageArea.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Airflow/Multizone/EffectiveAirLeakageArea.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Airflow/Multizone/EffectiveAirLeakageArea.mo" 2022-03-10 09:57:39.664144338 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Airflow/Multizone/EffectiveAirLeakageArea.mo" 2022-03-10 09:58:26.068150217 +0000 @@ -3,7 +3,7 @@ extends IBPSA.Airflow.Multizone.BaseClasses.PowerLawResistance(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")); @@ -12,8 +12,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/BuildSysPro 3.5.0/IBPSA/Airflow/Multizone/Examples/ClosedDoors.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Airflow/Multizone/Examples/ClosedDoors.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Airflow/Multizone/Examples/ClosedDoors.mo" 2022-03-10 09:57:39.664144338 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Airflow/Multizone/Examples/ClosedDoors.mo" 2022-03-10 09:58:25.988150206 +0000 @@ -27,7 +27,7 @@ annotation (Placement(transformation(extent={{40,40},{60,60}}))); Modelica.Thermal.HeatTransfer.Sources.PrescribedHeatFlow PrescribedHeatFlow1 annotation (Placement(transformation(extent={{4,40},{24,60}}))); - Modelica.Blocks.Sources.Sine Sine1(freqHz=1/3600) annotation (Placement( + Modelica.Blocks.Sources.Sine Sine1(f =1/3600) annotation (Placement( transformation(extent={{-68,40},{-48,60}}))); Modelica.Blocks.Math.Gain Gain1(k=100) annotation (Placement(transformation( extent={{-28,40},{-8,60}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Airflow/Multizone/Examples/OneEffectiveAirLeakageArea.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Airflow/Multizone/Examples/OneEffectiveAirLeakageArea.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Airflow/Multizone/Examples/OneEffectiveAirLeakageArea.mo" 2022-03-10 09:57:39.664144338 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Airflow/Multizone/Examples/OneEffectiveAirLeakageArea.mo" 2022-03-10 09:58:25.944150200 +0000 @@ -21,7 +21,7 @@ annotation (Placement(transformation(extent={{70,20},{90,40}}))); Modelica.Thermal.HeatTransfer.Sources.PrescribedHeatFlow preHeaFlo annotation (Placement(transformation(extent={{0,20},{20,40}}))); - Modelica.Blocks.Sources.Sine Sine1(freqHz=1/3600) annotation (Placement( + Modelica.Blocks.Sources.Sine Sine1(f =1/3600) annotation (Placement( transformation(extent={{-80,20},{-60,40}}))); Modelica.Blocks.Math.Gain Gain1(k=100) annotation (Placement(transformation( extent={{-40,20},{-20,40}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Airflow/Multizone/Examples/OneOpenDoor.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Airflow/Multizone/Examples/OneOpenDoor.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Airflow/Multizone/Examples/OneOpenDoor.mo" 2022-03-10 09:57:39.664144338 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Airflow/Multizone/Examples/OneOpenDoor.mo" 2022-03-10 09:58:25.928150199 +0000 @@ -26,7 +26,7 @@ annotation (Placement(transformation(extent={{60,60},{80,80}}))); Modelica.Thermal.HeatTransfer.Sources.PrescribedHeatFlow preHeaFlo annotation (Placement(transformation(extent={{14,60},{34,80}}))); - Modelica.Blocks.Sources.Sine heaSou(freqHz=1/3600) annotation (Placement( + Modelica.Blocks.Sources.Sine heaSou(f =1/3600) annotation (Placement( transformation(extent={{-60,60},{-40,80}}))); Modelica.Blocks.Math.Gain Gain1(k=100) annotation (Placement(transformation( extent={{-20,60},{0,80}}))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Airflow/Multizone/Examples/ZonalFlow.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Airflow/Multizone/Examples/ZonalFlow.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Airflow/Multizone/Examples/ZonalFlow.mo" 2022-03-10 09:57:39.664144338 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Airflow/Multizone/Examples/ZonalFlow.mo" 2022-03-10 09:58:25.764150178 +0000 @@ -2,8 +2,8 @@ model ZonalFlow "Model with prescribed air exchange between two volumes" extends Modelica.Icons.Example; package Medium = IBPSA.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"; IBPSA.Fluid.MixingVolumes.MixingVolume rooA( V=volA, redeclare package Medium = Medium, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Airflow/Multizone/MediumColumn.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Airflow/Multizone/MediumColumn.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Airflow/Multizone/MediumColumn.mo" 2022-03-10 09:57:39.664144338 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Airflow/Multizone/MediumColumn.mo" 2022-03-10 09:58:25.752150177 +0000 @@ -5,7 +5,7 @@ replaceable package Medium = Modelica.Media.Interfaces.PartialMedium "Medium in the component" annotation (choicesAllMatching=true); - parameter Modelica.SIunits.Length h(min=0) = 3 "Height of shaft"; + parameter Modelica.Units.SI.Length h(min=0) = 3 "Height of shaft"; parameter IBPSA.Airflow.Multizone.Types.densitySelection densitySelection "Select how to pick density" annotation (Evaluate=true); @@ -21,13 +21,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, @@ -35,67 +35,45 @@ actualStream(port_a.Xi_outflow)) "Medium properties in port_a"; Medium.MassFraction Xi[Medium.nXi] "Mass fraction used to compute density"; initial equation - // The next assert tests for all allowed values of the enumeration. - // Testing against densitySelection > 0 gives an error in OpenModelica as enumerations start with 1. +// The next assert tests for all allowed values of the enumeration. +// Testing against densitySelection > 0 gives an error in OpenModelica as enumerations start with 1. assert(densitySelection == IBPSA.Airflow.Multizone.Types.densitySelection.fromTop or densitySelection == IBPSA.Airflow.Multizone.Types.densitySelection.fromBottom or densitySelection == IBPSA.Airflow.Multizone.Types.densitySelection.actual, "You need to set the parameter \"densitySelection\" for the model MediumColumn."); -equation - // Design direction of mass flow rate - m_flow = port_a.m_flow; - - // Pressure difference between ports - // Xi is computed first as it is used in two expression, and in one - // of them only one component is used. - // We test for Medium.nXi == 0 as Modelica.Media.Air.SimpleAir has no - // moisture and hence Xi[1] is an illegal statement. - // We first compute temperature and then invoke a density function that - // takes temperature as an argument. Simply calling a density function - // of a medium that takes enthalpy as an argument would be dangerous - // as different media can have different datum for the enthalpy. - if (densitySelection == IBPSA.Airflow.Multizone.Types.densitySelection.fromTop) then - Xi = inStream(port_a.Xi_outflow); - rho = IBPSA.Utilities.Psychrometrics.Functions.density_pTX( - p=Medium.p_default, - T=Medium.temperature(Medium.setState_phX( - port_a.p, - inStream(port_a.h_outflow), - Xi)), - X_w=if Medium.nXi == 0 then 0 else Xi[1]); - elseif (densitySelection == IBPSA.Airflow.Multizone.Types.densitySelection.fromBottom) then - Xi = inStream(port_b.Xi_outflow); - rho = IBPSA.Utilities.Psychrometrics.Functions.density_pTX( - p=Medium.p_default, - T=Medium.temperature(Medium.setState_phX( - port_b.p, - inStream(port_b.h_outflow), - Xi)), - X_w=if Medium.nXi == 0 then 0 else Xi[1]); - else - Xi = actualStream(port_a.Xi_outflow); - rho = IBPSA.Utilities.Psychrometrics.Functions.density_pTX( - p=Medium.p_default, - T=Medium.temperature(Medium.setState_phX( - port_a.p, - actualStream(port_a.h_outflow), - Xi)), - X_w=if Medium.nXi == 0 then 0 else Xi[1]); +equation +// Design direction of mass flow rate + m_flow = port_a.m_flow; +// Pressure difference between ports +// Xi is computed first as it is used in two expression, and in one +// of them only one component is used. +// We test for Medium.nXi == 0 as Modelica.Media.Air.SimpleAir has no +// moisture and hence Xi[1] is an illegal statement. +// We first compute temperature and then invoke a density function that +// takes temperature as an argument. Simply calling a density function +// of a medium that takes enthalpy as an argument would be dangerous +// as different media can have different datum for the enthalpy. + if densitySelection == IBPSA.Airflow.Multizone.Types.densitySelection.fromTop then + Xi = inStream(port_a.Xi_outflow); + rho = IBPSA.Utilities.Psychrometrics.Functions.density_pTX(p = Medium.p_default, T = Medium.temperature(Medium.setState_phX(port_a.p, inStream(port_a.h_outflow), Xi)), X_w = if Medium.nXi == 0 then 0 else Xi[1]); + elseif densitySelection == IBPSA.Airflow.Multizone.Types.densitySelection.fromBottom then + Xi = inStream(port_b.Xi_outflow); + rho = IBPSA.Utilities.Psychrometrics.Functions.density_pTX(p = Medium.p_default, T = Medium.temperature(Medium.setState_phX(port_b.p, inStream(port_b.h_outflow), Xi)), X_w = if Medium.nXi == 0 then 0 else Xi[1]); + else + Xi = actualStream(port_a.Xi_outflow); + rho = IBPSA.Utilities.Psychrometrics.Functions.density_pTX(p = Medium.p_default, T = Medium.temperature(Medium.setState_phX(port_a.p, actualStream(port_a.h_outflow), Xi)), X_w = if Medium.nXi == 0 then 0 else Xi[1]); end if; V_flow = m_flow/Medium.density(sta_a); dp = port_a.p - port_b.p; - dp = -h*rho*Modelica.Constants.g_n; - - // Isenthalpic state transformation (no storage and no loss of energy) + dp = -h*rho*Modelica.Constants.g_n; +// Isenthalpic state transformation (no storage and no loss of energy) port_a.h_outflow = inStream(port_b.h_outflow); - port_b.h_outflow = inStream(port_a.h_outflow); - - // Mass balance (no storage) - port_a.m_flow + port_b.m_flow = 0; - - // Transport of substances + port_b.h_outflow = inStream(port_a.h_outflow); +// Mass balance (no storage) + port_a.m_flow + port_b.m_flow = 0; +// Transport of substances port_a.Xi_outflow = inStream(port_b.Xi_outflow); port_b.Xi_outflow = inStream(port_a.Xi_outflow); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Airflow/Multizone/MediumColumnDynamic.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Airflow/Multizone/MediumColumnDynamic.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Airflow/Multizone/MediumColumnDynamic.mo" 2022-03-10 09:57:39.664144338 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Airflow/Multizone/MediumColumnDynamic.mo" 2022-03-10 09:58:25.732150174 +0000 @@ -6,9 +6,9 @@ replaceable package Medium = Modelica.Media.Interfaces.PartialMedium "Medium in the component" annotation (choicesAllMatching=true); - parameter Modelica.SIunits.Length h(min=0) = 3 "Height of shaft"; + parameter Modelica.Units.SI.Length h(min=0) = 3 "Height of shaft"; - parameter Modelica.SIunits.MassFlowRate m_flow_nominal(min=0) + parameter Modelica.Units.SI.MassFlowRate m_flow_nominal(min=0) "Nominal mass flow rate" annotation(Dialog(group = "Nominal condition, used only for steady-state model")); @@ -24,8 +24,8 @@ "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}}))); - // m_flow_nominal is not used by vol, since this component - // can only be configured as a dynamic model. +// m_flow_nominal is not used by vol, since this component + // can only be configured as a dynamic model. IBPSA.Fluid.MixingVolumes.MixingVolume vol( final nPorts=2, redeclare final package Medium = Medium, @@ -56,9 +56,9 @@ "Medium colum that connects to bottom port" annotation (Placement(transformation(extent={{-10,-60},{10,-40}}))); - parameter Modelica.SIunits.Volume V "Volume in medium shaft"; + parameter Modelica.Units.SI.Volume V "Volume in medium shaft"; - // Heat transfer through boundary +// Heat transfer through boundary parameter Boolean use_HeatTransfer = false "= true to use the HeatTransfer model" annotation (Dialog(tab="Assumptions", group="Heat transfer")); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Airflow/Multizone/Orifice.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Airflow/Multizone/Orifice.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Airflow/Multizone/Orifice.mo" 2022-03-10 09:57:39.664144338 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Airflow/Multizone/Orifice.mo" 2022-03-10 09:58:25.716150171 +0000 @@ -3,7 +3,7 @@ extends IBPSA.Airflow.Multizone.BaseClasses.PowerLawResistance(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/BuildSysPro 3.5.0/IBPSA/Airflow/Multizone/ZonalFlow_ACS.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Airflow/Multizone/ZonalFlow_ACS.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Airflow/Multizone/ZonalFlow_ACS.mo" 2022-03-10 09:57:39.664144338 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Airflow/Multizone/ZonalFlow_ACS.mo" 2022-03-10 09:58:25.644150163 +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= @@ -25,19 +25,18 @@ Medium1.setState_phX(port_a2.p, port_b2.h_outflow, port_b2.Xi_outflow) "Medium properties in port_a2"; -equation - when useDefaultProperties and initial() then - assert( abs(1-rho_default/((Medium.density(sta_a1_inflow) + Medium.density(sta_a2_inflow))/2)) < 0.2, - "Wrong density. Densities need to match."); -// The next three lines have been removed as they cause -// a compilation error in OpenModelica. -// + "\n Medium.density(sta_a1) = " + String(Medium.density(sta_a1_inflow)) -// + "\n Medium.density(sta_a2) = " + String(Medium.density(sta_a2_inflow)) -// + "\n rho_nominal = " + String(rho_default)); +equation + when useDefaultProperties and initial() then + assert(abs(1 - rho_default / ((Medium.density(sta_a1_inflow) + Medium.density(sta_a2_inflow)) / 2)) < 0.2, "Wrong density. Densities need to match."); +// The next three lines have been removed as they cause +// a compilation error in OpenModelica. +// + "\n Medium.density(sta_a1) = " + String(Medium.density(sta_a1_inflow)) +// + "\n Medium.density(sta_a2) = " + String(Medium.density(sta_a2_inflow)) +// + "\n rho_nominal = " + String(rho_default)); end when; V_flow = V * ACS; - m_flow / V_flow = if useDefaultProperties then rho_default else (Medium.density(sta_a1_inflow) + Medium.density(sta_a2_inflow))/2; - // assign variable in base class + m_flow / V_flow = if useDefaultProperties then rho_default else (Medium.density(sta_a1_inflow) + Medium.density(sta_a2_inflow))/2; +// assign variable in base class port_a1.m_flow = m_flow; port_a2.m_flow = m_flow; annotation (Icon(graphics={ diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/SkyTemperature/BlackBody.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/SkyTemperature/BlackBody.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/SkyTemperature/BlackBody.mo" 2022-03-10 09:57:39.664144338 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/SkyTemperature/BlackBody.mo" 2022-03-10 09:58:25.612150159 +0000 @@ -29,8 +29,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 == IBPSA.BoundaryConditions.Types.SkyTemperatureCalculation.TemperaturesAndSkyCover then diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/SolarGeometry/BaseClasses/Examples/SolarAzimuth.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/SolarGeometry/BaseClasses/Examples/SolarAzimuth.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/SolarGeometry/BaseClasses/Examples/SolarAzimuth.mo" 2022-03-10 09:57:39.668144337 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/SolarGeometry/BaseClasses/Examples/SolarAzimuth.mo" 2022-03-10 09:58:25.436150137 +0000 @@ -1,7 +1,7 @@ within BuildSysPro.IBPSA.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"; IBPSA.BoundaryConditions.SolarGeometry.BaseClasses.SolarHourAngle solHouAng "Solar hour angle" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/SolarGeometry/BaseClasses/Examples/WallSolarAzimuth.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/SolarGeometry/BaseClasses/Examples/WallSolarAzimuth.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/SolarGeometry/BaseClasses/Examples/WallSolarAzimuth.mo" 2022-03-10 09:57:39.668144337 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/SolarGeometry/BaseClasses/Examples/WallSolarAzimuth.mo" 2022-03-10 09:58:25.408150132 +0000 @@ -18,7 +18,7 @@ IBPSA.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/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/SolarGeometry/BaseClasses/IncidenceAngle.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/SolarGeometry/BaseClasses/IncidenceAngle.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/SolarGeometry/BaseClasses/IncidenceAngle.mo" 2022-03-10 09:57:39.668144337 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/SolarGeometry/BaseClasses/IncidenceAngle.mo" 2022-03-10 09:58:25.384150130 +0000 @@ -1,10 +1,10 @@ within BuildSysPro.IBPSA.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/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/SolarGeometry/BaseClasses/SolarAzimuth.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/SolarGeometry/BaseClasses/SolarAzimuth.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/SolarGeometry/BaseClasses/SolarAzimuth.mo" 2022-03-10 09:57:39.668144337 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/SolarGeometry/BaseClasses/SolarAzimuth.mo" 2022-03-10 09:58:25.376150128 +0000 @@ -1,7 +1,7 @@ within BuildSysPro.IBPSA.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"; @@ -33,23 +33,23 @@ arg = min(1.0, max(-1.0, tmp)); - solAziTem = Modelica.Math.acos(arg); // Solar azimuth (A4.9a and b) as a positive number + solAziTem = Modelica.Math.acos(arg); // Solar azimuth (A4.9a and b) as a positive number - if outsidePolarCircle then - // Outside the polar circle, the only non-differentiability is at night when the sun is set. - // Hence, we use noEvent. - if noEvent(solTim - integer(solTim/day)*day < 43200) then - solAzi =-solAziTem; - else - solAzi = solAziTem; + if outsidePolarCircle then +// Outside the polar circle, the only non-differentiability is at night when the sun is set. +// Hence, we use noEvent. + if noEvent(solTim - integer(solTim / day) * day < 43200) then + solAzi = -solAziTem; + else + solAzi = solAziTem; end if; - else - // Inside the polar circle, there is a jump at (solar-)midnight when the sun can - // be above the horizon. Hence, we do not use noEvent(...) - if solTim - integer(solTim/day)*day < 43200 then - solAzi =-solAziTem; - else - solAzi = solAziTem; + else +// Inside the polar circle, there is a jump at (solar-)midnight when the sun can +// be above the horizon. Hence, we do not use noEvent(...) + if solTim - integer(solTim / day) * day < 43200 then + solAzi = -solAziTem; + else + solAzi = solAziTem; end if; end if; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/SolarGeometry/BaseClasses/WallSolarAzimuth.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/SolarGeometry/BaseClasses/WallSolarAzimuth.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/SolarGeometry/BaseClasses/WallSolarAzimuth.mo" 2022-03-10 09:57:39.668144337 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/SolarGeometry/BaseClasses/WallSolarAzimuth.mo" 2022-03-10 09:58:25.356150126 +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"; @@ -34,9 +34,9 @@ u=ninety, deltaX=delta)); rat = Modelica.Math.cos(incAng)/alt_c; - // Due to the smoothLimit, rat can be about 1E-3 greater than 1 or smaller than -1. - // Hence, below we use another call to smoothLimit to ensure that the argument of - // acos(.) is inside the interval [-1, 1]. +// Due to the smoothLimit, rat can be about 1E-3 greater than 1 or smaller than -1. +// Hence, below we use another call to smoothLimit to ensure that the argument of +// acos(.) is inside the interval [-1, 1]. verAzi = Modelica.Math.acos( IBPSA.Utilities.Math.Functions.smoothLimit( x=rat, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/SolarGeometry/BaseClasses/ZenithAngle.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/SolarGeometry/BaseClasses/ZenithAngle.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/SolarGeometry/BaseClasses/ZenithAngle.mo" 2022-03-10 09:57:39.668144337 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/SolarGeometry/BaseClasses/ZenithAngle.mo" 2022-03-10 09:58:25.348150126 +0000 @@ -1,7 +1,7 @@ within BuildSysPro.IBPSA.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/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/SolarGeometry/IncidenceAngle.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/SolarGeometry/IncidenceAngle.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/SolarGeometry/IncidenceAngle.mo" 2022-03-10 09:57:39.668144337 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/SolarGeometry/IncidenceAngle.mo" 2022-03-10 09:58:25.268150114 +0000 @@ -1,9 +1,9 @@ within BuildSysPro.IBPSA.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/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/SolarGeometry/ZenithAngle.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/SolarGeometry/ZenithAngle.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/SolarGeometry/ZenithAngle.mo" 2022-03-10 09:57:39.668144337 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/SolarGeometry/ZenithAngle.mo" 2022-03-10 09:58:25.252150114 +0000 @@ -1,7 +1,7 @@ within BuildSysPro.IBPSA.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/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/SolarIrradiation/BaseClasses/DiffuseIsotropic.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/SolarIrradiation/BaseClasses/DiffuseIsotropic.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/SolarIrradiation/BaseClasses/DiffuseIsotropic.mo" 2022-03-10 09:57:39.668144337 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/SolarIrradiation/BaseClasses/DiffuseIsotropic.mo" 2022-03-10 09:58:25.208150108 +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/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/SolarIrradiation/BaseClasses/DiffusePerez.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/SolarIrradiation/BaseClasses/DiffusePerez.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/SolarIrradiation/BaseClasses/DiffusePerez.mo" 2022-03-10 09:57:39.668144337 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/SolarIrradiation/BaseClasses/DiffusePerez.mo" 2022-03-10 09:58:25.196150106 +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/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/SolarIrradiation/BaseClasses/PartialSolarIrradiation.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/SolarIrradiation/BaseClasses/PartialSolarIrradiation.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/SolarIrradiation/BaseClasses/PartialSolarIrradiation.mo" 2022-03-10 09:57:39.668144337 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/SolarIrradiation/BaseClasses/PartialSolarIrradiation.mo" 2022-03-10 09:58:25.084150091 +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/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/SolarIrradiation/BaseClasses/SkyClearness.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/SolarIrradiation/BaseClasses/SkyClearness.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/SolarIrradiation/BaseClasses/SkyClearness.mo" 2022-03-10 09:57:39.668144337 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/SolarIrradiation/BaseClasses/SkyClearness.mo" 2022-03-10 09:58:24.980150079 +0000 @@ -18,15 +18,15 @@ Modelica.Blocks.Interfaces.RealOutput skyCle "Sky clearness. skyCle=1: overast sky; skyCle=8: clear sky" annotation (Placement(transformation(extent={{100,-10},{120,10}}))); - // Set hSmall so that hSmall + deltaX < 1E-4. See info section. + // 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; @@ -34,10 +34,10 @@ x1=HDifHor, x2=hSmall, deltaX=deltaX); - // In the Buildings library, HGloHor is always larger than 1E-4 - // (minus some small undershoot due to regularization. Hence, - // it makes no sense to simplify the equation for - // HGloHor < Modelica.Constants.small. +// In the Buildings library, HGloHor is always larger than 1E-4 +// (minus some small undershoot due to regularization. Hence, +// it makes no sense to simplify the equation for +// HGloHor < Modelica.Constants.small. skyCle = IBPSA.Utilities.Math.Functions.smoothLimit( x=(HGloHor/HDifHorBou + tmp1)/(1 + tmp1), l=1, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/SolarIrradiation/DiffusePerez.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/SolarIrradiation/DiffusePerez.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/SolarIrradiation/DiffusePerez.mo" 2022-03-10 09:57:39.668144337 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/SolarIrradiation/DiffusePerez.mo" 2022-03-10 09:58:24.952150074 +0000 @@ -5,8 +5,8 @@ IBPSA.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/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/SolarIrradiation/DirectTiltedSurface.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/SolarIrradiation/DirectTiltedSurface.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/SolarIrradiation/DirectTiltedSurface.mo" 2022-03-10 09:57:39.668144337 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/SolarIrradiation/DirectTiltedSurface.mo" 2022-03-10 09:58:24.908150069 +0000 @@ -3,8 +3,8 @@ extends IBPSA.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/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/SolarIrradiation/Examples/DiffusePerez.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/SolarIrradiation/Examples/DiffusePerez.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/SolarIrradiation/Examples/DiffusePerez.mo" 2022-03-10 09:57:39.668144337 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/SolarIrradiation/Examples/DiffusePerez.mo" 2022-03-10 09:58:24.884150066 +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"; IBPSA.BoundaryConditions.WeatherData.ReaderTMY3 weaDat(filNam= Modelica.Utilities.Files.loadResource("modelica://BuildSysPro/Resources/IBPSA/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/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/SolarIrradiation/Examples/DirectTiltedSurface.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/SolarIrradiation/Examples/DirectTiltedSurface.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/SolarIrradiation/Examples/DirectTiltedSurface.mo" 2022-03-10 09:57:39.668144337 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/SolarIrradiation/Examples/DirectTiltedSurface.mo" 2022-03-10 09:58:24.864150063 +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"; IBPSA.BoundaryConditions.WeatherData.ReaderTMY3 weaDat(filNam= Modelica.Utilities.Files.loadResource("modelica://BuildSysPro/Resources/IBPSA/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/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/WeatherData/BaseClasses/CheckBlackBodySkyTemperature.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/WeatherData/BaseClasses/CheckBlackBodySkyTemperature.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/WeatherData/BaseClasses/CheckBlackBodySkyTemperature.mo" 2022-03-10 09:57:39.668144337 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/WeatherData/BaseClasses/CheckBlackBodySkyTemperature.mo" 2022-03-10 09:58:24.816150058 +0000 @@ -13,11 +13,11 @@ displayUnit="degC") "Black-body sky temperature" annotation (Placement(transformation(extent={{100,-10},{120,10}}))); - parameter Modelica.SIunits.Temperature TMin(displayUnit="degC") = 203.15 + + parameter Modelica.Units.SI.Temperature TMin(displayUnit="degC") = 203.15 "Minimum allowed temperature"; - parameter Modelica.SIunits.Temperature TMax(displayUnit="degC") = 343.15 + parameter Modelica.Units.SI.Temperature TMax(displayUnit="degC") = 343.15 "Maximum allowed temperature"; - equation TOut = TIn; assert(TOut > TMin, "Temperature out of bounds.\n" + " TOut = " + String( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/WeatherData/BaseClasses/CheckCeilingHeight.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/WeatherData/BaseClasses/CheckCeilingHeight.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/WeatherData/BaseClasses/CheckCeilingHeight.mo" 2022-03-10 09:57:39.668144337 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/WeatherData/BaseClasses/CheckCeilingHeight.mo" 2022-03-10 09:58:24.808150056 +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 = IBPSA.Utilities.Math.Functions.smoothMax( ceiHeiIn, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/WeatherData/BaseClasses/CheckIRRadiation.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/WeatherData/BaseClasses/CheckIRRadiation.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/WeatherData/BaseClasses/CheckIRRadiation.mo" 2022-03-10 09:57:39.668144337 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/WeatherData/BaseClasses/CheckIRRadiation.mo" 2022-03-10 09:58:24.796150054 +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 = IBPSA.Utilities.Math.Functions.smoothMax( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/WeatherData/BaseClasses/CheckPressure.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/WeatherData/BaseClasses/CheckPressure.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/WeatherData/BaseClasses/CheckPressure.mo" 2022-03-10 09:57:39.668144337 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/WeatherData/BaseClasses/CheckPressure.mo" 2022-03-10 09:58:24.788150054 +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 assert(PIn > PMin, "Pressure out of bounds.\n" + " PIn = " + String(PIn)); assert(PIn < PMax, "Pressure out of bounds.\n" + " PIn = " + String(PIn)); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/WeatherData/BaseClasses/CheckRadiation.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/WeatherData/BaseClasses/CheckRadiation.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/WeatherData/BaseClasses/CheckRadiation.mo" 2022-03-10 09:57:39.668144337 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/WeatherData/BaseClasses/CheckRadiation.mo" 2022-03-10 09:58:24.776150052 +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 = IBPSA.Utilities.Math.Functions.smoothMax( diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/WeatherData/BaseClasses/CheckTemperature.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/WeatherData/BaseClasses/CheckTemperature.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/WeatherData/BaseClasses/CheckTemperature.mo" 2022-03-10 09:57:39.668144337 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/WeatherData/BaseClasses/CheckTemperature.mo" 2022-03-10 09:58:24.696150043 +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/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/WeatherData/BaseClasses/CheckWindSpeed.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/WeatherData/BaseClasses/CheckWindSpeed.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/WeatherData/BaseClasses/CheckWindSpeed.mo" 2022-03-10 09:57:39.668144337 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/WeatherData/BaseClasses/CheckWindSpeed.mo" 2022-03-10 09:58:24.684150042 +0000 @@ -7,12 +7,12 @@ 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 - // Modelica Table will interpolate data when it reads the weather data file. - // It can generate negative values due to the interpolation. +// Modelica Table will interpolate data when it reads the weather data file. +// It can generate negative values due to the interpolation. winSpeOut = IBPSA.Utilities.Math.Functions.smoothMax( x1=winSpeIn, x2=winSpeMin, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/WeatherData/BaseClasses/ConvertRadiation.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/WeatherData/BaseClasses/ConvertRadiation.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/WeatherData/BaseClasses/ConvertRadiation.mo" 2022-03-10 09:57:39.668144337 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/WeatherData/BaseClasses/ConvertRadiation.mo" 2022-03-10 09:58:24.676150039 +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/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/WeatherData/BaseClasses/ConvertTime.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/WeatherData/BaseClasses/ConvertTime.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/WeatherData/BaseClasses/ConvertTime.mo" 2022-03-10 09:57:39.668144337 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/WeatherData/BaseClasses/ConvertTime.mo" 2022-03-10 09:58:24.660150038 +0000 @@ -12,9 +12,9 @@ annotation (Placement(transformation(extent={{100,-10},{120,10}}))); protected - constant Modelica.SIunits.Time year=31536000 "Number of seconds in a year"; - discrete Modelica.SIunits.Time tStart "Start time of period"; + constant Modelica.Units.SI.Time year=31536000 "Number of seconds in a year"; + discrete Modelica.Units.SI.Time tStart "Start time of period"; initial equation tStart = integer(modTim/year)*year; equation diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/WeatherData/BaseClasses/Examples/GetHeaderElement.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/WeatherData/BaseClasses/Examples/GetHeaderElement.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/WeatherData/BaseClasses/Examples/GetHeaderElement.mo" 2022-03-10 09:57:39.668144337 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/WeatherData/BaseClasses/Examples/GetHeaderElement.mo" 2022-03-10 09:58:24.476150015 +0000 @@ -1,11 +1,11 @@ within BuildSysPro.IBPSA.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://BuildSysPro/Resources/IBPSA/weatherdata/USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.mos") diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/WeatherData/BaseClasses/LocalCivilTime.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/WeatherData/BaseClasses/LocalCivilTime.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/WeatherData/BaseClasses/LocalCivilTime.mo" 2022-03-10 09:57:39.668144337 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/WeatherData/BaseClasses/LocalCivilTime.mo" 2022-03-10 09:58:24.460150012 +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/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/WeatherData/BaseClasses/getHeaderElementTMY3.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/WeatherData/BaseClasses/getHeaderElementTMY3.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/WeatherData/BaseClasses/getHeaderElementTMY3.mo" 2022-03-10 09:57:39.668144337 +0000 +++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/WeatherData/BaseClasses/getHeaderElementTMY3.mo" 2022-03-10 09:58:24.436150009 +0000 @@ -21,9 +21,9 @@ Boolean found "Flag, true if #LOCATION has been found"; Boolean EOF "Flag, true if EOF has been reached"; String fouDel "Found delimiter"; -algorithm - // Get line that starts with 'start' - iLin :=0; +algorithm +// Get line that starts with 'start' + iLin := 0; EOF :=false; while (not EOF) and (index == 0) loop iLin:=iLin + 1; @@ -36,9 +36,9 @@ caseSensitive=false); end while; assert(not EOF, "Error: Did not find '" + start + "' when scanning the weather file." - + "\n Check for correct weather file syntax."); - // Loop over the tokens until the position is reached - nexInd :=1; + + "\n Check for correct weather file syntax."); +// Loop over the tokens until the position is reached + nexInd := 1; for i in 1:position-1 loop nexInd :=Modelica.Utilities.Strings.find( string=lin, @@ -48,17 +48,14 @@ + "\n Check for correct file syntax." + "\n The scanned line is '" + lin + "'."); end for; - staInd := nexInd; - // Find the next delimiter - nexInd :=Modelica.Utilities.Strings.find( - string=lin, - searchString = ",", - startIndex=nexInd+1); + staInd := nexInd; +// Find the next delimiter + nexInd := Modelica.Utilities.Strings.find(string = lin, searchString = ",", startIndex = nexInd + 1); assert(nexInd > 0, "Error when scanning weather file. Not enough tokens to find " + name + "." + "\n Check for correct file syntax." + "\n The scanned line is '" + - lin + "'."); - // Get the element - element :=Modelica.Utilities.Strings.substring(lin, startIndex=staInd+1, endIndex=nexInd-1); + lin + "'."); +// Get the element + element := Modelica.Utilities.Strings.substring(lin, startIndex = staInd + 1, endIndex = nexInd - 1); annotation (Inline=false, Documentation(info=" This function scans the weather data file for a line that starts with the string 

diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/WeatherData/BaseClasses/getLatitudeTMY3.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/WeatherData/BaseClasses/getLatitudeTMY3.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/WeatherData/BaseClasses/getLatitudeTMY3.mo"	2022-03-10 09:57:39.668144337 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/WeatherData/BaseClasses/getLatitudeTMY3.mo"	2022-03-10 09:58:24.416150006 +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";
@@ -21,14 +21,11 @@
     startIndex=1,
     unsigned=false);
    assert(nexInd > 1, "Error when converting the latitude '" +
-                      element + "' from a String to a Real.");
-   // Convert from degree to rad
-   lat :=lat*Modelica.Constants.pi/180;
-   // Check if latitude is valid
-   assert(abs(lat) <= Modelica.Constants.pi+Modelica.Constants.eps,
-       "Wrong value for latitude. Received lat = " +
-       String(lat) + " (= " + String(lat*180/Modelica.Constants.pi) + " degrees).");
-
+                      element + "' from a String to a Real.");
+// Convert from degree to rad
+  lat := lat * Modelica.Constants.pi / 180;
+// Check if latitude is valid
+  assert(abs(lat) <= Modelica.Constants.pi + Modelica.Constants.eps, "Wrong value for latitude. Received lat = " + String(lat) + " (= " + String(lat * 180 / Modelica.Constants.pi) + " degrees).");
   annotation (Documentation(info="
 This function returns the latitude of the TMY3 weather data file.
 ", revisions="
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/WeatherData/BaseClasses/getLongitudeTMY3.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/WeatherData/BaseClasses/getLongitudeTMY3.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/WeatherData/BaseClasses/getLongitudeTMY3.mo"	2022-03-10 09:57:39.668144337 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/WeatherData/BaseClasses/getLongitudeTMY3.mo"	2022-03-10 09:58:24.408150006 +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";
@@ -21,14 +21,11 @@
     startIndex=1,
     unsigned=false);
    assert(nexInd > 1, "Error when converting the longitude '" +
-                      element + "' from a String to a Real.");
-   // Convert from degree to rad
-   lon :=lon*Modelica.Constants.pi/180;
-   // Check if longitude is valid
-   assert(abs(lon) < 2*Modelica.Constants.pi,
-       "Wrong value for longitude. Received lon = " +
-       String(lon) + " (= " + String(lon*180/Modelica.Constants.pi) + " degrees).");
-
+                      element + "' from a String to a Real.");
+// Convert from degree to rad
+  lon := lon * Modelica.Constants.pi / 180;
+// Check if longitude is valid
+  assert(abs(lon) < 2 * Modelica.Constants.pi, "Wrong value for longitude. Received lon = " + String(lon) + " (= " + String(lon * 180 / Modelica.Constants.pi) + " degrees).");
   annotation (Documentation(info="
 This function returns the longitude of the TMY3 weather data file.
 ", revisions="
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/WeatherData/BaseClasses/getTimeZoneTMY3.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/WeatherData/BaseClasses/getTimeZoneTMY3.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/WeatherData/BaseClasses/getTimeZoneTMY3.mo"	2022-03-10 09:57:39.668144337 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/WeatherData/BaseClasses/getTimeZoneTMY3.mo"	2022-03-10 09:58:24.404150005 +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";
@@ -23,7 +23,7 @@
    assert(nexInd > 1, "Error when converting the time zone '" +
                       element + "' from a String to a Real.");
    timZon :=timZon*3600;
-   // Check if time zone is valid
+// Check if time zone is valid
    assert(abs(timZon) < 24*3600,
        "Wrong value for time zone. Received timZon = " +
        String(timZon) + " (= " + String(timZon/3600) + " hours).");
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/WeatherData/ReaderTMY3.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/WeatherData/ReaderTMY3.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/WeatherData/ReaderTMY3.mo"	2022-03-10 09:57:39.668144337 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/WeatherData/ReaderTMY3.mo"	2022-03-10 09:58:24.380150003 +0000
@@ -4,12 +4,12 @@
   parameter Boolean computeWetBulbTemperature = true
     "If true, then this model computes the wet bulb temperature"
     annotation(Evaluate=true);
-  //--------------------------------------------------------------
-  // Atmospheric pressure
+  //--------------------------------------------------------------
+  // Atmospheric pressure
   parameter IBPSA.BoundaryConditions.Types.DataSource pAtmSou=IBPSA.BoundaryConditions.Types.DataSource.Parameter
     "Atmospheric pressure"
     annotation (Evaluate=true, Dialog(group="Data source"));
-  parameter Modelica.SIunits.Pressure pAtm=101325
+  parameter Modelica.Units.SI.Pressure pAtm=101325
     "Atmospheric pressure (used if pAtmSou=Parameter)"
     annotation (Dialog(group="Data source"));
   Modelica.Blocks.Interfaces.RealInput pAtm_in(
@@ -19,8 +19,8 @@
     "Input pressure"
     annotation (Placement(transformation(extent={{-240,254},{-200,294}}),
         iconTransformation(extent={{-240,254},{-200,294}})));
-  //--------------------------------------------------------------
-  // Ceiling height
+  //--------------------------------------------------------------
+  // Ceiling height
   parameter IBPSA.BoundaryConditions.Types.DataSource ceiHeiSou=IBPSA.BoundaryConditions.Types.DataSource.File
     "Ceiling height"
     annotation (Evaluate=true, Dialog(group="Data source"));
@@ -36,8 +36,8 @@
     "Input ceiling height"
     annotation (Placement(transformation(extent={{-242,-14},{-202,26}}),
         iconTransformation(extent={{-242,-14},{-202,26}})));
-  //--------------------------------------------------------------
-  // Total sky cover
+  //--------------------------------------------------------------
+  // Total sky cover
   parameter IBPSA.BoundaryConditions.Types.DataSource totSkyCovSou=IBPSA.BoundaryConditions.Types.DataSource.File
     "Total sky cover"
     annotation (Evaluate=true, Dialog(group="Data source"));
@@ -54,7 +54,7 @@
     "Input total sky cover"
     annotation (Placement(transformation(extent={{-240,-58},{-200,-18}}),
         iconTransformation(extent={{-240,-58},{-200,-18}})));
-  // Opaque sky cover
+  // Opaque sky cover
   parameter IBPSA.BoundaryConditions.Types.DataSource opaSkyCovSou=IBPSA.BoundaryConditions.Types.DataSource.File
     "Opaque sky cover"
     annotation (Evaluate=true, Dialog(group="Data source"));
@@ -71,12 +71,12 @@
     "Input opaque sky cover"
     annotation (Placement(transformation(extent={{-240,32},{-200,72}}),
         iconTransformation(extent={{-240,32},{-200,72}})));
-  //--------------------------------------------------------------
-  // Dry bulb temperature
+  //--------------------------------------------------------------
+  // Dry bulb temperature
   parameter IBPSA.BoundaryConditions.Types.DataSource TDryBulSou=IBPSA.BoundaryConditions.Types.DataSource.File
     "Dry bulb temperature"
     annotation (Evaluate=true, Dialog(group="Data source"));
-  parameter Modelica.SIunits.Temperature TDryBul(displayUnit="degC") = 293.15
+  parameter Modelica.Units.SI.Temperature TDryBul(displayUnit="degC") = 293.15
     "Dry bulb temperature (used if TDryBul=Parameter)"
     annotation (Dialog(group="Data source"));
   Modelica.Blocks.Interfaces.RealInput TDryBul_in(
@@ -86,12 +86,12 @@
     "Input dry bulb temperature"
     annotation (Placement(transformation(extent={{-240,160},{-200,200}})));
 
-  //--------------------------------------------------------------
-  // Dew point temperature
+//--------------------------------------------------------------
+  // Dew point temperature
   parameter IBPSA.BoundaryConditions.Types.DataSource TDewPoiSou=IBPSA.BoundaryConditions.Types.DataSource.File
     "Dew point temperature"
     annotation (Evaluate=true, Dialog(group="Data source"));
-  parameter Modelica.SIunits.Temperature TDewPoi(displayUnit="degC") = 283.15
+  parameter Modelica.Units.SI.Temperature TDewPoi(displayUnit="degC") = 283.15
     "Dew point temperature (used if TDewPoi=Parameter)"
     annotation (Dialog(group="Data source"));
   Modelica.Blocks.Interfaces.RealInput TDewPoi_in(
@@ -101,12 +101,12 @@
     "Input dew point temperature"
     annotation (Placement(transformation(extent={{-240,204},{-200,244}})));
 
-  //--------------------------------------------------------------
-  // Black body sky temperature
+//--------------------------------------------------------------
+  // Black body sky temperature
   parameter IBPSA.BoundaryConditions.Types.DataSource TBlaSkySou=IBPSA.BoundaryConditions.Types.DataSource.File
     "Black-body sky temperature"
     annotation (Evaluate=true, Dialog(group="Data source"));
-  parameter Modelica.SIunits.Temperature TBlaSky=273.15
+  parameter Modelica.Units.SI.Temperature TBlaSky=273.15
     "Black-body sky temperature (used if TBlaSkySou=Parameter)"
     annotation (Dialog(group="Data source"));
   Modelica.Blocks.Interfaces.RealInput TBlaSky_in(
@@ -116,8 +116,8 @@
     "Black-body sky temperature"
     annotation (Placement(transformation(extent={{-240,120},{-200,160}}),
         iconTransformation(extent={{-240,120},{-200,160}})));
-  //--------------------------------------------------------------
-  // Relative humidity
+  //--------------------------------------------------------------
+  // Relative humidity
   parameter IBPSA.BoundaryConditions.Types.DataSource relHumSou=IBPSA.BoundaryConditions.Types.DataSource.File
     "Relative humidity"
     annotation (Evaluate=true, Dialog(group="Data source"));
@@ -133,11 +133,11 @@
     "Input relative humidity"
     annotation (Placement(transformation(extent={{-240,80},{-200,120}}),
         iconTransformation(extent={{-240,80},{-200,120}})));
-  //--------------------------------------------------------------
-  // Wind speed
+  //--------------------------------------------------------------
+  // Wind speed
   parameter IBPSA.BoundaryConditions.Types.DataSource winSpeSou=IBPSA.BoundaryConditions.Types.DataSource.File
     "Wind speed" annotation (Evaluate=true, Dialog(group="Data source"));
-  parameter Modelica.SIunits.Velocity winSpe(min=0) = 1
+  parameter Modelica.Units.SI.Velocity winSpe(min=0) = 1
     "Wind speed (used if winSpe=Parameter)"
     annotation (Dialog(group="Data source"));
   Modelica.Blocks.Interfaces.RealInput winSpe_in(
@@ -147,12 +147,12 @@
     "Input wind speed"
     annotation (Placement(transformation(extent={{-240,-98},{-200,-58}}),
         iconTransformation(extent={{-240,-98},{-200,-58}})));
-  //--------------------------------------------------------------
-  // Wind direction
+  //--------------------------------------------------------------
+  // Wind direction
   parameter IBPSA.BoundaryConditions.Types.DataSource winDirSou=IBPSA.BoundaryConditions.Types.DataSource.File
     "Wind direction"
     annotation (Evaluate=true, Dialog(group="Data source"));
-  parameter Modelica.SIunits.Angle winDir=1.0
+  parameter Modelica.Units.SI.Angle winDir=1.0
     "Wind direction (used if winDir=Parameter)"
     annotation (Dialog(group="Data source"));
   Modelica.Blocks.Interfaces.RealInput winDir_in(
@@ -162,12 +162,12 @@
     "Input wind direction"
     annotation (Placement(transformation(extent={{-240,-140},{-200,-100}}),
         iconTransformation(extent={{-240,-140},{-200,-100}})));
-  //--------------------------------------------------------------
-  // Infrared horizontal radiation
+  //--------------------------------------------------------------
+  // Infrared horizontal radiation
   parameter IBPSA.BoundaryConditions.Types.DataSource HInfHorSou=IBPSA.BoundaryConditions.Types.DataSource.File
     "Infrared horizontal radiation"
     annotation (Evaluate=true, Dialog(group="Data source"));
-  parameter Modelica.SIunits.HeatFlux HInfHor=0.0
+  parameter Modelica.Units.SI.HeatFlux HInfHor=0.0
     "Infrared horizontal radiation (used if HInfHorSou=Parameter)"
     annotation (Dialog(group="Data source"));
   Modelica.Blocks.Interfaces.RealInput HInfHor_in(
@@ -180,8 +180,8 @@
    parameter IBPSA.BoundaryConditions.Types.RadiationDataSource HSou=IBPSA.BoundaryConditions.Types.RadiationDataSource.File
     "Global, diffuse, and direct normal radiation"
     annotation (Evaluate=true, Dialog(group="Data source"));
-  //--------------------------------------------------------------
-  // Global horizontal radiation
+  //--------------------------------------------------------------
+  // Global horizontal radiation
   Modelica.Blocks.Interfaces.RealInput HGloHor_in(
     final quantity="RadiantEnergyFluenceRate",
     final unit="W/m2") if (HSou == IBPSA.BoundaryConditions.Types.RadiationDataSource.Input_HGloHor_HDifHor
@@ -189,8 +189,8 @@
     "Input global horizontal radiation"
     annotation (Placement(transformation(extent={{-240,-280},{-200,-240}}),
         iconTransformation(extent={{-240,-280},{-200,-240}})));
-  //--------------------------------------------------------------
-  // Diffuse horizontal radiation
+  //--------------------------------------------------------------
+  // Diffuse horizontal radiation
   Modelica.Blocks.Interfaces.RealInput HDifHor_in(
     final quantity="RadiantEnergyFluenceRate",
     final unit="W/m2") if (HSou == IBPSA.BoundaryConditions.Types.RadiationDataSource.Input_HGloHor_HDifHor
@@ -198,8 +198,8 @@
     "Input diffuse horizontal radiation"
     annotation (Placement(transformation(extent={{-240,-276},{-200,-236}}),
         iconTransformation(extent={{-240,-172},{-200,-132}})));
-  //--------------------------------------------------------------
-  // Direct normal radiation
+  //--------------------------------------------------------------
+  // Direct normal radiation
   Modelica.Blocks.Interfaces.RealInput HDirNor_in(final quantity="RadiantEnergyFluenceRate",
       final unit="W/m2") if (HSou == IBPSA.BoundaryConditions.Types.RadiationDataSource.Input_HDirNor_HDifHor
      or HSou == IBPSA.BoundaryConditions.Types.RadiationDataSource.Input_HDirNor_HGloHor)
@@ -207,17 +207,17 @@
     annotation (Placement(transformation(extent={{-240,-320},{-200,-280}}),
         iconTransformation(extent={{-240,-240},{-200,-200}})));
 
-  //--------------------------------------------------------------
+//--------------------------------------------------------------
   parameter String filNam="" "Name of weather data file" annotation (
     Dialog(loadSelector(filter="Weather files (*.mos)",
                         caption="Select weather file")));
-  final parameter Modelica.SIunits.Angle lon(displayUnit="deg")=
+  final parameter Modelica.Units.SI.Angle lon(displayUnit="deg")=
     IBPSA.BoundaryConditions.WeatherData.BaseClasses.getLongitudeTMY3(
     filNam) "Longitude";
-  final parameter Modelica.SIunits.Angle lat(displayUnit="deg")=
+  final parameter Modelica.Units.SI.Angle lat(displayUnit="deg")=
     IBPSA.BoundaryConditions.WeatherData.BaseClasses.getLatitudeTMY3(
     filNam) "Latitude";
-  final parameter Modelica.SIunits.Time timZon(displayUnit="h")=
+  final parameter Modelica.Units.SI.Time timZon(displayUnit="h")=
     IBPSA.BoundaryConditions.WeatherData.BaseClasses.getTimeZoneTMY3(filNam)
     "Time zone";
   Bus weaBus "Weather data bus" annotation (Placement(transformation(extent={{
@@ -230,7 +230,7 @@
     Dialog(group="Sky temperature"));
 
   constant Real epsCos = 1e-6 "Small value to avoid division by 0";
-  constant Modelica.SIunits.HeatFlux solCon = 1367.7 "Solar constant";
+  constant Modelica.Units.SI.HeatFlux solCon = 1367.7 "Solar constant";
 
 protected
   Modelica.Blocks.Tables.CombiTable1Ds datRea(
@@ -307,7 +307,7 @@
     annotation (Placement(transformation(extent={{-120,-120},{-100,-100}})));
   BaseClasses.SolarTime solTim "Solar time"
     annotation (Placement(transformation(extent={{-80,-140},{-60,-120}})));
-  // Conditional connectors
+  // Conditional connectors
   Modelica.Blocks.Interfaces.RealInput pAtm_in_internal(
     final quantity="Pressure",
     final unit="Pa",
@@ -393,18 +393,18 @@
   Longitude longitude(final longitude=lon) "Longitude"
     annotation (Placement(transformation(extent={{-140,-280},{-120,-260}})));
 
-  //---------------------------------------------------------------------------
-  // Optional instanciation of a block that computes the wet bulb temperature.
-  // This block may be needed for evaporative cooling towers.
-  // By default, it is enabled. This introduces a nonlinear equation, but
-  // we have not observed an increase in computing time because of this equation.
+//---------------------------------------------------------------------------
+  // Optional instanciation of a block that computes the wet bulb temperature.
+  // This block may be needed for evaporative cooling towers.
+  // By default, it is enabled. This introduces a nonlinear equation, but
+  // we have not observed an increase in computing time because of this equation.
   IBPSA.Utilities.Psychrometrics.TWetBul_TDryBulPhi tWetBul_TDryBulXi(
       redeclare package Medium = IBPSA.Media.Air, TDryBul(displayUnit="degC")) if
        computeWetBulbTemperature
     annotation (Placement(transformation(extent={{244,-66},{264,-46}})));
 
-  //---------------------------------------------------------------------------
-  // Conversion blocks for sky cover
+//---------------------------------------------------------------------------
+  // Conversion blocks for sky cover
   Modelica.Blocks.Math.Gain conTotSkyCov(final k=0.1) if totSkyCovSou ==
     IBPSA.BoundaryConditions.Types.DataSource.File
     "Convert sky cover from [0...10] to [0...1]"
@@ -422,7 +422,7 @@
   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",
@@ -466,7 +466,7 @@
   block Longitude "Generate constant signal of type Real"
     extends Modelica.Blocks.Icons.Block;
 
-    parameter Modelica.SIunits.Angle longitude "Longitude";
+    parameter Modelica.Units.SI.Angle longitude "Longitude";
 
     Modelica.Blocks.Interfaces.RealOutput y(
       unit="rad",
@@ -507,175 +507,149 @@
 "));
   end Longitude;
 
-equation
-  //---------------------------------------------------------------------------
-  // Select atmospheric pressure connector
-  if pAtmSou == IBPSA.BoundaryConditions.Types.DataSource.Parameter then
-    pAtm_in_internal = pAtm;
-  elseif pAtmSou == IBPSA.BoundaryConditions.Types.DataSource.File then
-    connect(datRea.y[4], pAtm_in_internal);
-  else
-    connect(pAtm_in, pAtm_in_internal);
-  end if;
-  connect(pAtm_in_internal, chePre.PIn);
-  //---------------------------------------------------------------------------
-  // Select ceiling height connector
-  if ceiHeiSou == IBPSA.BoundaryConditions.Types.DataSource.Parameter then
-    ceiHei_in_internal = ceiHei;
-  elseif ceiHeiSou == IBPSA.BoundaryConditions.Types.DataSource.Input then
-    connect(ceiHei_in, ceiHei_in_internal);
-  else
-    connect(datRea.y[16], ceiHei_in_internal);
-  end if;
-   connect(ceiHei_in_internal, cheCeiHei.ceiHeiIn);
-
-  //---------------------------------------------------------------------------
-  // Select total sky cover connector
-  if totSkyCovSou == IBPSA.BoundaryConditions.Types.DataSource.Parameter then
-    totSkyCov_in_internal = totSkyCov;
-  elseif totSkyCovSou == IBPSA.BoundaryConditions.Types.DataSource.Input then
-    connect(totSkyCov_in, totSkyCov_in_internal);
-  else
-    connect(conTotSkyCov.u, datRea.y[13]) annotation (Line(
-      points={{118,-30},{-59,-30}},
-      color={0,0,127}));
-    connect(conTotSkyCov.y, totSkyCov_in_internal);
-  end if;
-  connect(totSkyCov_in_internal, cheTotSkyCov.nIn);
-  //---------------------------------------------------------------------------
-  // Select opaque sky cover connector
-  if opaSkyCovSou == IBPSA.BoundaryConditions.Types.DataSource.Parameter then
-    opaSkyCov_in_internal = opaSkyCov;
-  elseif opaSkyCovSou == IBPSA.BoundaryConditions.Types.DataSource.Input then
-    connect(opaSkyCov_in, opaSkyCov_in_internal);
-  else
-    connect(conOpaSkyCov.u, datRea.y[14]) annotation (Line(
-      points={{118,-148},{30,-148},{30,-30},{-59,-30}},
-      color={0,0,127}));
-    connect(conOpaSkyCov.y, opaSkyCov_in_internal);
-  end if;
-  connect(opaSkyCov_in_internal, cheOpaSkyCov.nIn);
-
-  //---------------------------------------------------------------------------
-  // Select dew point temperature connector
-  if TDewPoiSou == IBPSA.BoundaryConditions.Types.DataSource.Parameter then
-    TDewPoi_in_internal = TDewPoi;
-  elseif TDewPoiSou == IBPSA.BoundaryConditions.Types.DataSource.Input then
-    connect(TDewPoi_in, TDewPoi_in_internal);
-  else
-    connect(conTDewPoi.y, TDewPoi_in_internal);
-  end if;
-  connect(TDewPoi_in_internal, cheTemDewPoi.TIn);
-  //---------------------------------------------------------------------------
-  // Select dry bulb temperature connector
-  if TDryBulSou == IBPSA.BoundaryConditions.Types.DataSource.Parameter then
-    TDryBul_in_internal = TDryBul;
-  elseif TDryBulSou == IBPSA.BoundaryConditions.Types.DataSource.Input then
-    connect(TDryBul_in, TDryBul_in_internal);
-  else
-    connect(conTDryBul.y, TDryBul_in_internal);
-  end if;
-  connect(TDryBul_in_internal, cheTemDryBul.TIn);
-  //---------------------------------------------------------------------------
-  // Select sky black body temperature connector
-  if TBlaSkySou == IBPSA.BoundaryConditions.Types.DataSource.Parameter then
-    TBlaSky_in_internal = TBlaSky;
-  elseif TBlaSkySou == IBPSA.BoundaryConditions.Types.DataSource.Input then
-    connect(TBlaSky_in, TBlaSky_in_internal);
-  else
-    connect(TBlaSkyCom.TBlaSky, TBlaSky_in_internal);
-  end if;
-  connect(TBlaSky_in_internal, cheTemBlaSky.TIn);
-  //---------------------------------------------------------------------------
-  // Select relative humidity connector
-  if relHumSou == IBPSA.BoundaryConditions.Types.DataSource.Parameter then
-    relHum_in_internal = relHum;
-  elseif relHumSou == IBPSA.BoundaryConditions.Types.DataSource.Input then
-    connect(relHum_in, relHum_in_internal);
-  else
-    connect(conRelHum.relHumOut, relHum_in_internal);
-  end if;
-  connect(relHum_in_internal, cheRelHum.relHumIn);
-  //---------------------------------------------------------------------------
-  // Select wind speed connector
-  if winSpeSou == IBPSA.BoundaryConditions.Types.DataSource.Parameter then
-    winSpe_in_internal = winSpe;
-  elseif winSpeSou == IBPSA.BoundaryConditions.Types.DataSource.Input then
-    connect(winSpe_in, winSpe_in_internal);
-  else
-    connect(datRea.y[12], winSpe_in_internal);
-  end if;
-  connect(winSpe_in_internal, cheWinSpe.winSpeIn);
-  //---------------------------------------------------------------------------
-  // Select wind direction connector
-  if winDirSou == IBPSA.BoundaryConditions.Types.DataSource.Parameter then
-    winDir_in_internal = winDir;
-  elseif winDirSou == IBPSA.BoundaryConditions.Types.DataSource.Input then
-    connect(winDir_in, winDir_in_internal);
-  else
-    connect(conWinDir.y, winDir_in_internal);
-  end if;
-  connect(winDir_in_internal, cheWinDir.nIn);
-  //---------------------------------------------------------------------------
-  // Select global horizontal radiation connector
-  if HSou == IBPSA.BoundaryConditions.Types.RadiationDataSource.Input_HGloHor_HDifHor
-       or HSou == IBPSA.BoundaryConditions.Types.RadiationDataSource.Input_HDirNor_HGloHor then
-    connect(HGloHor_in, HGloHor_in_internal)
-      "Get HGloHor using user input file";
-  elseif HSou == IBPSA.BoundaryConditions.Types.RadiationDataSource.Input_HDirNor_HDifHor then
-     HDirNor_in_internal*cos(zenAng.zen)+HDifHor_in_internal = HGloHor_in_internal
-      "Calculate the HGloHor using HDirNor and HDifHor according to (A.4.14) and (A.4.15)";
-  else
-    connect(conGloHorRad.HOut, HGloHor_in_internal)
-      "Get HGloHor using weather data file";
-  end if;
-  connect(HGloHor_in_internal, cheGloHorRad.HIn);
-  //---------------------------------------------------------------------------
-  // Select diffuse horizontal radiation connector
-  if HSou == IBPSA.BoundaryConditions.Types.RadiationDataSource.Input_HGloHor_HDifHor
-       or HSou == IBPSA.BoundaryConditions.Types.RadiationDataSource.Input_HDirNor_HDifHor then
-     connect(HDifHor_in, HDifHor_in_internal)
-      "Get HDifHor using user input file";
-  elseif HSou == IBPSA.BoundaryConditions.Types.RadiationDataSource.Input_HDirNor_HGloHor then
-      HGloHor_in_internal - HDirNor_in_internal*cos(zenAng.zen) = HDifHor_in_internal
-      "Calculate the HGloHor using HDirNor and HDifHor according to (A.4.14) and (A.4.15)";
-  else
-    connect(conDifHorRad.HOut, HDifHor_in_internal)
-      "Get HDifHor using weather data file";
-  end if;
-  connect(HDifHor_in_internal, cheDifHorRad.HIn);
-  //---------------------------------------------------------------------------
-  // Select direct normal radiation connector
-  if HSou == IBPSA.BoundaryConditions.Types.RadiationDataSource.Input_HDirNor_HGloHor
-       or HSou == IBPSA.BoundaryConditions.Types.RadiationDataSource.Input_HDirNor_HDifHor then
-     connect(HDirNor_in, HDirNor_in_internal)
-      "Get HDirNor using user input file";
-  elseif HSou == IBPSA.BoundaryConditions.Types.RadiationDataSource.Input_HGloHor_HDifHor then
-    IBPSA.Utilities.Math.Functions.smoothMin(
-            solCon,
-            (HGloHor_in_internal - HDifHor_in_internal)*
-        IBPSA.Utilities.Math.Functions.spliceFunction(
-              x=cos(zenAng.zen),
-              pos=IBPSA.Utilities.Math.Functions.inverseXRegularized(cos(
-          zenAng.zen), epsCos),
-              neg=0,
-              deltax=epsCos),
-            0.1) = HDirNor_in_internal
-      "Calculate the HDirNor using HGloHor and HDifHor according to (A.4.14) and (A.4.15)";
-  else
-    connect(conDirNorRad.HOut, HDirNor_in_internal)
-      "Get HDirNor using weather data file";
-  end if;
-  connect(HDirNor_in_internal, cheDirNorRad.HIn);
-
-  //---------------------------------------------------------------------------
-  // Select infrared radiation connector
-  if HInfHorSou == IBPSA.BoundaryConditions.Types.DataSource.Parameter then
-    HInfHor_in_internal = HInfHor;
-  elseif HInfHorSou == IBPSA.BoundaryConditions.Types.DataSource.Input then
-    connect(HInfHor_in, HInfHor_in_internal);
-  else
-    connect(conHorRad.HOut, HInfHor_in_internal);
+equation
+//---------------------------------------------------------------------------
+// Select atmospheric pressure connector
+  if pAtmSou == IBPSA.BoundaryConditions.Types.DataSource.Parameter then
+    pAtm_in_internal = pAtm;
+  elseif pAtmSou == IBPSA.BoundaryConditions.Types.DataSource.File then
+    connect(datRea.y[4], pAtm_in_internal);
+  else
+    connect(pAtm_in, pAtm_in_internal);
+  end if;
+  connect(pAtm_in_internal, chePre.PIn);
+//---------------------------------------------------------------------------
+// Select ceiling height connector
+  if ceiHeiSou == IBPSA.BoundaryConditions.Types.DataSource.Parameter then
+    ceiHei_in_internal = ceiHei;
+  elseif ceiHeiSou == IBPSA.BoundaryConditions.Types.DataSource.Input then
+    connect(ceiHei_in, ceiHei_in_internal);
+  else
+    connect(datRea.y[16], ceiHei_in_internal);
+  end if;
+   connect(ceiHei_in_internal, cheCeiHei.ceiHeiIn);
+//---------------------------------------------------------------------------
+// Select total sky cover connector
+  if totSkyCovSou == IBPSA.BoundaryConditions.Types.DataSource.Parameter then
+    totSkyCov_in_internal = totSkyCov;
+  elseif totSkyCovSou == IBPSA.BoundaryConditions.Types.DataSource.Input then
+    connect(totSkyCov_in, totSkyCov_in_internal);
+  else
+    connect(conTotSkyCov.u, datRea.y[13]) annotation(
+      Line(points = {{118, -30}, {-59, -30}}, color = {0, 0, 127}));
+    connect(conTotSkyCov.y, totSkyCov_in_internal);
+  end if;
+  connect(totSkyCov_in_internal, cheTotSkyCov.nIn);
+//---------------------------------------------------------------------------
+// Select opaque sky cover connector
+  if opaSkyCovSou == IBPSA.BoundaryConditions.Types.DataSource.Parameter then
+    opaSkyCov_in_internal = opaSkyCov;
+  elseif opaSkyCovSou == IBPSA.BoundaryConditions.Types.DataSource.Input then
+    connect(opaSkyCov_in, opaSkyCov_in_internal);
+  else
+    connect(conOpaSkyCov.u, datRea.y[14]) annotation(
+      Line(points = {{118, -148}, {30, -148}, {30, -30}, {-59, -30}}, color = {0, 0, 127}));
+    connect(conOpaSkyCov.y, opaSkyCov_in_internal);
+  end if;
+  connect(opaSkyCov_in_internal, cheOpaSkyCov.nIn);
+//---------------------------------------------------------------------------
+// Select dew point temperature connector
+  if TDewPoiSou == IBPSA.BoundaryConditions.Types.DataSource.Parameter then
+    TDewPoi_in_internal = TDewPoi;
+  elseif TDewPoiSou == IBPSA.BoundaryConditions.Types.DataSource.Input then
+    connect(TDewPoi_in, TDewPoi_in_internal);
+  else
+    connect(conTDewPoi.y, TDewPoi_in_internal);
+  end if;
+  connect(TDewPoi_in_internal, cheTemDewPoi.TIn);
+//---------------------------------------------------------------------------
+// Select dry bulb temperature connector
+  if TDryBulSou == IBPSA.BoundaryConditions.Types.DataSource.Parameter then
+    TDryBul_in_internal = TDryBul;
+  elseif TDryBulSou == IBPSA.BoundaryConditions.Types.DataSource.Input then
+    connect(TDryBul_in, TDryBul_in_internal);
+  else
+    connect(conTDryBul.y, TDryBul_in_internal);
+  end if;
+  connect(TDryBul_in_internal, cheTemDryBul.TIn);
+//---------------------------------------------------------------------------
+// Select sky black body temperature connector
+  if TBlaSkySou == IBPSA.BoundaryConditions.Types.DataSource.Parameter then
+    TBlaSky_in_internal = TBlaSky;
+  elseif TBlaSkySou == IBPSA.BoundaryConditions.Types.DataSource.Input then
+    connect(TBlaSky_in, TBlaSky_in_internal);
+  else
+    connect(TBlaSkyCom.TBlaSky, TBlaSky_in_internal);
+  end if;
+  connect(TBlaSky_in_internal, cheTemBlaSky.TIn);
+//---------------------------------------------------------------------------
+// Select relative humidity connector
+  if relHumSou == IBPSA.BoundaryConditions.Types.DataSource.Parameter then
+    relHum_in_internal = relHum;
+  elseif relHumSou == IBPSA.BoundaryConditions.Types.DataSource.Input then
+    connect(relHum_in, relHum_in_internal);
+  else
+    connect(conRelHum.relHumOut, relHum_in_internal);
+  end if;
+  connect(relHum_in_internal, cheRelHum.relHumIn);
+//---------------------------------------------------------------------------
+// Select wind speed connector
+  if winSpeSou == IBPSA.BoundaryConditions.Types.DataSource.Parameter then
+    winSpe_in_internal = winSpe;
+  elseif winSpeSou == IBPSA.BoundaryConditions.Types.DataSource.Input then
+    connect(winSpe_in, winSpe_in_internal);
+  else
+    connect(datRea.y[12], winSpe_in_internal);
+  end if;
+  connect(winSpe_in_internal, cheWinSpe.winSpeIn);
+//---------------------------------------------------------------------------
+// Select wind direction connector
+  if winDirSou == IBPSA.BoundaryConditions.Types.DataSource.Parameter then
+    winDir_in_internal = winDir;
+  elseif winDirSou == IBPSA.BoundaryConditions.Types.DataSource.Input then
+    connect(winDir_in, winDir_in_internal);
+  else
+    connect(conWinDir.y, winDir_in_internal);
+  end if;
+  connect(winDir_in_internal, cheWinDir.nIn);
+//---------------------------------------------------------------------------
+// Select global horizontal radiation connector
+  if HSou == IBPSA.BoundaryConditions.Types.RadiationDataSource.Input_HGloHor_HDifHor or HSou == IBPSA.BoundaryConditions.Types.RadiationDataSource.Input_HDirNor_HGloHor then
+    connect(HGloHor_in, HGloHor_in_internal) "Get HGloHor using user input file";
+  elseif HSou == IBPSA.BoundaryConditions.Types.RadiationDataSource.Input_HDirNor_HDifHor then
+    HDirNor_in_internal * cos(zenAng.zen) + HDifHor_in_internal = HGloHor_in_internal "Calculate the HGloHor using HDirNor and HDifHor according to (A.4.14) and (A.4.15)";
+  else
+    connect(conGloHorRad.HOut, HGloHor_in_internal) "Get HGloHor using weather data file";
+  end if;
+  connect(HGloHor_in_internal, cheGloHorRad.HIn);
+//---------------------------------------------------------------------------
+// Select diffuse horizontal radiation connector
+  if HSou == IBPSA.BoundaryConditions.Types.RadiationDataSource.Input_HGloHor_HDifHor or HSou == IBPSA.BoundaryConditions.Types.RadiationDataSource.Input_HDirNor_HDifHor then
+    connect(HDifHor_in, HDifHor_in_internal) "Get HDifHor using user input file";
+  elseif HSou == IBPSA.BoundaryConditions.Types.RadiationDataSource.Input_HDirNor_HGloHor then
+    HGloHor_in_internal - HDirNor_in_internal * cos(zenAng.zen) = HDifHor_in_internal "Calculate the HGloHor using HDirNor and HDifHor according to (A.4.14) and (A.4.15)";
+  else
+    connect(conDifHorRad.HOut, HDifHor_in_internal) "Get HDifHor using weather data file";
+  end if;
+  connect(HDifHor_in_internal, cheDifHorRad.HIn);
+//---------------------------------------------------------------------------
+// Select direct normal radiation connector
+  if HSou == IBPSA.BoundaryConditions.Types.RadiationDataSource.Input_HDirNor_HGloHor or HSou == IBPSA.BoundaryConditions.Types.RadiationDataSource.Input_HDirNor_HDifHor then
+    connect(HDirNor_in, HDirNor_in_internal) "Get HDirNor using user input file";
+  elseif HSou == IBPSA.BoundaryConditions.Types.RadiationDataSource.Input_HGloHor_HDifHor then
+    IBPSA.Utilities.Math.Functions.smoothMin(solCon, (HGloHor_in_internal - HDifHor_in_internal) * IBPSA.Utilities.Math.Functions.spliceFunction(x = cos(zenAng.zen), pos = IBPSA.Utilities.Math.Functions.inverseXRegularized(cos(zenAng.zen), epsCos), neg = 0, deltax = epsCos), 0.1) = HDirNor_in_internal "Calculate the HDirNor using HGloHor and HDifHor according to (A.4.14) and (A.4.15)";
+  else
+    connect(conDirNorRad.HOut, HDirNor_in_internal) "Get HDirNor using weather data file";
+  end if;
+  connect(HDirNor_in_internal, cheDirNorRad.HIn);
+//---------------------------------------------------------------------------
+// Select infrared radiation connector
+  if HInfHorSou == IBPSA.BoundaryConditions.Types.DataSource.Parameter then
+    HInfHor_in_internal = HInfHor;
+  elseif HInfHorSou == IBPSA.BoundaryConditions.Types.DataSource.Input then
+    connect(HInfHor_in, HInfHor_in_internal);
+  else
+    connect(conHorRad.HOut, HInfHor_in_internal);
   end if;
   connect(HInfHor_in_internal, cheHorRad.HIn);
 
@@ -849,13 +823,11 @@
       color={0,0,127}));
   connect(zenAng.zen, altAng.zen) annotation (Line(
       points={{-59,-216},{-40,-216},{-40,-270},{-32,-270}},
-      color={0,0,127}));
-
-  // Connectors for wet bulb temperature.
-  // These are removed if computeWetBulbTemperature = false
-  connect(chePre.POut, tWetBul_TDryBulXi.p) annotation (Line(
-      points={{181,70},{220,70},{220,-64},{243,-64}},
-      color={0,0,127}));
+      color={0,0,127}));
+// Connectors for wet bulb temperature.
+// These are removed if computeWetBulbTemperature = false
+  connect(chePre.POut, tWetBul_TDryBulXi.p) annotation(
+    Line(points = {{181, 70}, {220, 70}, {220, -64}, {243, -64}}, color = {0, 0, 127}));
   connect(tWetBul_TDryBulXi.TWetBul, weaBus.TWetBul) annotation (Line(
       points={{265,-56},{280,-56},{280,0},{292,0},{300,0}},
       color={0,0,127}), Text(
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/WeatherData/Validation/ReaderTMY3HDirNor.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/WeatherData/Validation/ReaderTMY3HDirNor.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/WeatherData/Validation/ReaderTMY3HDirNor.mo"	2022-03-10 09:57:39.668144337 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/BoundaryConditions/WeatherData/Validation/ReaderTMY3HDirNor.mo"	2022-03-10 09:58:23.924149944 +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/BuildSysPro 3.5.0/IBPSA/Controls/Continuous/Examples/LimPID.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Controls/Continuous/Examples/LimPID.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Controls/Continuous/Examples/LimPID.mo"	2022-03-10 09:57:39.668144337 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Controls/Continuous/Examples/LimPID.mo"	2022-03-10 09:58:23.896149941 +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}})));
   IBPSA.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)
@@ -34,7 +34,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}})));
   IBPSA.Utilities.Diagnostics.AssertEquality assertEquality1(threShold=1e-3)
     annotation (Placement(transformation(extent={{60,60},{80,80}})));
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Controls/Continuous/Examples/NumberOfRequests.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Controls/Continuous/Examples/NumberOfRequests.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Controls/Continuous/Examples/NumberOfRequests.mo"	2022-03-10 09:57:39.668144337 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Controls/Continuous/Examples/NumberOfRequests.mo"	2022-03-10 09:58:23.860149936 +0000
@@ -7,7 +7,7 @@
     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/BuildSysPro 3.5.0/IBPSA/Controls/Continuous/Examples/PIDHysteresis.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Controls/Continuous/Examples/PIDHysteresis.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Controls/Continuous/Examples/PIDHysteresis.mo"	2022-03-10 09:57:39.668144337 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Controls/Continuous/Examples/PIDHysteresis.mo"	2022-03-10 09:58:23.848149934 +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/BuildSysPro 3.5.0/IBPSA/Controls/Continuous/Examples/PIDHysteresisTimer.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Controls/Continuous/Examples/PIDHysteresisTimer.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Controls/Continuous/Examples/PIDHysteresisTimer.mo"	2022-03-10 09:57:39.668144337 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Controls/Continuous/Examples/PIDHysteresisTimer.mo"	2022-03-10 09:58:23.836149934 +0000
@@ -26,7 +26,7 @@
   Modelica.Thermal.HeatTransfer.Sources.PrescribedHeatFlow Q_flow
     annotation (Placement(transformation(extent={{16,20},{36,40}})));
   Modelica.Blocks.Sources.Sine sine(
-    freqHz=1/86400,
+    f =1/86400,
     offset=273.15,
     amplitude=20,
     phase=-1.5707963267949)
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Controls/Continuous/Examples/SignalRanker.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Controls/Continuous/Examples/SignalRanker.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Controls/Continuous/Examples/SignalRanker.mo"	2022-03-10 09:57:39.668144337 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Controls/Continuous/Examples/SignalRanker.mo"	2022-03-10 09:58:23.824149933 +0000
@@ -1,13 +1,13 @@
 within BuildSysPro.IBPSA.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}})));
   IBPSA.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/BuildSysPro 3.5.0/IBPSA/Controls/Continuous/LimPID.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Controls/Continuous/LimPID.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Controls/Continuous/LimPID.mo"	2022-03-10 09:57:39.668144337 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Controls/Continuous/LimPID.mo"	2022-03-10 09:58:23.816149930 +0000
@@ -9,11 +9,11 @@
   parameter Modelica.Blocks.Types.SimpleController controllerType=
          Modelica.Blocks.Types.SimpleController.PID "Type of controller";
   parameter Real k(min=0, unit="1") = 1 "Gain of controller";
-  parameter Modelica.SIunits.Time Ti(min=Modelica.Constants.small)=0.5
+  parameter Modelica.Units.SI.Time Ti(min=Modelica.Constants.small)=0.5
     "Time constant of Integrator block" annotation (Dialog(enable=
           controllerType == Modelica.Blocks.Types.SimpleController.PI or
           controllerType == Modelica.Blocks.Types.SimpleController.PID));
-  parameter Modelica.SIunits.Time Td(min=0)=0.1
+  parameter Modelica.Units.SI.Time Td(min=0)=0.1
     "Time constant of Derivative block" annotation (Dialog(enable=
           controllerType == Modelica.Blocks.Types.SimpleController.PD or
           controllerType == Modelica.Blocks.Types.SimpleController.PID));
@@ -31,14 +31,14 @@
     "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"));
-      // Removed as the Limiter block no longer uses this parameter.
-      // parameter Boolean limitsAtInit = true
-      //  "= false, if limits are ignored during initialization"
-      // annotation(Evaluate=true, Dialog(group="Initialization"));
+      // Removed as the Limiter block no longer uses this parameter.
+  // parameter Boolean limitsAtInit = true
+  //  "= false, if limits are ignored during initialization"
+  // annotation(Evaluate=true, Dialog(group="Initialization"));
   parameter Real xi_start=0
     "Initial or guess value value for integrator output (= integrator state)"
     annotation (Dialog(group="Initialization",
@@ -91,12 +91,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}})));
 
@@ -104,15 +101,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}})));
 
@@ -123,7 +115,7 @@
     annotation (Placement(transformation(extent={{0,-10},{20,10}})));
 
 protected
-  constant Modelica.SIunits.Time unitTime=1 annotation (HideResult=true);
+  constant Modelica.Units.SI.Time unitTime=1 annotation (HideResult=true);
 
   final parameter Real revAct = if reverseAction then -1 else 1
     "Switch for sign for reverse action";
@@ -188,19 +180,17 @@
     annotation (Placement(transformation(extent={{-80,-90},{-60,-70}})));
 
 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
-      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;
-
-  // Equations for conditional connectors
+                       ") < yMin (=" + String(yMin) + ")");
+  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;
+// Equations for conditional connectors
   connect(y_reset_in, y_reset_internal);
 
   if reset <> IBPSA.Types.Reset.Input then
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Controls/Continuous/OffTimer.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Controls/Continuous/OffTimer.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Controls/Continuous/OffTimer.mo"	2022-03-10 09:57:39.668144337 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Controls/Continuous/OffTimer.mo"	2022-03-10 09:58:23.700149916 +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/BuildSysPro 3.5.0/IBPSA/Controls/Continuous/PIDHysteresis.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Controls/Continuous/PIDHysteresis.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Controls/Continuous/PIDHysteresis.mo"	2022-03-10 09:57:39.668144337 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Controls/Continuous/PIDHysteresis.mo"	2022-03-10 09:58:23.684149914 +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 to enable reverse action (such as for a cooling coil controller)"
      annotation (Dialog(group="Set point tracking"));
 
-  parameter Modelica.Blocks.Types.InitPID initType=Modelica.Blocks.Types.InitPID.DoNotUse_InitialIntegratorState
+  parameter Modelica.Blocks.Types.Init initType=Modelica.Blocks.Types.Init.InitialState
     "Type of initialization (1: no init, 2: steady state, 3: initial state, 4: initial output)"
     annotation (Dialog(group="Initialization"));
   parameter Real xi_start=0
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Controls/Continuous/PIDHysteresisTimer.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Controls/Continuous/PIDHysteresisTimer.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Controls/Continuous/PIDHysteresisTimer.mo"	2022-03-10 09:57:39.668144337 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Controls/Continuous/PIDHysteresisTimer.mo"	2022-03-10 09:58:23.644149909 +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 to enable reverse action (such as for a cooling coil controller)"
      annotation (Dialog(group="Set point tracking"));
 
-  parameter Modelica.Blocks.Types.InitPID initType=Modelica.Blocks.Types.InitPID.DoNotUse_InitialIntegratorState
+  parameter Modelica.Blocks.Types.Init initType=Modelica.Blocks.Types.Init.InitialState
     "Type of initialization (1: no init, 2: steady state, 3: initial state, 4: initial output)"
     annotation (Dialog(group="Initialization"));
   parameter Real xi_start=0
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Controls/Continuous/Validation/LimPIDReset.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Controls/Continuous/Validation/LimPIDReset.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Controls/Continuous/Validation/LimPIDReset.mo"	2022-03-10 09:57:39.668144337 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Controls/Continuous/Validation/LimPIDReset.mo"	2022-03-10 09:58:23.580149901 +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}})));
   IBPSA.Controls.Continuous.LimPID limPIDPar(
     yMax=1,
@@ -14,14 +14,14 @@
     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}})));
   IBPSA.Controls.Continuous.LimPID limPIDDef(
-    initType=Modelica.Blocks.Types.InitPID.InitialState,
+    initType=Modelica.Blocks.Types.Init.InitialState,
     Td=10,
     k=1,
     Ti=1,
@@ -45,7 +45,7 @@
     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}})));
@@ -53,7 +53,7 @@
     "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/BuildSysPro 3.5.0/IBPSA/Controls/SetPoints/HotWaterTemperatureReset.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Controls/SetPoints/HotWaterTemperatureReset.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Controls/SetPoints/HotWaterTemperatureReset.mo"	2022-03-10 09:57:39.668144337 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Controls/SetPoints/HotWaterTemperatureReset.mo"	2022-03-10 09:58:23.484149889 +0000
@@ -4,23 +4,23 @@
   extends Modelica.Blocks.Icons.Block;
 
   parameter Real m = 1.3 "Exponent for heat transfer";
-  parameter Modelica.SIunits.Temperature TSup_nominal "Supply temperature"
+  parameter Modelica.Units.SI.Temperature TSup_nominal "Supply temperature"
     annotation (Dialog(group="Nominal conditions"));
-  parameter Modelica.SIunits.Temperature TRet_nominal "Return temperature"
+  parameter Modelica.Units.SI.Temperature TRet_nominal "Return temperature"
     annotation (Dialog(group="Nominal conditions"));
-  parameter Modelica.SIunits.Temperature TRoo_nominal = 293.15
+  parameter Modelica.Units.SI.Temperature TRoo_nominal = 293.15
     "Room temperature"
     annotation (Dialog(group="Nominal conditions"));
-  parameter Modelica.SIunits.Temperature TOut_nominal "Outside temperature"
+  parameter Modelica.Units.SI.Temperature TOut_nominal "Outside temperature"
     annotation (Dialog(group="Nominal conditions"));
 
   parameter Boolean use_TRoo_in = false
     "Get the room temperature set point from the input connector"
     annotation(Evaluate=true, HideResult=true);
-  parameter Modelica.SIunits.Temperature TRoo = 293.15
+  parameter Modelica.Units.SI.Temperature TRoo = 293.15
     "Fixed value of room temperature set point"
     annotation(Dialog(enable = not use_TRoo_in));
-  parameter Modelica.SIunits.TemperatureDifference dTOutHeaBal(displayUnit="K") = 8
+  parameter Modelica.Units.SI.TemperatureDifference dTOutHeaBal(displayUnit="K") = 8
     "Offset for heating curve";
   Modelica.Blocks.Interfaces.RealInput TRoo_in(final quantity="ThermodynamicTemperature",
                                                final unit = "K", displayUnit = "degC", min=0) if
@@ -45,9 +45,9 @@
                                                         final unit = "K", displayUnit = "degC", min=0)
     "Needed to connect to conditional connector";
   Real qRel "Relative heating load = Q_flow/Q_flow_nominal";
-  Modelica.SIunits.Temperature TOutOffSet
+  Modelica.Units.SI.Temperature TOutOffSet
     "Effective outside temperature for heat transfer (takes into account room heat gains)";
-  parameter Modelica.SIunits.Temperature TOutOffSet_nominal =  TOut_nominal + dTOutHeaBal
+  parameter Modelica.Units.SI.Temperature TOutOffSet_nominal =  TOut_nominal + dTOutHeaBal
     "Effective outside temperature for heat transfer at nominal conditions (takes into account room heat gains)";
 
 equation
@@ -56,7 +56,7 @@
     TRoo_in_internal = TRoo;
   end if;
  TOutOffSet = TOut + dTOutHeaBal;
- // Relative heating load, compared to nominal conditions
+// Relative heating load, compared to nominal conditions
  qRel = max(0, (TRoo_in_internal-TOutOffSet)/(TRoo_nominal-TOutOffSet_nominal));
  TSup = TRoo_in_internal
           + ((TSup_nominal+TRet_nominal)/2-TRoo_nominal) * qRel^(1/m)
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Controls/SetPoints/OccupancySchedule.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Controls/SetPoints/OccupancySchedule.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Controls/SetPoints/OccupancySchedule.mo"	2022-03-10 09:57:39.668144337 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Controls/SetPoints/OccupancySchedule.mo"	2022-03-10 09:58:23.448149884 +0000
@@ -6,7 +6,7 @@
     "Occupancy table, each entry switching occupancy on or off";
   parameter Boolean firstEntryOccupied = true
     "Set to true if first entry in occupancy denotes a changed from unoccupied to occupied";
-  parameter Modelica.SIunits.Time period =   86400 "End time of periodicity";
+  parameter Modelica.Units.SI.Time period =   86400 "End time of periodicity";
 
   Modelica.Blocks.Interfaces.RealOutput tNexNonOcc
     "Time until next non-occupancy"
@@ -21,7 +21,7 @@
   final parameter Integer nRow = size(occupancy,1)
     "Number of rows in the schedule";
 
-  output Modelica.SIunits.Time offSet=integer(time/period)*period
+  output Modelica.Units.SI.Time offSet=integer(time/period)*period
     "Time off-set, in multiples of period, that is used to switch the time when doing the table lookup";
   output Integer nexStaInd "Next index when occupancy starts";
   output Integer nexStoInd "Next index when occupancy stops";
@@ -31,8 +31,8 @@
   output Integer iPerSto
     "Counter for the period in which the next occupancy stops";
 
-  output Modelica.SIunits.Time tOcc "Time when next occupancy starts";
-  output Modelica.SIunits.Time tNonOcc "Time when next non-occupancy starts";
+  output Modelica.Units.SI.Time tOcc "Time when next occupancy starts";
+  output Modelica.Units.SI.Time tNonOcc "Time when next non-occupancy starts";
 
 encapsulated function switchInteger
   import Modelica;
@@ -58,10 +58,9 @@
   y2:=x1;
 end switchReal;
 
-initial algorithm
-  // Check parameters for correctness
- assert(mod(nRow, 2) < 0.1,
-   "The parameter \"occupancy\" must have an even number of elements.\n");
+initial algorithm
+// Check parameters for correctness
+  assert(mod(nRow, 2) < 0.1, "The parameter \"occupancy\" must have an even number of elements.\n");
  assert(0 <= occupancy[1],
    "The first element of \"occupancy\" must be bigger than or equal to zero."
    + "\n   Received occupancy[1] = " + String(occupancy[1]));
@@ -73,21 +72,19 @@
   for i in 1:nRow-1 loop
     assert(occupancy[i] < occupancy[i+1],
       "The elements of the parameter \"occupancy\" must be strictly increasing.");
+  end for;
+// Initialize variables
+  iPerSta := integer(time / period);
+ iPerSto   := iPerSta;
+// First, assume that the first entry is occupied
+  nexStaInd := 1;
+ nexStoInd := 2;
+// nRow is an even number
+  for i in 1:2:nRow - 1 loop
+    if time >= occupancy[i] + iPerSta * period then
+      nexStaInd := i + 2;
+    end if;
   end for;
-
- // Initialize variables
- iPerSta   := integer(time/period);
- iPerSto   := iPerSta;
-
- // First, assume that the first entry is occupied
- nexStaInd := 1;
- nexStoInd := 2;
- // nRow is an even number
- for i in 1:2:nRow-1 loop
-   if time >= occupancy[i] + iPerSta*period then
-     nexStaInd := i+2;
-   end if;
- end for;
  for i in 2:2:nRow loop
    if time >= occupancy[i] + iPerSto*period then
      nexStoInd := i+2;
@@ -103,21 +100,18 @@
  end if;
  tOcc    := occupancy[nexStaInd]+iPerSta*period;
  tNonOcc := occupancy[nexStoInd]+iPerSto*period;
- occupied := tNonOcc < tOcc;
-
- // Now, correct if the first entry is vaccant instead of occupied
- if not firstEntryOccupied then
-   (nexStaInd, nexStoInd) := switchInteger(nexStaInd, nexStoInd);
-   (iPerSta, iPerSto)     := switchInteger(iPerSta,   iPerSto);
-   (tOcc, tNonOcc)        := switchReal(tOcc,      tNonOcc);
-   occupied := not occupied;
- end if;
-
+ occupied := tNonOcc < tOcc;
+// Now, correct if the first entry is vaccant instead of occupied
+  if not firstEntryOccupied then
+    (nexStaInd, nexStoInd) := switchInteger(nexStaInd, nexStoInd);
+    (iPerSta, iPerSto) := switchInteger(iPerSta, iPerSto);
+    (tOcc, tNonOcc) := switchReal(tOcc, tNonOcc);
+    occupied := not occupied;
+  end if;
 equation
-  when time >= pre(tOcc) then
-    // Changed the index that computes the time until the next occupancy
-    nexStaInd = if pre(nexStaInd) + 2 <= nRow then (pre(nexStaInd) + 2)
-                else (if firstEntryOccupied then 1 else 2);
+  when time >= pre(tOcc) then
+// Changed the index that computes the time until the next occupancy
+    nexStaInd = if pre(nexStaInd) + 2 <= nRow then pre(nexStaInd) + 2 else if firstEntryOccupied then 1 else 2;
     iPerSta = if pre(nexStaInd) + 2 <= nRow then pre(iPerSta)
                 else (pre(iPerSta) + 1);
     tOcc = occupancy[nexStaInd] + iPerSta*period;
@@ -126,10 +120,9 @@
     nexStoInd = pre(nexStoInd);
     iPerSto   = pre(iPerSto);
     tNonOcc   = pre(tNonOcc);
-  elsewhen time >= pre(tNonOcc) then
-    // Changed the index that computes the time until the next non-occupancy
-    nexStoInd = if pre(nexStoInd) + 2 <= nRow then (pre(nexStoInd) + 2)
-                else (if firstEntryOccupied then 2 else 1);
+  elsewhen time >= pre(tNonOcc) then
+// Changed the index that computes the time until the next non-occupancy
+    nexStoInd = if pre(nexStoInd) + 2 <= nRow then pre(nexStoInd) + 2 else if firstEntryOccupied then 2 else 1;
     iPerSto = if pre(nexStoInd) + 2 <= nRow then pre(iPerSto)
                else (pre(iPerSto) + 1);
     tNonOcc =  occupancy[nexStoInd] + iPerSto*period;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Controls/SetPoints/Table.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Controls/SetPoints/Table.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Controls/SetPoints/Table.mo"	2022-03-10 09:57:39.668144337 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Controls/SetPoints/Table.mo"	2022-03-10 09:58:23.352149872 +0000
@@ -16,7 +16,7 @@
                         size(table,1) "Number of rows";
   final parameter Real[nRow,2] offsetVector = [zeros(nRow), offset*ones(nRow)]
     "Vector to take offset of output signal into account";
-  Modelica.Blocks.Tables.CombiTable1D tab(
+  Modelica.Blocks.Tables.CombiTable1Dv tab(
     tableOnFile=false,
     final table= (if constantExtrapolation then
                     cat(1, [table[1,1]-1, table[1,2]],
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Experimental/Benchmarks/AirFlow/Components/Floor.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Experimental/Benchmarks/AirFlow/Components/Floor.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Experimental/Benchmarks/AirFlow/Components/Floor.mo"	2022-03-10 09:57:39.668144337 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Experimental/Benchmarks/AirFlow/Components/Floor.mo"	2022-03-10 09:58:23.280149864 +0000
@@ -8,17 +8,17 @@
 
   parameter Integer nZones(min=1) = 4 "Number of zone elements";
 
-  parameter Modelica.SIunits.Temperature TRoom = 298.15
+  parameter Modelica.Units.SI.Temperature TRoom = 298.15
     "Indoor air temperature of room in K";
-  parameter Modelica.SIunits.Temperature THallway = 293.15
+  parameter Modelica.Units.SI.Temperature THallway = 293.15
     "Indoor air temperature of hallway in K";
-  parameter Modelica.SIunits.Temperature TStaircase = 293.15
+  parameter Modelica.Units.SI.Temperature TStaircase = 293.15
     "Indoor air temperature of staircase in K";
-  parameter Modelica.SIunits.Height heightRooms = 3 "Height of rooms in m";
+  parameter Modelica.Units.SI.Height heightRooms = 3 "Height of rooms in m";
 
-  parameter Modelica.SIunits.Length lengthZone = 5 "Length of room in m";
-  parameter Modelica.SIunits.Length widthZone = 5 "Width of room in m";
-  parameter Modelica.SIunits.Length widthHallway = 3 "Width of room in m";
+  parameter Modelica.Units.SI.Length lengthZone = 5 "Length of room in m";
+  parameter Modelica.Units.SI.Length widthZone = 5 "Width of room in m";
+  parameter Modelica.Units.SI.Length widthHallway = 3 "Width of room in m";
   parameter Real doorOpening = 1
     "Opening of door (between 0:closed and 1:open)";
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Experimental/Benchmarks/AirFlow/Components/OutsideEnvironment.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Experimental/Benchmarks/AirFlow/Components/OutsideEnvironment.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Experimental/Benchmarks/AirFlow/Components/OutsideEnvironment.mo"	2022-03-10 09:57:39.668144337 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Experimental/Benchmarks/AirFlow/Components/OutsideEnvironment.mo"	2022-03-10 09:58:23.248149858 +0000
@@ -6,7 +6,7 @@
       Modelica.Media.Interfaces.PartialMedium
     "Medium in the component";
 
-  parameter Modelica.SIunits.Height heightRoom = 3
+  parameter Modelica.Units.SI.Height heightRoom = 3
     "Height of room connected to outdoor air in m";
 
   Airflow.Multizone.MediumColumn colOutBot(
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Experimental/Benchmarks/AirFlow/Components/SimpleZone.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Experimental/Benchmarks/AirFlow/Components/SimpleZone.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Experimental/Benchmarks/AirFlow/Components/SimpleZone.mo"	2022-03-10 09:57:39.668144337 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Experimental/Benchmarks/AirFlow/Components/SimpleZone.mo"	2022-03-10 09:58:23.236149858 +0000
@@ -7,11 +7,11 @@
 
   parameter Medium.Temperature TRoom(start=293.15) = 293.15
     "Indoor air temperature of room in K";
-  parameter Modelica.SIunits.Height heightRoom = 3 "Height of room in m";
-  parameter Modelica.SIunits.Length lengthRoom = 5 "Length of room in m";
-  parameter Modelica.SIunits.Length widthRoom = 5 "Width of room in m";
+  parameter Modelica.Units.SI.Height heightRoom = 3 "Height of room in m";
+  parameter Modelica.Units.SI.Length lengthRoom = 5 "Length of room in m";
+  parameter Modelica.Units.SI.Length widthRoom = 5 "Width of room in m";
 
-  parameter Modelica.SIunits.CoefficientOfHeatTransfer UValue = 1
+  parameter Modelica.Units.SI.CoefficientOfHeatTransfer UValue = 1
     "Heat transfer coefficient for outside wall";
 
   parameter Real doorOpening = 1
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Experimental/Benchmarks/AirFlow/Components/Staircase.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Experimental/Benchmarks/AirFlow/Components/Staircase.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Experimental/Benchmarks/AirFlow/Components/Staircase.mo"	2022-03-10 09:57:39.668144337 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Experimental/Benchmarks/AirFlow/Components/Staircase.mo"	2022-03-10 09:58:23.216149854 +0000
@@ -6,15 +6,15 @@
       Modelica.Media.Interfaces.PartialMedium
     "Medium in the component";
 
-  parameter Modelica.SIunits.Temperature TRoom = 293.15
+  parameter Modelica.Units.SI.Temperature TRoom = 293.15
     "Indoor air temperature of room in K";
-  parameter Modelica.SIunits.Height heightRoom = 3 "Height of room in m";
-  parameter Modelica.SIunits.Length lengthRoom = 3 "Length of room in m";
-  parameter Modelica.SIunits.Length widthRoom = 3 "Width of room in m";
+  parameter Modelica.Units.SI.Height heightRoom = 3 "Height of room in m";
+  parameter Modelica.Units.SI.Length lengthRoom = 3 "Length of room in m";
+  parameter Modelica.Units.SI.Length widthRoom = 3 "Width of room in m";
   parameter Real doorOpening = 1
     "Opening of door (between 0:closed and 1:open)";
 
-  parameter Modelica.SIunits.CoefficientOfHeatTransfer UValue = 1
+  parameter Modelica.Units.SI.CoefficientOfHeatTransfer UValue = 1
     "Heat transfer coefficient for outside wall";
 
   parameter Boolean forceErrorControlOnFlow = true
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Experimental/Benchmarks/AirFlow/Components/ZoneHallway.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Experimental/Benchmarks/AirFlow/Components/ZoneHallway.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Experimental/Benchmarks/AirFlow/Components/ZoneHallway.mo"	2022-03-10 09:57:39.668144337 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Experimental/Benchmarks/AirFlow/Components/ZoneHallway.mo"	2022-03-10 09:58:23.192149853 +0000
@@ -6,13 +6,13 @@
       Modelica.Media.Interfaces.PartialMedium
     "Medium in the component";
 
-  parameter Modelica.SIunits.Temperature TRoom = 293.15
+  parameter Modelica.Units.SI.Temperature TRoom = 293.15
     "Indoor air temperature of room in K";
-  parameter Modelica.SIunits.Height heightRoom = 3 "Height of room in m";
-  parameter Modelica.SIunits.Length lengthRoom = 5 "Length of room in m";
-  parameter Modelica.SIunits.Length widthRoom = 3 "Width of room in m";
+  parameter Modelica.Units.SI.Height heightRoom = 3 "Height of room in m";
+  parameter Modelica.Units.SI.Length lengthRoom = 5 "Length of room in m";
+  parameter Modelica.Units.SI.Length widthRoom = 3 "Width of room in m";
 
-  parameter Modelica.SIunits.CoefficientOfHeatTransfer UValue = 1
+  parameter Modelica.Units.SI.CoefficientOfHeatTransfer UValue = 1
     "Heat transfer coefficient for outside wall";
 
   parameter Boolean forceErrorControlOnFlow = true
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Experimental/Benchmarks/AirFlow/Examples/MultipleFloorsVectors.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Experimental/Benchmarks/AirFlow/Examples/MultipleFloorsVectors.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Experimental/Benchmarks/AirFlow/Examples/MultipleFloorsVectors.mo"	2022-03-10 09:57:39.668144337 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Experimental/Benchmarks/AirFlow/Examples/MultipleFloorsVectors.mo"	2022-03-10 09:58:23.136149845 +0000
@@ -8,17 +8,17 @@
   parameter Integer nZones(min=1) = 4 "Number of zone elements per floor";
   parameter Integer nFloors(min=2) = 2 "Number of floors";
 
-  parameter Modelica.SIunits.Temperature TRoom = 298.15
+  parameter Modelica.Units.SI.Temperature TRoom = 298.15
     "Indoor air temperature of room in K";
-  parameter Modelica.SIunits.Temperature THallway = 293.15
+  parameter Modelica.Units.SI.Temperature THallway = 293.15
     "Indoor air temperature of hallway in K";
-  parameter Modelica.SIunits.Temperature TStaircase = 293.15
+  parameter Modelica.Units.SI.Temperature TStaircase = 293.15
     "Indoor air temperature of staircase in K";
-  parameter Modelica.SIunits.Height heightRooms = 3 "Height of rooms in m";
+  parameter Modelica.Units.SI.Height heightRooms = 3 "Height of rooms in m";
 
-  parameter Modelica.SIunits.Length lengthZone = 5 "Length of room in m";
-  parameter Modelica.SIunits.Length widthZone = 5 "Width of room in m";
-  parameter Modelica.SIunits.Length widthHallway = 3 "Width of room in m";
+  parameter Modelica.Units.SI.Length lengthZone = 5 "Length of room in m";
+  parameter Modelica.Units.SI.Length widthZone = 5 "Width of room in m";
+  parameter Modelica.Units.SI.Length widthHallway = 3 "Width of room in m";
   parameter Real doorOpening = 1
     "Opening of door (between 0:closed and 1:open)";
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Experimental/Benchmarks/AirFlow/Examples/ZoneStepResponse.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Experimental/Benchmarks/AirFlow/Examples/ZoneStepResponse.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Experimental/Benchmarks/AirFlow/Examples/ZoneStepResponse.mo"	2022-03-10 09:57:39.668144337 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Experimental/Benchmarks/AirFlow/Examples/ZoneStepResponse.mo"	2022-03-10 09:58:23.004149829 +0000
@@ -5,7 +5,7 @@
 
   replaceable package Medium = IBPSA.Media.Air "Medium in the component";
 
-  output Modelica.SIunits.Temperature TRoom = simpleZone.volRoom.heatPort.T
+  output Modelica.Units.SI.Temperature TRoom = simpleZone.volRoom.heatPort.T
     "Room temperature at volume's therm port";
 
   Components.SimpleZone simpleZone(redeclare package Medium = Medium)
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Actuators/BaseClasses/ActuatorSignal.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Actuators/BaseClasses/ActuatorSignal.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Actuators/BaseClasses/ActuatorSignal.mo"	2022-03-10 09:57:39.668144337 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Actuators/BaseClasses/ActuatorSignal.mo"	2022-03-10 09:58:22.960149823 +0000
@@ -5,7 +5,7 @@
   parameter Boolean use_inputFilter=true
     "= true, if opening is filtered with a 2nd order CriticalDamping filter"
     annotation(Dialog(tab="Dynamics", group="Filtered opening"));
-  parameter Modelica.SIunits.Time riseTime=120
+  parameter Modelica.Units.SI.Time riseTime=120
     "Rise time of the filter (time to reach 99.6 % of an opening step)"
     annotation(Dialog(tab="Dynamics", group="Filtered opening",enable=use_inputFilter));
   parameter Integer order(min=1) = 2 "Order of filter"
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Actuators/BaseClasses/PartialDamperExponential.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Actuators/BaseClasses/PartialDamperExponential.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Actuators/BaseClasses/PartialDamperExponential.mo"	2022-03-10 09:57:39.672144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Actuators/BaseClasses/PartialDamperExponential.mo"	2022-03-10 09:58:22.920149818 +0000
@@ -11,8 +11,8 @@
  parameter Real deltaM = 0.3
     "Fraction of nominal mass flow rate where transition to turbulent occurs"
    annotation(Dialog(enable=use_deltaM));
- parameter Modelica.SIunits.Velocity v_nominal = 1 "Nominal face velocity";
- final parameter Modelica.SIunits.Area A=m_flow_nominal/rho_default/v_nominal
+ parameter Modelica.Units.SI.Velocity v_nominal = 1 "Nominal face velocity";
+ final parameter Modelica.Units.SI.Area A=m_flow_nominal/rho_default/v_nominal
     "Face area";
 
  parameter Boolean roundDuct = false
@@ -67,55 +67,33 @@
   rho = if use_constant_density then
           rho_default
         else
-          Medium.density(Medium.setState_phX(port_a.p, inStream(port_a.h_outflow), inStream(port_a.Xi_outflow)));
-  // flow coefficient, k=m_flow/sqrt(dp)
-  kDam = sqrt(2*rho)*A/
-    IBPSA.Fluid.Actuators.BaseClasses.exponentialDamper(
-            y=y_actual,
-            a=a,
-            b=b,
-            cL=cL,
-            cU=cU,
-            yL=yL,
-            yU=yU);
-  k = if (kFixed>Modelica.Constants.eps) then sqrt(1/(1/kFixed^2 + 1/kDam^2)) else kDam;
-  // Pressure drop calculation
-  if linearized then
-    m_flow*m_flow_nominal_pos = k^2*dp;
-  else
-    if homotopyInitialization then
-      if from_dp then
-        m_flow = homotopy(actual=
-          IBPSA.Fluid.BaseClasses.FlowModels.basicFlowFunction_dp(
-                  dp=dp,
-                  k=k,
-                  m_flow_turbulent=m_flow_turbulent), simplified=
-          m_flow_nominal_pos*dp/dp_nominal_pos);
-      else
-        dp = homotopy(actual=
-          IBPSA.Fluid.BaseClasses.FlowModels.basicFlowFunction_m_flow(
-                  m_flow=m_flow,
-                  k=k,
-                  m_flow_turbulent=m_flow_turbulent), simplified=
-          dp_nominal_pos*m_flow/m_flow_nominal_pos);
-       end if;  // from_dp
-    else // do not use homotopy
-      if from_dp then
-        m_flow =
-          IBPSA.Fluid.BaseClasses.FlowModels.basicFlowFunction_dp(
-                  dp=dp,
-                  k=k,
-                  m_flow_turbulent=m_flow_turbulent);
-      else
-        dp =
-          IBPSA.Fluid.BaseClasses.FlowModels.basicFlowFunction_m_flow(
-                  m_flow=m_flow,
-                  k=k,
-                  m_flow_turbulent=m_flow_turbulent);
-      end if;  // from_dp
-    end if; // homotopyInitialization
-  end if; // linearized
-annotation(Documentation(info="
+          Medium.density(Medium.setState_phX(port_a.p, inStream(port_a.h_outflow), inStream(port_a.Xi_outflow)));
+// flow coefficient, k=m_flow/sqrt(dp)
+  kDam = sqrt(2 * rho) * A / IBPSA.Fluid.Actuators.BaseClasses.exponentialDamper(y = y_actual, a = a, b = b, cL = cL, cU = cU, yL = yL, yU = yU);
+  k = if (kFixed>Modelica.Constants.eps) then sqrt(1/(1/kFixed^2 + 1/kDam^2)) else kDam;
+// Pressure drop calculation
+  if linearized then
+    m_flow * m_flow_nominal_pos = k ^ 2 * dp;
+  else
+    if homotopyInitialization then
+      if from_dp then
+        m_flow = homotopy(actual = IBPSA.Fluid.BaseClasses.FlowModels.basicFlowFunction_dp(dp = dp, k = k, m_flow_turbulent = m_flow_turbulent), simplified = m_flow_nominal_pos * dp / dp_nominal_pos);
+      else
+        dp = homotopy(actual = IBPSA.Fluid.BaseClasses.FlowModels.basicFlowFunction_m_flow(m_flow = m_flow, k = k, m_flow_turbulent = m_flow_turbulent), simplified = dp_nominal_pos * m_flow / m_flow_nominal_pos);
+      end if;
+// from_dp
+    else
+// do not use homotopy
+      if from_dp then
+        m_flow = IBPSA.Fluid.BaseClasses.FlowModels.basicFlowFunction_dp(dp = dp, k = k, m_flow_turbulent = m_flow_turbulent);
+      else
+        dp = IBPSA.Fluid.BaseClasses.FlowModels.basicFlowFunction_m_flow(m_flow = m_flow, k = k, m_flow_turbulent = m_flow_turbulent);
+      end if;
+// from_dp
+    end if;
+// homotopyInitialization
+  end if; // linearized
+  annotation(Documentation(info="
 

 Partial model for air dampers with exponential opening characteristics.
 This is the base model for air dampers and variable air volume flow boxes.
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Actuators/BaseClasses/PartialThreeWayValve.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Actuators/BaseClasses/PartialThreeWayValve.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Actuators/BaseClasses/PartialThreeWayValve.mo"	2022-03-10 09:57:39.672144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Actuators/BaseClasses/PartialThreeWayValve.mo"	2022-03-10 09:58:22.896149815 +0000
@@ -40,7 +40,7 @@
                 273.15 + 4,
                 Medium.X_default));
 
-  parameter Modelica.SIunits.PressureDifference dpFixed_nominal[2](each displayUnit="Pa",
+  parameter Modelica.Units.SI.PressureDifference dpFixed_nominal[2](each displayUnit="Pa",
                                                          each min=0) = {0, 0}
     "Nominal pressure drop of pipes and other equipment in flow legs at port_1 and port_3"
     annotation(Dialog(group="Nominal condition"));
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Actuators/BaseClasses/PartialTwoWayValve.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Actuators/BaseClasses/PartialTwoWayValve.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Actuators/BaseClasses/PartialTwoWayValve.mo"	2022-03-10 09:57:39.672144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Actuators/BaseClasses/PartialTwoWayValve.mo"	2022-03-10 09:58:22.868149810 +0000
@@ -13,7 +13,7 @@
                 Medium.X_default));
 
   extends IBPSA.Fluid.Actuators.BaseClasses.ActuatorSignal;
-  parameter Modelica.SIunits.PressureDifference dpFixed_nominal(displayUnit="Pa", min=0) = 0
+  parameter Modelica.Units.SI.PressureDifference dpFixed_nominal(displayUnit="Pa", min=0) = 0
     "Pressure drop of pipe and other resistances that are in series"
      annotation(Dialog(group = "Nominal condition"));
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Actuators/BaseClasses/PartialTwoWayValveKv.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Actuators/BaseClasses/PartialTwoWayValveKv.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Actuators/BaseClasses/PartialTwoWayValveKv.mo"	2022-03-10 09:57:39.672144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Actuators/BaseClasses/PartialTwoWayValveKv.mo"	2022-03-10 09:58:22.848149808 +0000
@@ -11,42 +11,25 @@
    k = kVal;
  end if;
 
- if linearized then
-   // This implementation yields m_flow_nominal = phi*kv_SI * sqrt(dp_nominal)
-   // if m_flow = m_flow_nominal and dp = dp_nominal
-   m_flow*m_flow_nominal_pos = k^2 * dp;
- else
-   if homotopyInitialization then
-     if from_dp then
-        m_flow = homotopy(actual=
-          IBPSA.Fluid.BaseClasses.FlowModels.basicFlowFunction_dp(
-                  dp=dp,
-                  k=k,
-                  m_flow_turbulent=m_flow_turbulent), simplified=
-          m_flow_nominal_pos*dp/dp_nominal_pos);
-      else
-        dp = homotopy(actual=
-          IBPSA.Fluid.BaseClasses.FlowModels.basicFlowFunction_m_flow(
-                  m_flow=m_flow,
-                  k=k,
-                  m_flow_turbulent=m_flow_turbulent), simplified=
-          dp_nominal_pos*m_flow/m_flow_nominal_pos);
-     end if;
-   else // do not use homotopy
-     if from_dp then
-        m_flow =
-          IBPSA.Fluid.BaseClasses.FlowModels.basicFlowFunction_dp(
-                  dp=dp,
-                  k=k,
-                  m_flow_turbulent=m_flow_turbulent);
-      else
-        dp =
-          IBPSA.Fluid.BaseClasses.FlowModels.basicFlowFunction_m_flow(
-                  m_flow=m_flow,
-                  k=k,
-                  m_flow_turbulent=m_flow_turbulent);
-      end if;
-    end if; // homotopyInitialization
+ if linearized then
+// This implementation yields m_flow_nominal = phi*kv_SI * sqrt(dp_nominal)
+// if m_flow = m_flow_nominal and dp = dp_nominal
+    m_flow * m_flow_nominal_pos = k ^ 2 * dp;
+ else
+ if homotopyInitialization then
+      if from_dp then
+        m_flow = homotopy(actual = IBPSA.Fluid.BaseClasses.FlowModels.basicFlowFunction_dp(dp = dp, k = k, m_flow_turbulent = m_flow_turbulent), simplified = m_flow_nominal_pos * dp / dp_nominal_pos);
+      else
+        dp = homotopy(actual = IBPSA.Fluid.BaseClasses.FlowModels.basicFlowFunction_m_flow(m_flow = m_flow, k = k, m_flow_turbulent = m_flow_turbulent), simplified = dp_nominal_pos * m_flow / m_flow_nominal_pos);
+      end if;
+    else
+// do not use homotopy
+      if from_dp then
+        m_flow = IBPSA.Fluid.BaseClasses.FlowModels.basicFlowFunction_dp(dp = dp, k = k, m_flow_turbulent = m_flow_turbulent);
+      else
+        dp = IBPSA.Fluid.BaseClasses.FlowModels.basicFlowFunction_m_flow(m_flow = m_flow, k = k, m_flow_turbulent = m_flow_turbulent);
+      end if;
+    end if; // homotopyInitialization
  end if; // linearized
   annotation (Icon(coordinateSystem(preserveAspectRatio=true,  extent={{-100,-100},
             {100,100}}),       graphics={
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Actuators/BaseClasses/ValveParameters.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Actuators/BaseClasses/ValveParameters.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Actuators/BaseClasses/ValveParameters.mo"	2022-03-10 09:57:39.672144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Actuators/BaseClasses/ValveParameters.mo"	2022-03-10 09:58:22.828149806 +0000
@@ -14,7 +14,7 @@
     "Cv (US) flow coefficient [USG/min/(psi)^(1/2)]"
   annotation(Dialog(group = "Flow Coefficient",
                     enable=(CvData == IBPSA.Fluid.Types.CvTypes.Cv)));
-  parameter Modelica.SIunits.Area Av(
+  parameter Modelica.Units.SI.Area Av(
     fixed= if CvData==IBPSA.Fluid.Types.CvTypes.Av then true else false)
     "Av (metric) flow coefficient"
    annotation(Dialog(group = "Flow Coefficient",
@@ -23,10 +23,11 @@
   parameter Real deltaM = 0.02
     "Fraction of nominal flow rate where linearization starts, if y=1"
     annotation(Dialog(group="Pressure-flow linearization"));
-  parameter Modelica.SIunits.MassFlowRate m_flow_nominal
+
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal
     "Nominal mass flow rate"
     annotation(Dialog(group = "Nominal condition"));
-  parameter Modelica.SIunits.PressureDifference dpValve_nominal(
+  parameter Modelica.Units.SI.PressureDifference dpValve_nominal(
      displayUnit="Pa",
      min=0,
      fixed= if CvData==IBPSA.Fluid.Types.CvTypes.OpPoint then true else false)
@@ -34,10 +35,9 @@
     annotation(Dialog(group="Nominal condition",
                enable=(CvData == IBPSA.Fluid.Types.CvTypes.OpPoint)));
 
-  parameter Modelica.SIunits.Density rhoStd
+  parameter Modelica.Units.SI.Density rhoStd
     "Inlet density for which valve coefficients are defined"
   annotation(Dialog(group="Nominal condition", tab="Advanced"));
-
 protected
   parameter Real Kv_SI(
     min=0,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Actuators/Dampers/MixingBox.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Actuators/Dampers/MixingBox.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Actuators/Dampers/MixingBox.mo"	2022-03-10 09:57:39.672144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Actuators/Dampers/MixingBox.mo"	2022-03-10 09:58:22.656149785 +0000
@@ -37,7 +37,7 @@
   parameter Real deltaM = 0.3
     "Fraction of nominal mass flow rate where transition to turbulent occurs"
     annotation(Dialog(enable=use_deltaM));
-  parameter Modelica.SIunits.Velocity v_nominal=1 "Nominal face velocity";
+  parameter Modelica.Units.SI.Velocity v_nominal=1 "Nominal face velocity";
 
   parameter Boolean roundDuct = false
     "Set to true for round duct, false for square cross section"
@@ -97,24 +97,24 @@
     "set to true if dp_nominal includes the pressure loss of the open damper"
     annotation (Dialog(group="Nominal condition"));
 
-  parameter Modelica.SIunits.MassFlowRate mOut_flow_nominal
+  parameter Modelica.Units.SI.MassFlowRate mOut_flow_nominal
     "Mass flow rate outside air damper"
     annotation (Dialog(group="Nominal condition"));
-  parameter Modelica.SIunits.PressureDifference dpOut_nominal(min=0, displayUnit="Pa")
+  parameter Modelica.Units.SI.PressureDifference dpOut_nominal(min=0, displayUnit="Pa")
     "Pressure drop outside air leg"
      annotation (Dialog(group="Nominal condition"));
 
-  parameter Modelica.SIunits.MassFlowRate mRec_flow_nominal
+  parameter Modelica.Units.SI.MassFlowRate mRec_flow_nominal
     "Mass flow rate recirculation air damper"
     annotation (Dialog(group="Nominal condition"));
-  parameter Modelica.SIunits.PressureDifference dpRec_nominal(min=0, displayUnit="Pa")
+  parameter Modelica.Units.SI.PressureDifference dpRec_nominal(min=0, displayUnit="Pa")
     "Pressure drop recirculation air leg"
      annotation (Dialog(group="Nominal condition"));
 
-  parameter Modelica.SIunits.MassFlowRate mExh_flow_nominal
+  parameter Modelica.Units.SI.MassFlowRate mExh_flow_nominal
     "Mass flow rate exhaust air damper"
     annotation (Dialog(group="Nominal condition"));
-  parameter Modelica.SIunits.PressureDifference dpExh_nominal(min=0, displayUnit="Pa")
+  parameter Modelica.Units.SI.PressureDifference dpExh_nominal(min=0, displayUnit="Pa")
     "Pressure drop exhaust air leg"
      annotation (Dialog(group="Nominal condition"));
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Actuators/Dampers/PressureIndependent.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Actuators/Dampers/PressureIndependent.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Actuators/Dampers/PressureIndependent.mo"	2022-03-10 09:57:39.672144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Actuators/Dampers/PressureIndependent.mo"	2022-03-10 09:58:22.612149779 +0000
@@ -12,8 +12,8 @@
   parameter Real deltaM = 0.3
     "Fraction of nominal mass flow rate where transition to turbulent occurs"
    annotation(Dialog(enable=use_deltaM));
-  parameter Modelica.SIunits.Velocity v_nominal = 1 "Nominal face velocity";
-  final parameter Modelica.SIunits.Area A=m_flow_nominal/rho_default/v_nominal
+  parameter Modelica.Units.SI.Velocity v_nominal = 1 "Nominal face velocity";
+  final parameter Modelica.Units.SI.Area A=m_flow_nominal/rho_default/v_nominal
     "Face area";
 
   parameter Boolean roundDuct = false
@@ -24,7 +24,7 @@
   parameter Boolean use_constant_density=true
     "Set to true to use constant density for flow friction"
    annotation (Evaluate=true, Dialog(tab="Advanced"));
-  parameter Modelica.SIunits.PressureDifference dpFixed_nominal(displayUnit="Pa", min=0) = 0
+  parameter Modelica.Units.SI.PressureDifference dpFixed_nominal(displayUnit="Pa", min=0) = 0
     "Pressure drop of duct and other resistances that are in series"
      annotation(Dialog(group = "Nominal condition"));
   parameter Real l(min=1e-10, max=1) = 0.0001
@@ -55,17 +55,17 @@
     "Parameter for avoiding unnecessary computations";
   constant Real y2dd = 0
     "Second derivative at second support point";
-  Modelica.SIunits.MassFlowRate m_flow_set
+  Modelica.Units.SI.MassFlowRate m_flow_set
     "Requested mass flow rate";
-  Modelica.SIunits.PressureDifference dp_min(displayUnit="Pa")
+  Modelica.Units.SI.PressureDifference dp_min(displayUnit="Pa")
     "Minimum pressure difference required for delivering requested mass flow rate";
-  Modelica.SIunits.PressureDifference dp_x, dp_x1, dp_x2, dp_y2, dp_y1
+  Modelica.Units.SI.PressureDifference dp_x, dp_x1, dp_x2, dp_y2, dp_y1
     "Support points for interpolation flow functions";
-  Modelica.SIunits.MassFlowRate m_flow_x, m_flow_x1, m_flow_x2, m_flow_y2, m_flow_y1
+  Modelica.Units.SI.MassFlowRate m_flow_x, m_flow_x1, m_flow_x2, m_flow_y2, m_flow_y1
     "Support points for interpolation flow functions";
-  Modelica.SIunits.MassFlowRate m_flow_smooth
+  Modelica.Units.SI.MassFlowRate m_flow_smooth
     "Smooth interpolation result between two flow regimes";
-  Modelica.SIunits.PressureDifference dp_smooth
+  Modelica.Units.SI.PressureDifference dp_smooth
     "Smooth interpolation result between two flow regimes";
 initial equation
   assert(m_flow_turbulent > 0, "m_flow_turbulent must be bigger than zero.");
@@ -73,98 +73,43 @@
   rho = if use_constant_density then
           rho_default
         else
-          Medium.density(Medium.setState_phX(port_a.p, inStream(port_a.h_outflow), inStream(port_a.Xi_outflow)));
-  // From TwoWayPressureIndependent valve model
-  m_flow_set = m_flow_nominal*phi;
+          Medium.density(Medium.setState_phX(port_a.p, inStream(port_a.h_outflow), inStream(port_a.Xi_outflow)));
+// From TwoWayPressureIndependent valve model
+  m_flow_set = m_flow_nominal * phi;
   dp_min = IBPSA.Fluid.BaseClasses.FlowModels.basicFlowFunction_m_flow(
             m_flow=m_flow_set,
             k=k,
-            m_flow_turbulent=m_flow_turbulent);
-
-  if from_dp then
-    m_flow_x=0;
-    m_flow_x1=0;
-    m_flow_x2=0;
-    dp_y1=0;
-    dp_y2=0;
-    dp_smooth=0;
-
-    dp_x = dp-dp_min;
-    dp_x1 = -dp_x2;
-    dp_x2 = deltax*dp_min;
-    // min function ensures that m_flow_y1 does not increase further for dp_x > dp_x1
-    m_flow_y1 = IBPSA.Fluid.BaseClasses.FlowModels.basicFlowFunction_dp(
-              dp=min(dp, dp_min + dp_x1),
-              k=k,
-              m_flow_turbulent=m_flow_turbulent);
-    // max function ensures that m_flow_y2 does not decrease further for dp_x < dp_x2
-    m_flow_y2 = m_flow_set + coeff1*max(dp_x,dp_x2);
-
-    m_flow_smooth = noEvent(smooth(2, if dp_x <= dp_x1 then m_flow_y1
-       elseif dp_x >= dp_x2 then m_flow_y2 else
-      IBPSA.Utilities.Math.Functions.quinticHermite(
-              x=dp_x,
-              x1=dp_x1,
-              x2=dp_x2,
-              y1=m_flow_y1,
-              y2=m_flow_y2,
-              y1d=
-        IBPSA.Fluid.BaseClasses.FlowModels.basicFlowFunction_dp_der(
-                dp=dp_min + dp_x1,
-                k=k,
-                m_flow_turbulent=m_flow_turbulent,
-                dp_der=1),
-              y2d=coeff1,
-              y1dd=
-        IBPSA.Fluid.BaseClasses.FlowModels.basicFlowFunction_dp_der2(
-                dp=dp_min + dp_x1,
-                k=k,
-                m_flow_turbulent=m_flow_turbulent,
-                dp_der=1,
-                dp_der2=0),
-              y2dd=y2dd)));
-  else
-    dp_x=0;
-    dp_x1=0;
-    dp_x2=0;
-    m_flow_y1=0;
-    m_flow_y2=0;
-    m_flow_smooth=0;
-
-    m_flow_x = m_flow-m_flow_set;
-    m_flow_x1 = -m_flow_x2;
-    m_flow_x2 = deltax*m_flow_set;
-    // min function ensures that dp_y1 does not increase further for m_flow_x > m_flow_x1
-    dp_y1 = IBPSA.Fluid.BaseClasses.FlowModels.basicFlowFunction_m_flow(
-              m_flow=min(m_flow, m_flow_set + m_flow_x1),
-              k=k,
-              m_flow_turbulent=m_flow_turbulent);
-    // max function ensures that dp_y2 does not decrease further for m_flow_x < m_flow_x2
-    dp_y2 = dp_min + coeff2*max(m_flow_x, m_flow_x2);
-
-    dp_smooth = noEvent(smooth(2, if m_flow_x <= m_flow_x1 then dp_y1
-       elseif m_flow_x >= m_flow_x2 then dp_y2 else
-      IBPSA.Utilities.Math.Functions.quinticHermite(
-              x=m_flow_x,
-              x1=m_flow_x1,
-              x2=m_flow_x2,
-              y1=dp_y1,
-              y2=dp_y2,
-              y1d=
-        IBPSA.Fluid.BaseClasses.FlowModels.basicFlowFunction_m_flow_der(
-                m_flow=m_flow_set + m_flow_x1,
-                k=k,
-                m_flow_turbulent=m_flow_turbulent,
-                m_flow_der=1),
-              y2d=coeff2,
-              y1dd=
-        IBPSA.Fluid.BaseClasses.FlowModels.basicFlowFunction_m_flow_der2(
-                m_flow=m_flow_set + m_flow_x1,
-                k=k,
-                m_flow_turbulent=m_flow_turbulent,
-                m_flow_der=1,
-                m_flow_der2=0),
-              y2dd=y2dd)));
+            m_flow_turbulent=m_flow_turbulent);
+  if from_dp then
+    m_flow_x = 0;
+    m_flow_x1 = 0;
+    m_flow_x2 = 0;
+    dp_y1 = 0;
+    dp_y2 = 0;
+    dp_smooth = 0;
+    dp_x = dp - dp_min;
+    dp_x1 = -dp_x2;
+    dp_x2 = deltax * dp_min;
+// min function ensures that m_flow_y1 does not increase further for dp_x > dp_x1
+    m_flow_y1 = IBPSA.Fluid.BaseClasses.FlowModels.basicFlowFunction_dp(dp = min(dp, dp_min + dp_x1), k = k, m_flow_turbulent = m_flow_turbulent);
+// max function ensures that m_flow_y2 does not decrease further for dp_x < dp_x2
+    m_flow_y2 = m_flow_set + coeff1 * max(dp_x, dp_x2);
+    m_flow_smooth = noEvent(smooth(2, if dp_x <= dp_x1 then m_flow_y1 elseif dp_x >= dp_x2 then m_flow_y2 else IBPSA.Utilities.Math.Functions.quinticHermite(x = dp_x, x1 = dp_x1, x2 = dp_x2, y1 = m_flow_y1, y2 = m_flow_y2, y1d = IBPSA.Fluid.BaseClasses.FlowModels.basicFlowFunction_dp_der(dp = dp_min + dp_x1, k = k, m_flow_turbulent = m_flow_turbulent, dp_der = 1), y2d = coeff1, y1dd = IBPSA.Fluid.BaseClasses.FlowModels.basicFlowFunction_dp_der2(dp = dp_min + dp_x1, k = k, m_flow_turbulent = m_flow_turbulent, dp_der = 1, dp_der2 = 0), y2dd = y2dd)));
+  else
+    dp_x = 0;
+    dp_x1 = 0;
+    dp_x2 = 0;
+    m_flow_y1 = 0;
+    m_flow_y2 = 0;
+    m_flow_smooth = 0;
+    m_flow_x = m_flow - m_flow_set;
+    m_flow_x1 = -m_flow_x2;
+    m_flow_x2 = deltax * m_flow_set;
+// min function ensures that dp_y1 does not increase further for m_flow_x > m_flow_x1
+    dp_y1 = IBPSA.Fluid.BaseClasses.FlowModels.basicFlowFunction_m_flow(m_flow = min(m_flow, m_flow_set + m_flow_x1), k = k, m_flow_turbulent = m_flow_turbulent);
+// max function ensures that dp_y2 does not decrease further for m_flow_x < m_flow_x2
+    dp_y2 = dp_min + coeff2 * max(m_flow_x, m_flow_x2);
+    dp_smooth = noEvent(smooth(2, if m_flow_x <= m_flow_x1 then dp_y1 elseif m_flow_x >= m_flow_x2 then dp_y2 else IBPSA.Utilities.Math.Functions.quinticHermite(x = m_flow_x, x1 = m_flow_x1, x2 = m_flow_x2, y1 = dp_y1, y2 = dp_y2, y1d = IBPSA.Fluid.BaseClasses.FlowModels.basicFlowFunction_m_flow_der(m_flow = m_flow_set + m_flow_x1, k = k, m_flow_turbulent = m_flow_turbulent, m_flow_der = 1), y2d = coeff2, y1dd = IBPSA.Fluid.BaseClasses.FlowModels.basicFlowFunction_m_flow_der2(m_flow = m_flow_set + m_flow_x1, k = k, m_flow_turbulent = m_flow_turbulent, m_flow_der = 1, m_flow_der2 = 0), y2dd = y2dd)));
   end if;
 
   if homotopyInitialization then
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Actuators/Dampers/VAVBoxExponential.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Actuators/Dampers/VAVBoxExponential.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Actuators/Dampers/VAVBoxExponential.mo"	2022-03-10 09:57:39.672144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Actuators/Dampers/VAVBoxExponential.mo"	2022-03-10 09:58:22.580149775 +0000
@@ -7,7 +7,7 @@
     "set to true if dp_nominal includes the pressure loss of the open damper"
                                               annotation(Dialog(group = "Nominal condition"));
 protected
-  parameter Modelica.SIunits.PressureDifference dpDamOpe_nominal(displayUnit="Pa")=
+  parameter Modelica.Units.SI.PressureDifference dpDamOpe_nominal(displayUnit="Pa")=
      k1*m_flow_nominal^2/2/Medium.density(sta_default)/A^2
     "Pressure drop of fully open damper at nominal flow rate";
   parameter Real kResSqu(unit="kg.m", fixed=false)
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Actuators/Motors/IdealMotor.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Actuators/Motors/IdealMotor.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Actuators/Motors/IdealMotor.mo"	2022-03-10 09:57:39.672144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Actuators/Motors/IdealMotor.mo"	2022-03-10 09:58:22.548149771 +0000
@@ -3,8 +3,8 @@
   extends Modelica.Blocks.Interfaces.SISO;
 
   parameter Real delta(min=0, max=0.5) = 0.05 "Hysteresis";
-  parameter Modelica.SIunits.Time tOpe(min=0) = 120 "Opening time";
-  parameter Modelica.SIunits.Time tClo(min=0) = tOpe "Closing time";
+  parameter Modelica.Units.SI.Time tOpe(min=0) = 120 "Opening time";
+  parameter Modelica.Units.SI.Time tClo(min=0) = tOpe "Closing time";
   parameter Real y_start(min=0, max=1) = 0.5 "Start position";
 
   Modelica.Blocks.Logical.Hysteresis uppHys(final uLow=0, uHigh=delta,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Actuators/Valves/TwoWayEqualPercentage.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Actuators/Valves/TwoWayEqualPercentage.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Actuators/Valves/TwoWayEqualPercentage.mo"	2022-03-10 09:57:39.672144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Actuators/Valves/TwoWayEqualPercentage.mo"	2022-03-10 09:58:22.336149743 +0000
@@ -17,8 +17,8 @@
     "Range of significant deviation from equal percentage law";
 
 initial equation
-  // Since the flow model IBPSA.Fluid.BaseClasses.FlowModels.basicFlowFunction_m_flow computes
-  // 1/k^2, the parameter l must not be zero.
+// Since the flow model IBPSA.Fluid.BaseClasses.FlowModels.basicFlowFunction_m_flow computes
+// 1/k^2, the parameter l must not be zero.
   assert(l > 0, "Valve leakage parameter l must be bigger than zero.");
   assert(l < 1/R, "Wrong parameters in valve model.\n"
                 + "  Rangeability R = " + String(R) + "\n"
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Actuators/Valves/TwoWayLinear.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Actuators/Valves/TwoWayLinear.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Actuators/Valves/TwoWayLinear.mo"	2022-03-10 09:57:39.672144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Actuators/Valves/TwoWayLinear.mo"	2022-03-10 09:58:22.328149743 +0000
@@ -3,9 +3,10 @@
   extends BaseClasses.PartialTwoWayValveKv(phi=l + y_actual*(1 - l));
 
 initial equation
-  // Since the flow model IBPSA.Fluid.BaseClasses.FlowModels.basicFlowFunction_m_flow computes
-  // 1/k^2, the parameter l must not be zero.
-  assert(l > 0, "Valve leakage parameter l must be bigger than zero.");
+// Since the flow model IBPSA.Fluid.BaseClasses.FlowModels.basicFlowFunction_m_flow computes
+// 1/k^2, the parameter l must not be zero.
+  assert(l > 0, "Valve leakage parameter l must be bigger than zero.");
+
 annotation (
 defaultComponentName="val",
 Documentation(info="
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Actuators/Valves/TwoWayPolynomial.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Actuators/Valves/TwoWayPolynomial.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Actuators/Valves/TwoWayPolynomial.mo"	2022-03-10 09:57:39.672144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Actuators/Valves/TwoWayPolynomial.mo"	2022-03-10 09:58:22.320149742 +0000
@@ -14,8 +14,8 @@
 
   // Test the validity of the provided valve coefficients
 initial equation
-  // We compute the analytic derivative of the polynomial for y=(1/points),
-  // where the derivative of y^j = j*y^(j-1).
+// We compute the analytic derivative of the polynomial for y=(1/points),
+// where the derivative of y^j = j*y^(j-1).
   if size(c, 1)>=2 then
     for i in 0:nP/2 loop
       assert(sum({c[j+1]*j*(i/nP)^(j-1) for j in 1:size(c, 1) - 1})>=0,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Actuators/Valves/TwoWayPressureIndependent.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Actuators/Valves/TwoWayPressureIndependent.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Actuators/Valves/TwoWayPressureIndependent.mo"	2022-03-10 09:57:39.672144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Actuators/Valves/TwoWayPressureIndependent.mo"	2022-03-10 09:58:22.312149740 +0000
@@ -18,17 +18,17 @@
     "Parameter for avoiding unnecessary computations";
   constant Real y2dd = 0
     "Second derivative at second support point";
-  Modelica.SIunits.MassFlowRate m_flow_set
+  Modelica.Units.SI.MassFlowRate m_flow_set
     "Requested mass flow rate";
-  Modelica.SIunits.PressureDifference dp_min(displayUnit="Pa")
+  Modelica.Units.SI.PressureDifference dp_min(displayUnit="Pa")
     "Minimum pressure difference required for delivering requested mass flow rate";
-  Modelica.SIunits.PressureDifference dp_x, dp_x1, dp_x2, dp_y2, dp_y1
+  Modelica.Units.SI.PressureDifference dp_x, dp_x1, dp_x2, dp_y2, dp_y1
     "Support points for interpolation flow functions";
-  Modelica.SIunits.MassFlowRate m_flow_x, m_flow_x1, m_flow_x2, m_flow_y2, m_flow_y1
+  Modelica.Units.SI.MassFlowRate m_flow_x, m_flow_x1, m_flow_x2, m_flow_y2, m_flow_y1
     "Support points for interpolation flow functions";
-  Modelica.SIunits.MassFlowRate m_flow_smooth
+  Modelica.Units.SI.MassFlowRate m_flow_smooth
     "Smooth interpolation result between two flow regimes";
-  Modelica.SIunits.PressureDifference dp_smooth
+  Modelica.Units.SI.PressureDifference dp_smooth
     "Smooth interpolation result between two flow regimes";
 
 equation
@@ -54,14 +54,11 @@
 
     dp_x = dp-dp_min;
     dp_x1 = -dp_x2;
-    dp_x2 = deltax*dp_min;
-    // min function ensures that m_flow_y1 does not increase further for dp_x > dp_x1
-    m_flow_y1 = IBPSA.Fluid.BaseClasses.FlowModels.basicFlowFunction_dp(
-              dp=min(dp, dp_min + dp_x1),
-              k=k,
-              m_flow_turbulent=m_flow_turbulent);
-    // max function ensures that m_flow_y2 does not decrease further for dp_x < dp_x2
-    m_flow_y2 = m_flow_set + coeff1*max(dp_x,dp_x2);
+    dp_x2 = deltax*dp_min;
+// min function ensures that m_flow_y1 does not increase further for dp_x > dp_x1
+    m_flow_y1 = IBPSA.Fluid.BaseClasses.FlowModels.basicFlowFunction_dp(dp = min(dp, dp_min + dp_x1), k = k, m_flow_turbulent = m_flow_turbulent);
+// max function ensures that m_flow_y2 does not decrease further for dp_x < dp_x2
+    m_flow_y2 = m_flow_set + coeff1 * max(dp_x, dp_x2);
 
     m_flow_smooth = noEvent(smooth(2, if dp_x <= dp_x1 then m_flow_y1
        elseif dp_x >= dp_x2 then m_flow_y2 else
@@ -96,14 +93,11 @@
 
     m_flow_x = m_flow-m_flow_set;
     m_flow_x1 = -m_flow_x2;
-    m_flow_x2 = deltax*m_flow_set;
-    // min function ensures that dp_y1 does not increase further for m_flow_x > m_flow_x1
-    dp_y1 = IBPSA.Fluid.BaseClasses.FlowModels.basicFlowFunction_m_flow(
-              m_flow=min(m_flow, m_flow_set + m_flow_x1),
-              k=k,
-              m_flow_turbulent=m_flow_turbulent);
-    // max function ensures that dp_y2 does not decrease further for m_flow_x < m_flow_x2
-    dp_y2 = dp_min + coeff2*max(m_flow_x, m_flow_x2);
+    m_flow_x2 = deltax*m_flow_set;
+// min function ensures that dp_y1 does not increase further for m_flow_x > m_flow_x1
+    dp_y1 = IBPSA.Fluid.BaseClasses.FlowModels.basicFlowFunction_m_flow(m_flow = min(m_flow, m_flow_set + m_flow_x1), k = k, m_flow_turbulent = m_flow_turbulent);
+// max function ensures that dp_y2 does not decrease further for m_flow_x < m_flow_x2
+    dp_y2 = dp_min + coeff2 * max(m_flow_x, m_flow_x2);
 
     dp_smooth = noEvent(smooth(2, if m_flow_x <= m_flow_x1 then dp_y1
        elseif m_flow_x >= m_flow_x2 then dp_y2 else
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Actuators/Valves/TwoWayQuickOpening.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Actuators/Valves/TwoWayQuickOpening.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Actuators/Valves/TwoWayQuickOpening.mo"	2022-03-10 09:57:39.672144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Actuators/Valves/TwoWayQuickOpening.mo"	2022-03-10 09:58:22.288149737 +0000
@@ -16,9 +16,10 @@
    parameter Real alpInv = 1/alp "Inverse of alpha";
 
 initial equation
-  // Since the flow model IBPSA.Fluid.BaseClasses.FlowModels.basicFlowFunction_m_flow computes
-  // 1/k^2, the parameter l must not be zero.
-  assert(l > 0, "Valve leakage parameter l must be bigger than zero.");
+// Since the flow model IBPSA.Fluid.BaseClasses.FlowModels.basicFlowFunction_m_flow computes
+// 1/k^2, the parameter l must not be zero.
+  assert(l > 0, "Valve leakage parameter l must be bigger than zero.");
+
 annotation (
 defaultComponentName="val",
 Documentation(info="
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Actuators/Valves/TwoWayTable.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Actuators/Valves/TwoWayTable.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Actuators/Valves/TwoWayTable.mo"	2022-03-10 09:57:39.672144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Actuators/Valves/TwoWayTable.mo"	2022-03-10 09:58:22.280149736 +0000
@@ -7,11 +7,11 @@
     annotation (choicesAllMatching=true, Placement(transformation(extent={{-80,
             60},{-60,80}})));
 
-  // Since the flow model IBPSA.Fluid.BaseClasses.FlowModels.basicFlowFunction_m_flow computes
-  // 1/k^2, the flowCharacteristics.phi[1] must not be zero.
-  // We therefore set a lower bound.
+// Since the flow model IBPSA.Fluid.BaseClasses.FlowModels.basicFlowFunction_m_flow computes
+  // 1/k^2, the flowCharacteristics.phi[1] must not be zero.
+  // We therefore set a lower bound.
 protected
-  Modelica.Blocks.Tables.CombiTable1D phiLooUp(
+  Modelica.Blocks.Tables.CombiTable1Dv phiLooUp(
     final tableOnFile=false,
     final table=[flowCharacteristics.y, cat(
         1,
@@ -31,8 +31,7 @@
   assert(abs(flowCharacteristics.phi[size(flowCharacteristics.phi, 1)] - 1) <
     Modelica.Constants.eps,
     "flowCharateristics.phi[end] must be 1.");
-
-  // Assert that the sequences are strictly monotonic increasing
+// Assert that the sequences are strictly monotonic increasing
   assert(IBPSA.Utilities.Math.Functions.isMonotonic(x=
     flowCharacteristics.y, strict=true), "The values for y in flowCharacteristics must be strictly monotone increasing.");
   assert(IBPSA.Utilities.Math.Functions.isMonotonic(x=
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Actuators/Valves/Validation/ThreeWayValveParameterization.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Actuators/Valves/Validation/ThreeWayValveParameterization.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Actuators/Valves/Validation/ThreeWayValveParameterization.mo"	2022-03-10 09:57:39.672144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Actuators/Valves/Validation/ThreeWayValveParameterization.mo"	2022-03-10 09:58:22.244149733 +0000
@@ -4,9 +4,9 @@
   extends Modelica.Icons.Example;
   package Medium = IBPSA.Media.Water "Medium in the component";
 
-  parameter Modelica.SIunits.MassFlowRate m_flow_nominal = 0.4
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = 0.4
     "Design mass flow rate";
-  parameter Modelica.SIunits.PressureDifference dp_nominal = 4500
+  parameter Modelica.Units.SI.PressureDifference dp_nominal = 4500
     "Design pressure drop";
 
   parameter Real Kv_SI = m_flow_nominal/sqrt(dp_nominal)
@@ -16,10 +16,10 @@
     "Kv (metric) flow coefficient [m3/h/(bar)^(1/2)]";
   parameter Real Cv = Kv_SI/(rhoStd*0.0631/1000/sqrt(6895))
     "Cv (US) flow coefficient [USG/min/(psi)^(1/2)]";
-  parameter Modelica.SIunits.Area Av = Kv_SI/sqrt(rhoStd)
+  parameter Modelica.Units.SI.Area Av = Kv_SI/sqrt(rhoStd)
     "Av (metric) flow coefficient";
 
-  parameter Modelica.SIunits.Density rhoStd=
+  parameter Modelica.Units.SI.Density rhoStd=
    Medium.density_pTX(101325, 273.15+4, Medium.X_default)
    "Standard density";
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Actuators/Valves/Validation/TwoWayValveParameterization.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Actuators/Valves/Validation/TwoWayValveParameterization.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Actuators/Valves/Validation/TwoWayValveParameterization.mo"	2022-03-10 09:57:39.672144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Actuators/Valves/Validation/TwoWayValveParameterization.mo"	2022-03-10 09:58:22.176149724 +0000
@@ -5,9 +5,9 @@
 
  package Medium = IBPSA.Media.Water;
 
-  parameter Modelica.SIunits.MassFlowRate m_flow_nominal = 0.4
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = 0.4
     "Design mass flow rate";
-  parameter Modelica.SIunits.PressureDifference dp_nominal = 4500
+  parameter Modelica.Units.SI.PressureDifference dp_nominal = 4500
     "Design pressure drop";
 
   parameter Real Kv_SI = m_flow_nominal/sqrt(dp_nominal)
@@ -17,10 +17,10 @@
     "Kv (metric) flow coefficient [m3/h/(bar)^(1/2)]";
   parameter Real Cv = Kv_SI/(rhoStd*0.0631/1000/sqrt(6895))
     "Cv (US) flow coefficient [USG/min/(psi)^(1/2)]";
-  parameter Modelica.SIunits.Area Av = Kv_SI/sqrt(rhoStd)
+  parameter Modelica.Units.SI.Area Av = Kv_SI/sqrt(rhoStd)
     "Av (metric) flow coefficient";
 
-  parameter Modelica.SIunits.Density rhoStd=
+  parameter Modelica.Units.SI.Density rhoStd=
    Medium.density_pTX(101325, 273.15+4, Medium.X_default)
    "Standard density";
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_dp_DerivativeCheck.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_dp_DerivativeCheck.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_dp_DerivativeCheck.mo"	2022-03-10 09:57:39.672144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_dp_DerivativeCheck.mo"	2022-03-10 09:58:22.124149717 +0000
@@ -6,12 +6,12 @@
   constant Real gain = 2 "Gain for computing the mass flow rate";
 
   parameter Real k = 0.35 "Flow coefficient";
-  parameter Modelica.SIunits.MassFlowRate m_flow_turbulent = 0.36
+  parameter Modelica.Units.SI.MassFlowRate m_flow_turbulent = 0.36
     "Mass flow rate where transition to turbulent flow occurs";
-  Modelica.SIunits.MassFlowRate m_flow "Mass flow rate";
-  Modelica.SIunits.MassFlowRate m_flow_comp "Comparison value for m_flow";
-  Modelica.SIunits.PressureDifference dp "Pressure drop";
-  Modelica.SIunits.MassFlowRate err "Integration error";
+  Modelica.Units.SI.MassFlowRate m_flow "Mass flow rate";
+  Modelica.Units.SI.MassFlowRate m_flow_comp "Comparison value for m_flow";
+  Modelica.Units.SI.PressureDifference dp "Pressure drop";
+  Modelica.Units.SI.MassFlowRate err "Integration error";
 initial equation
  m_flow = m_flow_comp;
 equation
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_dp_DerivativeCheck2.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_dp_DerivativeCheck2.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_dp_DerivativeCheck2.mo"	2022-03-10 09:57:39.672144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_dp_DerivativeCheck2.mo"	2022-03-10 09:58:22.112149716 +0000
@@ -4,38 +4,36 @@
   extends Modelica.Icons.Example;
 
   parameter Real k = 0.35 "Flow coefficient";
-  parameter Modelica.SIunits.MassFlowRate m_flow_turbulent = 0.36
+  parameter Modelica.Units.SI.MassFlowRate m_flow_turbulent = 0.36
     "Mass flow rate where transition to turbulent flow occurs";
-  Modelica.SIunits.MassFlowRate m_flow "Mass flow rate";
-  Modelica.SIunits.MassFlowRate m_flow_comp "Comparison value for m_flow";
+  Modelica.Units.SI.MassFlowRate m_flow "Mass flow rate";
+  Modelica.Units.SI.MassFlowRate m_flow_comp "Comparison value for m_flow";
   Real der_m_flow(unit="kg/s2") "1st order derivative of mass flow rate";
   Real der_m_flow_comp(unit="kg/s2")
     "2nd order derivative of comparison value for m_flow";
 
-  Modelica.SIunits.PressureDifference dp "Pressure drop";
-  Modelica.SIunits.MassFlowRate err_m_flow "Integration error for m_flow";
+  Modelica.Units.SI.PressureDifference dp "Pressure drop";
+  Modelica.Units.SI.MassFlowRate err_m_flow "Integration error for m_flow";
   Real err_der_m_flow(unit="kg/s2") "Integration error for der_m_flow";
 initial equation
   m_flow = m_flow_comp;
   der_m_flow = der_m_flow_comp;
-equation
-  // Multiply by 1 to avoid a warning due to unit mismatch,
-  // and raise to third power so that dp_der2 has positive and negative sign
-  // in IBPSA.Fluid.BaseClasses.FlowModels.basicFlowFunction_dp_der2
-  dp = 1*time^3;
+equation
+// Multiply by 1 to avoid a warning due to unit mismatch,
+// and raise to third power so that dp_der2 has positive and negative sign
+// in IBPSA.Fluid.BaseClasses.FlowModels.basicFlowFunction_dp_der2
+  dp = 1 * time ^ 3;
 
   m_flow = IBPSA.Fluid.BaseClasses.FlowModels.basicFlowFunction_dp(
               dp=dp,
               k=k,
-              m_flow_turbulent=m_flow_turbulent);
-
-  // Equate first and second order derivatives
-  der_m_flow      = der(m_flow);
+              m_flow_turbulent=m_flow_turbulent);
+// Equate first and second order derivatives
+  der_m_flow = der(m_flow);
   der_m_flow_comp = der(m_flow_comp);
-  der(der_m_flow) = der(der_m_flow_comp);
-
-  // Error control
-  err_m_flow = m_flow-m_flow_comp;
+  der(der_m_flow) = der(der_m_flow_comp);
+// Error control
+  err_m_flow = m_flow - m_flow_comp;
   assert(abs(err_m_flow) < 1E-3, "Error in implementation.");
   err_der_m_flow = der_m_flow-der_m_flow_comp;
   assert(abs(err_der_m_flow) < 1E-3, "Error in implementation.");
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_m_flow_DerivativeCheck.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_m_flow_DerivativeCheck.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_m_flow_DerivativeCheck.mo"	2022-03-10 09:57:39.672144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_m_flow_DerivativeCheck.mo"	2022-03-10 09:58:22.104149714 +0000
@@ -6,12 +6,12 @@
   constant Real gain = 0.5 "Gain for computing the mass flow rate";
 
   parameter Real k = 0.35 "Flow coefficient";
-  parameter Modelica.SIunits.MassFlowRate m_flow_turbulent = 0.36
+  parameter Modelica.Units.SI.MassFlowRate m_flow_turbulent = 0.36
     "Mass flow rate where transition to turbulent flow occurs";
-  Modelica.SIunits.MassFlowRate m_flow "Mass flow rate";
-  Modelica.SIunits.PressureDifference dp "Pressure drop";
-  Modelica.SIunits.PressureDifference dp_comp "Comparison value for dp";
-  Modelica.SIunits.PressureDifference err "Integration error";
+  Modelica.Units.SI.MassFlowRate m_flow "Mass flow rate";
+  Modelica.Units.SI.PressureDifference dp "Pressure drop";
+  Modelica.Units.SI.PressureDifference dp_comp "Comparison value for dp";
+  Modelica.Units.SI.PressureDifference err "Integration error";
 initial equation
  dp = dp_comp;
 equation
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_m_flow_DerivativeCheck2.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_m_flow_DerivativeCheck2.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_m_flow_DerivativeCheck2.mo"	2022-03-10 09:57:39.672144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/BaseClasses/FlowModels/Validation/BasicFlowFunction_m_flow_DerivativeCheck2.mo"	2022-03-10 09:58:22.092149712 +0000
@@ -7,38 +7,36 @@
   IBPSA.Utilities.Diagnostics.CheckEquality cheEqu2(threShold=1e-3)
     "Block for checking integration error";
   parameter Real k = 0.35 "Flow coefficient";
-  parameter Modelica.SIunits.MassFlowRate m_flow_turbulent = 0.36
+  parameter Modelica.Units.SI.MassFlowRate m_flow_turbulent = 0.36
     "Mass flow rate where transition to turbulent flow occurs";
-  Modelica.SIunits.PressureDifference dp "Pressure drop";
-  Modelica.SIunits.PressureDifference dp_comp "Comparison value for dp";
+  Modelica.Units.SI.PressureDifference dp "Pressure drop";
+  Modelica.Units.SI.PressureDifference dp_comp "Comparison value for dp";
   Real der_dp(unit="Pa/s") "1st order derivative of pressure drop";
   Real der_dp_comp(unit="Pa/s")
     "2nd order derivative of comparison value for pressure drop";
 
-  Modelica.SIunits.MassFlowRate m_flow "Mass flow rate";
+  Modelica.Units.SI.MassFlowRate m_flow "Mass flow rate";
 
-  Modelica.SIunits.PressureDifference err_dp "Integration error for dp";
+  Modelica.Units.SI.PressureDifference err_dp "Integration error for dp";
   Real err_der_dp(unit="Pa/s") "Integration error for der_dp";
 initial equation
   dp = dp_comp;
   der_dp = der_dp_comp;
-equation
-  // Divide by 8 to avoid a warning due to unit mismatch, and
-  // and raise to third power so that m_flow_der2 has positive and negative sign
-  // in IBPSA.Fluid.BaseClasses.FlowModels.basicFlowFunction_m_flow_der2
-  m_flow = time^3/8;
+equation
+// Divide by 8 to avoid a warning due to unit mismatch, and
+// and raise to third power so that m_flow_der2 has positive and negative sign
+// in IBPSA.Fluid.BaseClasses.FlowModels.basicFlowFunction_m_flow_der2
+  m_flow = time ^ 3 / 8;
 
   dp = IBPSA.Fluid.BaseClasses.FlowModels.basicFlowFunction_m_flow(
               m_flow=m_flow,
               k=k,
-              m_flow_turbulent=m_flow_turbulent);
-
-  // Equate first and second order derivatives
-  der_dp      = der(dp);
+              m_flow_turbulent=m_flow_turbulent);
+// Equate first and second order derivatives
+  der_dp = der(dp);
   der_dp_comp = der(dp_comp);
-  der(der_dp) = der(der_dp_comp);
-
-  // Error control
+  der(der_dp) = der(der_dp_comp);
+// Error control
   cheEqu1.u1 = dp;
   cheEqu1.u2 = dp_comp;
   err_dp = cheEqu1.y;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/BaseClasses/FlowModels/Validation/InverseFlowFunctions.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/BaseClasses/FlowModels/Validation/InverseFlowFunctions.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/BaseClasses/FlowModels/Validation/InverseFlowFunctions.mo"	2022-03-10 09:57:39.672144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/BaseClasses/FlowModels/Validation/InverseFlowFunctions.mo"	2022-03-10 09:58:22.068149710 +0000
@@ -1,15 +1,15 @@
 within BuildSysPro.IBPSA.Fluid.BaseClasses.FlowModels.Validation;
 model InverseFlowFunctions "Test model for flow function and its inverse"
   extends Modelica.Icons.Example;
- Modelica.SIunits.MassFlowRate m_flow;
- Modelica.SIunits.PressureDifference dp(displayUnit="Pa") "Pressure difference";
- Modelica.SIunits.PressureDifference dpCalc(displayUnit="Pa")
+ Modelica.Units.SI.MassFlowRate m_flow;
+ Modelica.Units.SI.PressureDifference dp(displayUnit="Pa") "Pressure difference";
+ Modelica.Units.SI.PressureDifference dpCalc(displayUnit="Pa")
     "Pressure difference computed by the flow functions";
- Modelica.SIunits.Pressure deltaDp(displayUnit="Pa")
+ Modelica.Units.SI.Pressure deltaDp(displayUnit="Pa")
     "Pressure difference between input and output to the functions";
- Modelica.SIunits.Time dTime= 2;
+ Modelica.Units.SI.Time dTime= 2;
  parameter Real k = 0.5;
- parameter Modelica.SIunits.MassFlowRate m_flow_nominal = 1 "Nominal flow rate";
+ parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = 1 "Nominal flow rate";
 equation
   dp = (time-0.5)/dTime * 20;
   m_flow=FlowModels.basicFlowFunction_dp(dp=dp, k=k, m_flow_turbulent=m_flow_nominal*0.3);
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/BaseClasses/FlowModels/Validation/InvertingBasicFlowFunction_dp.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/BaseClasses/FlowModels/Validation/InvertingBasicFlowFunction_dp.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/BaseClasses/FlowModels/Validation/InvertingBasicFlowFunction_dp.mo"	2022-03-10 09:57:39.672144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/BaseClasses/FlowModels/Validation/InvertingBasicFlowFunction_dp.mo"	2022-03-10 09:58:22.056149709 +0000
@@ -4,11 +4,11 @@
   extends Modelica.Icons.Example;
 
  parameter Real k = 0.5 "Flow coefficient";
- parameter Modelica.SIunits.MassFlowRate m_flow_nominal = 1.5
+ parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = 1.5
     "Nominal mass flow rate";
 
- Modelica.SIunits.MassFlowRate m_flow "Mass flow rate";
- Modelica.SIunits.PressureDifference dp(displayUnit="Pa") "Pressure difference";
+ Modelica.Units.SI.MassFlowRate m_flow "Mass flow rate";
+ Modelica.Units.SI.PressureDifference dp(displayUnit="Pa") "Pressure difference";
 equation
   m_flow = 4*(time-0.5);
   m_flow = FlowModels.basicFlowFunction_dp(dp=dp, k=k, m_flow_turbulent=m_flow_nominal*0.3);
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/BaseClasses/FlowModels/Validation/InvertingBasicFlowFunction_m_flow.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/BaseClasses/FlowModels/Validation/InvertingBasicFlowFunction_m_flow.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/BaseClasses/FlowModels/Validation/InvertingBasicFlowFunction_m_flow.mo"	2022-03-10 09:57:39.672144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/BaseClasses/FlowModels/Validation/InvertingBasicFlowFunction_m_flow.mo"	2022-03-10 09:58:22.048149708 +0000
@@ -4,11 +4,11 @@
   extends Modelica.Icons.Example;
 
  parameter Real k = 0.5 "Flow coefficient";
- parameter Modelica.SIunits.MassFlowRate m_flow_nominal = 0.5
+ parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = 0.5
     "Nominal mass flow rate";
 
- Modelica.SIunits.MassFlowRate m_flow "Mass flow rate";
- Modelica.SIunits.PressureDifference dp(displayUnit="Pa") "Pressure difference";
+ Modelica.Units.SI.MassFlowRate m_flow "Mass flow rate";
+ Modelica.Units.SI.PressureDifference dp(displayUnit="Pa") "Pressure difference";
 equation
   dp = 4*(time-0.5);
   dp = FlowModels.basicFlowFunction_m_flow(m_flow=m_flow, k=k, m_flow_turbulent=m_flow_nominal*0.3);
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/BaseClasses/FlowModels/basicFlowFunction_dp.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/BaseClasses/FlowModels/basicFlowFunction_dp.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/BaseClasses/FlowModels/basicFlowFunction_dp.mo"	2022-03-10 09:57:39.672144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/BaseClasses/FlowModels/basicFlowFunction_dp.mo"	2022-03-10 09:58:22.044149706 +0000
@@ -2,16 +2,16 @@
 function basicFlowFunction_dp
   "Function that computes mass flow rate for given pressure drop"
 
-  input Modelica.SIunits.PressureDifference dp(displayUnit="Pa")
+  input Modelica.Units.SI.PressureDifference dp(displayUnit="Pa")
     "Pressure difference between port_a and port_b (= port_a.p - port_b.p)";
   input Real k(min=0, unit="")
     "Flow coefficient, k=m_flow/sqrt(dp), with unit=(kg.m)^(1/2)";
-  input Modelica.SIunits.MassFlowRate m_flow_turbulent(min=0)
+  input Modelica.Units.SI.MassFlowRate m_flow_turbulent(min=0)
     "Mass flow rate where transition to turbulent flow occurs";
-  output Modelica.SIunits.MassFlowRate m_flow
+  output Modelica.Units.SI.MassFlowRate m_flow
     "Mass flow rate in design flow direction";
 protected
-  Modelica.SIunits.PressureDifference dp_turbulent = (m_flow_turbulent/k)^2
+  Modelica.Units.SI.PressureDifference dp_turbulent = (m_flow_turbulent/k)^2
     "Pressure where flow changes to turbulent";
   Real dpNorm=dp/dp_turbulent
     "Normalised pressure difference";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/BaseClasses/FlowModels/basicFlowFunction_dp_der.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/BaseClasses/FlowModels/basicFlowFunction_dp_der.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/BaseClasses/FlowModels/basicFlowFunction_dp_der.mo"	2022-03-10 09:57:39.672144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/BaseClasses/FlowModels/basicFlowFunction_dp_der.mo"	2022-03-10 09:58:22.032149705 +0000
@@ -3,18 +3,18 @@
   "1st derivative of function that computes mass flow rate for given pressure drop"
   extends Modelica.Icons.Function;
 
-  input Modelica.SIunits.PressureDifference dp(displayUnit="Pa")
+  input Modelica.Units.SI.PressureDifference dp(displayUnit="Pa")
     "Pressure difference between port_a and port_b (= port_a.p - port_b.p)";
   input Real k(min=0, unit="")
     "Flow coefficient, k=m_flow/sqrt(dp), with unit=(kg.m)^(1/2)";
-  input Modelica.SIunits.MassFlowRate m_flow_turbulent(min=0)
+  input Modelica.Units.SI.MassFlowRate m_flow_turbulent(min=0)
     "Mass flow rate where transition to turbulent flow occurs";
   input Real dp_der
     "Derivative of pressure difference between port_a and port_b (= port_a.p - port_b.p)";
   output Real m_flow_der(unit="kg/s2")
     "Derivative of mass flow rate in design flow direction";
 protected
-  Modelica.SIunits.PressureDifference dp_turbulent = (m_flow_turbulent/k)^2
+  Modelica.Units.SI.PressureDifference dp_turbulent = (m_flow_turbulent/k)^2
     "Pressure where flow changes to turbulent";
   Real dpNormSq=(dp/dp_turbulent)^2
     "Square of normalised pressure difference";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/BaseClasses/FlowModels/basicFlowFunction_dp_der2.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/BaseClasses/FlowModels/basicFlowFunction_dp_der2.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/BaseClasses/FlowModels/basicFlowFunction_dp_der2.mo"	2022-03-10 09:57:39.672144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/BaseClasses/FlowModels/basicFlowFunction_dp_der2.mo"	2022-03-10 09:58:22.028149704 +0000
@@ -3,11 +3,11 @@
   "2nd derivative of flow function2nd derivative of function that computes mass flow rate for given pressure drop"
   extends Modelica.Icons.Function;
 
-  input Modelica.SIunits.PressureDifference dp(displayUnit="Pa")
+  input Modelica.Units.SI.PressureDifference dp(displayUnit="Pa")
     "Pressure difference between port_a and port_b (= port_a.p - port_b.p)";
   input Real k(min=0, unit="")
     "Flow coefficient, k=m_flow/sqrt(dp), with unit=(kg.m)^(1/2)";
-  input Modelica.SIunits.MassFlowRate m_flow_turbulent(min=0)
+  input Modelica.Units.SI.MassFlowRate m_flow_turbulent(min=0)
     "Mass flow rate where transition to turbulent flow occurs";
   input Real dp_der
     "1st derivative of pressure difference between port_a and port_b (= port_a.p - port_b.p)";
@@ -16,7 +16,7 @@
   output Real m_flow_der2
     "2nd derivative of mass flow rate in design flow direction";
 protected
-  Modelica.SIunits.PressureDifference dp_turbulent = (m_flow_turbulent/k)^2
+  Modelica.Units.SI.PressureDifference dp_turbulent = (m_flow_turbulent/k)^2
     "Pressure where flow changes to turbulent";
   Real dpNorm=dp/dp_turbulent
     "Normalised pressure difference";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/BaseClasses/FlowModels/basicFlowFunction_m_flow.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/BaseClasses/FlowModels/basicFlowFunction_m_flow.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/BaseClasses/FlowModels/basicFlowFunction_m_flow.mo"	2022-03-10 09:57:39.672144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/BaseClasses/FlowModels/basicFlowFunction_m_flow.mo"	2022-03-10 09:58:22.016149702 +0000
@@ -2,16 +2,16 @@
 function basicFlowFunction_m_flow
   "Function that computes pressure drop for given mass flow rate"
 
-  input Modelica.SIunits.MassFlowRate m_flow
+  input Modelica.Units.SI.MassFlowRate m_flow
     "Mass flow rate in design flow direction";
   input Real k(unit="")
     "Flow coefficient, k=m_flow/sqrt(dp), with unit=(kg.m)^(1/2)";
-  input Modelica.SIunits.MassFlowRate m_flow_turbulent(min=0)
+  input Modelica.Units.SI.MassFlowRate m_flow_turbulent(min=0)
     "Mass flow rate where transition to turbulent flow occurs";
-  output Modelica.SIunits.PressureDifference dp(displayUnit="Pa")
+  output Modelica.Units.SI.PressureDifference dp(displayUnit="Pa")
     "Pressure difference between port_a and port_b (= port_a.p - port_b.p)";
 protected
-  Modelica.SIunits.PressureDifference dp_turbulent = (m_flow_turbulent/k)^2
+  Modelica.Units.SI.PressureDifference dp_turbulent = (m_flow_turbulent/k)^2
     "Pressure where flow changes to turbulent";
   Real m_flowNorm = m_flow/m_flow_turbulent
     "Normalised mass flow rate";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/BaseClasses/FlowModels/basicFlowFunction_m_flow_der.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/BaseClasses/FlowModels/basicFlowFunction_m_flow_der.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/BaseClasses/FlowModels/basicFlowFunction_m_flow_der.mo"	2022-03-10 09:57:39.672144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/BaseClasses/FlowModels/basicFlowFunction_m_flow_der.mo"	2022-03-10 09:58:22.008149702 +0000
@@ -3,18 +3,18 @@
   "1st derivative of function that computes pressure drop for given mass flow rate"
   extends Modelica.Icons.Function;
 
-  input Modelica.SIunits.MassFlowRate m_flow
+  input Modelica.Units.SI.MassFlowRate m_flow
     "Mass flow rate in design flow direction";
   input Real k(unit="")
     "Flow coefficient, k=m_flow/sqrt(dp), with unit=(kg.m)^(1/2)";
-  input Modelica.SIunits.MassFlowRate m_flow_turbulent(min=0)
+  input Modelica.Units.SI.MassFlowRate m_flow_turbulent(min=0)
     "Mass flow rate where transition to turbulent flow occurs";
   input Real m_flow_der(unit="kg/s2")
     "Derivative of mass flow rate in design flow direction";
   output Real dp_der
     "Derivative of pressure difference between port_a and port_b (= port_a.p - port_b.p)";
 protected
-  Modelica.SIunits.PressureDifference dp_turbulent = (m_flow_turbulent/k)^2
+  Modelica.Units.SI.PressureDifference dp_turbulent = (m_flow_turbulent/k)^2
     "Pressure where flow changes to turbulent";
   Real m_flowNormSq = (m_flow/m_flow_turbulent)^2
     "Square of normalised mass flow rate";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/BaseClasses/FlowModels/basicFlowFunction_m_flow_der2.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/BaseClasses/FlowModels/basicFlowFunction_m_flow_der2.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/BaseClasses/FlowModels/basicFlowFunction_m_flow_der2.mo"	2022-03-10 09:57:39.672144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/BaseClasses/FlowModels/basicFlowFunction_m_flow_der2.mo"	2022-03-10 09:58:22.000149701 +0000
@@ -3,11 +3,11 @@
   "2nd derivative of function that computes pressure drop for given mass flow rate"
   extends Modelica.Icons.Function;
 
-  input Modelica.SIunits.MassFlowRate m_flow
+  input Modelica.Units.SI.MassFlowRate m_flow
     "Mass flow rate in design flow direction";
   input Real k(unit="")
     "Flow coefficient, k=m_flow/sqrt(dp), with unit=(kg.m)^(1/2)";
-  input Modelica.SIunits.MassFlowRate m_flow_turbulent(min=0)
+  input Modelica.Units.SI.MassFlowRate m_flow_turbulent(min=0)
     "Mass flow rate where transition to turbulent flow occurs";
   input Real m_flow_der(unit="kg/s2")
     "1st derivative of mass flow rate in design flow direction";
@@ -16,7 +16,7 @@
   output Real dp_der2
     "2nd derivative of pressure difference between port_a and port_b (= port_a.p - port_b.p)";
 protected
-  Modelica.SIunits.PressureDifference dp_turbulent = (m_flow_turbulent/k)^2
+  Modelica.Units.SI.PressureDifference dp_turbulent = (m_flow_turbulent/k)^2
     "Pressure where flow changes to turbulent";
   Real m_flowNorm = m_flow/m_flow_turbulent
     "Normalised mass flow rate";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/BaseClasses/IndexMassFraction.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/BaseClasses/IndexMassFraction.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/BaseClasses/IndexMassFraction.mo"	2022-03-10 09:57:39.672144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/BaseClasses/IndexMassFraction.mo"	2022-03-10 09:58:21.992149701 +0000
@@ -9,7 +9,7 @@
 protected
   parameter Integer i_x(fixed=false) "Index of substance";
 initial algorithm
-  // Compute index of species vector that carries the substance name
+// Compute index of species vector that carries the substance name
   i_x :=-1;
     for i in 1:Medium.nXi loop
       if Modelica.Utilities.Strings.isEqual(string1=Medium.substanceNames[i],
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/BaseClasses/MassFlowRateMultiplier.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/BaseClasses/MassFlowRateMultiplier.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/BaseClasses/MassFlowRateMultiplier.mo"	2022-03-10 09:57:39.672144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/BaseClasses/MassFlowRateMultiplier.mo"	2022-03-10 09:58:21.980149699 +0000
@@ -7,17 +7,15 @@
 initial equation
   assert(k > Modelica.Constants.small or -k < -Modelica.Constants.small,
     "Gain must not be zero. Received k = " + String(k));
-equation
-    // Pressure drop in design flow direction
-  port_a.p = port_b.p;
-
-  // Mass balance (mass is not conserved by this model!)
-  port_b.m_flow = -k*port_a.m_flow;
-
-  // Specific enthalpy flow rate
+equation
+// Pressure drop in design flow direction
+  port_a.p = port_b.p;
+// Mass balance (mass is not conserved by this model!)
+  port_b.m_flow = -k * port_a.m_flow;
+// Specific enthalpy flow rate
   port_a.h_outflow = inStream(port_b.h_outflow);
-  port_b.h_outflow = inStream(port_a.h_outflow);
-  // Transport of substances
+  port_b.h_outflow = inStream(port_a.h_outflow);
+// Transport of substances
   port_a.Xi_outflow = inStream(port_b.Xi_outflow);
   port_b.Xi_outflow = inStream(port_a.Xi_outflow);
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/BaseClasses/PartialResistance.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/BaseClasses/PartialResistance.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/BaseClasses/PartialResistance.mo"	2022-03-10 09:57:39.672144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/BaseClasses/PartialResistance.mo"	2022-03-10 09:58:21.924149691 +0000
@@ -12,7 +12,7 @@
     "= true, use m_flow = f(dp) else dp = f(m_flow)"
     annotation (Evaluate=true, Dialog(tab="Advanced"));
 
-  parameter Modelica.SIunits.PressureDifference dp_nominal(displayUnit="Pa")
+  parameter Modelica.Units.SI.PressureDifference dp_nominal(displayUnit="Pa")
     "Pressure drop at nominal mass flow rate"
     annotation(Dialog(group = "Nominal condition"));
   parameter Boolean homotopyInitialization = true "= true, use homotopy method"
@@ -21,28 +21,26 @@
     "= true, use linear relation between m_flow and dp for any flow rate"
     annotation(Evaluate=true, Dialog(tab="Advanced"));
 
-  parameter Modelica.SIunits.MassFlowRate m_flow_turbulent(min=0)
+  parameter Modelica.Units.SI.MassFlowRate m_flow_turbulent(min=0)
     "Turbulent flow if |m_flow| >= m_flow_turbulent";
 
 protected
   parameter Medium.ThermodynamicState sta_default=
      Medium.setState_pTX(T=Medium.T_default, p=Medium.p_default, X=Medium.X_default);
-  parameter Modelica.SIunits.DynamicViscosity eta_default=Medium.dynamicViscosity(sta_default)
+  parameter Modelica.Units.SI.DynamicViscosity eta_default=Medium.dynamicViscosity(sta_default)
     "Dynamic viscosity, used to compute transition to turbulent flow regime";
 
-  final parameter Modelica.SIunits.MassFlowRate m_flow_nominal_pos = abs(m_flow_nominal)
+  final parameter Modelica.Units.SI.MassFlowRate m_flow_nominal_pos = abs(m_flow_nominal)
     "Absolute value of nominal flow rate";
-  final parameter Modelica.SIunits.PressureDifference dp_nominal_pos(displayUnit="Pa") = abs(dp_nominal)
+  final parameter Modelica.Units.SI.PressureDifference dp_nominal_pos(displayUnit="Pa") = abs(dp_nominal)
     "Absolute value of nominal pressure difference";
-equation
-  // Isenthalpic state transformation (no storage and no loss of energy)
+equation
+// Isenthalpic state transformation (no storage and no loss of energy)
   port_a.h_outflow = if allowFlowReversal then inStream(port_b.h_outflow) else Medium.h_default;
-  port_b.h_outflow = inStream(port_a.h_outflow);
-
-  // Mass balance (no storage)
-  port_a.m_flow + port_b.m_flow = 0;
-
-  // Transport of substances
+  port_b.h_outflow = inStream(port_a.h_outflow);
+// Mass balance (no storage)
+  port_a.m_flow + port_b.m_flow = 0;
+// Transport of substances
   port_a.Xi_outflow = if allowFlowReversal then inStream(port_b.Xi_outflow) else Medium.X_default[1:Medium.nXi];
   port_b.Xi_outflow = inStream(port_a.Xi_outflow);
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/BaseClasses/PartialThreeWayResistance.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/BaseClasses/PartialThreeWayResistance.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/BaseClasses/PartialThreeWayResistance.mo"	2022-03-10 09:57:39.672144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/BaseClasses/PartialThreeWayResistance.mo"	2022-03-10 09:58:21.908149689 +0000
@@ -25,11 +25,11 @@
     "Third port, can be either inlet or outlet"
     annotation (Placement(transformation(extent={{-10,-110},{10,-90}})));
 
-  parameter Modelica.SIunits.Time tau=10
+  parameter Modelica.Units.SI.Time tau=10
     "Time constant at nominal flow for dynamic energy and momentum balance"
     annotation(Dialog(tab="Dynamics", group="Nominal condition",
                enable=not energyDynamics == Modelica.Fluid.Types.Dynamics.SteadyState));
-  parameter Modelica.SIunits.MassFlowRate mDyn_flow_nominal
+  parameter Modelica.Units.SI.MassFlowRate mDyn_flow_nominal
     "Nominal mass flow rate for dynamic momentum and energy balance"
     annotation(Dialog(tab="Dynamics", group="Equations",
                enable=not energyDynamics == Modelica.Fluid.Types.Dynamics.SteadyState));
@@ -49,7 +49,7 @@
   parameter Boolean verifyFlowReversal = false
     "=true, to assert that the flow does not reverse when portFlowDirection_* does not equal Bidirectional"
     annotation(Dialog(tab="Advanced"));
-  parameter Modelica.SIunits.MassFlowRate m_flow_small
+  parameter Modelica.Units.SI.MassFlowRate m_flow_small
     "Small mass flow rate for checking flow reversal"
     annotation(Dialog(tab="Advanced",enable=verifyFlowReversal));
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Chillers/BaseClasses/Carnot.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Chillers/BaseClasses/Carnot.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Chillers/BaseClasses/Carnot.mo"	2022-03-10 09:57:39.672144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Chillers/BaseClasses/Carnot.mo"	2022-03-10 09:58:21.844149681 +0000
@@ -4,21 +4,21 @@
       m1_flow_nominal=QCon_flow_nominal/cp1_default/dTCon_nominal,
       m2_flow_nominal=QEva_flow_nominal/cp2_default/dTEva_nominal);
 
-  parameter Modelica.SIunits.HeatFlowRate QEva_flow_nominal(max=0)
+  parameter Modelica.Units.SI.HeatFlowRate QEva_flow_nominal(max=0)
     "Nominal cooling heat flow rate (QEva_flow_nominal < 0)"
     annotation (Dialog(group="Nominal condition"));
-  parameter Modelica.SIunits.HeatFlowRate QCon_flow_nominal(min=0)
+  parameter Modelica.Units.SI.HeatFlowRate QCon_flow_nominal(min=0)
     "Nominal heating flow rate"
     annotation (Dialog(group="Nominal condition"));
 
-  parameter Modelica.SIunits.TemperatureDifference dTEva_nominal(
+  parameter Modelica.Units.SI.TemperatureDifference dTEva_nominal(
     final max=0) = -10 "Temperature difference evaporator outlet-inlet"
     annotation (Dialog(group="Nominal condition"));
-  parameter Modelica.SIunits.TemperatureDifference dTCon_nominal(
+  parameter Modelica.Units.SI.TemperatureDifference dTCon_nominal(
     final min=0) = 10 "Temperature difference condenser outlet-inlet"
     annotation (Dialog(group="Nominal condition"));
 
-  // Efficiency
+// Efficiency
   parameter Boolean use_eta_Carnot_nominal = true
     "Set to true to use Carnot effectiveness etaCarnot_nominal rather than COP_nominal"
     annotation(Dialog(group="Efficiency"));
@@ -32,10 +32,10 @@
     "Coefficient of performance at TEva_nominal and TCon_nominal, used if use_eta_Carnot_nominal = false"
     annotation (Dialog(group="Efficiency", enable=not use_eta_Carnot_nominal));
 
-  parameter Modelica.SIunits.Temperature TCon_nominal = 303.15
+  parameter Modelica.Units.SI.Temperature TCon_nominal = 303.15
     "Condenser temperature used to compute COP_nominal if use_eta_Carnot_nominal=false"
     annotation (Dialog(group="Efficiency", enable=not use_eta_Carnot_nominal));
-  parameter Modelica.SIunits.Temperature TEva_nominal = 278.15
+  parameter Modelica.Units.SI.Temperature TEva_nominal = 278.15
     "Evaporator temperature used to compute COP_nominal if use_eta_Carnot_nominal=false"
     annotation (Dialog(group="Efficiency", enable=not use_eta_Carnot_nominal));
 
@@ -43,18 +43,18 @@
     "Coefficients for efficiency curve (need p(a=a, yPL=1)=1)"
     annotation (Dialog(group="Efficiency"));
 
-  parameter Modelica.SIunits.Pressure dp1_nominal(displayUnit="Pa")
+  parameter Modelica.Units.SI.Pressure dp1_nominal(displayUnit="Pa")
     "Pressure difference over condenser"
     annotation (Dialog(group="Nominal condition"));
-  parameter Modelica.SIunits.Pressure dp2_nominal(displayUnit="Pa")
+  parameter Modelica.Units.SI.Pressure dp2_nominal(displayUnit="Pa")
     "Pressure difference over evaporator"
     annotation (Dialog(group="Nominal condition"));
 
-  parameter Modelica.SIunits.TemperatureDifference TAppCon_nominal(min=0) = if cp1_default < 1500 then 5 else 2
+  parameter Modelica.Units.SI.TemperatureDifference TAppCon_nominal(min=0) = if cp1_default < 1500 then 5 else 2
     "Temperature difference between refrigerant and working fluid outlet in condenser"
     annotation (Dialog(group="Efficiency"));
 
-  parameter Modelica.SIunits.TemperatureDifference TAppEva_nominal(min=0) = if cp2_default < 1500 then 5 else 2
+  parameter Modelica.Units.SI.TemperatureDifference TAppEva_nominal(min=0) = if cp2_default < 1500 then 5 else 2
     "Temperature difference between refrigerant and working fluid outlet in evaporator"
     annotation (Dialog(group="Efficiency"));
 
@@ -82,17 +82,17 @@
     "Fraction of nominal flow rate where flow transitions to laminar"
     annotation (Dialog(tab="Flow resistance", group="Evaporator"));
 
-  parameter Modelica.SIunits.Time tau1=60
+  parameter Modelica.Units.SI.Time tau1=60
     "Time constant at nominal flow rate (used if energyDynamics1 <> Modelica.Fluid.Types.Dynamics.SteadyState)"
     annotation (Dialog(tab="Dynamics", group="Condenser"));
-  parameter Modelica.SIunits.Time tau2=60
+  parameter Modelica.Units.SI.Time tau2=60
     "Time constant at nominal flow rate (used if energyDynamics2 <> Modelica.Fluid.Types.Dynamics.SteadyState)"
     annotation (Dialog(tab="Dynamics", group="Evaporator"));
 
-  parameter Modelica.SIunits.Temperature T1_start=Medium1.T_default
+  parameter Modelica.Units.SI.Temperature T1_start=Medium1.T_default
     "Initial or guess value of set point"
     annotation (Dialog(tab="Dynamics", group="Condenser"));
-  parameter Modelica.SIunits.Temperature T2_start=Medium2.T_default
+  parameter Modelica.Units.SI.Temperature T2_start=Medium2.T_default
     "Initial or guess value of set point"
     annotation (Dialog(tab="Dynamics", group="Evaporator"));
 
@@ -136,11 +136,11 @@
     x2=TConAct - TEvaAct,
     deltaX=0.25) "Carnot efficiency";
 
-  Modelica.SIunits.Temperature TConAct(start=TCon_nominal + TAppCon_nominal)=
+  Modelica.Units.SI.Temperature TConAct(start=TCon_nominal + TAppCon_nominal)=
     Medium1.temperature(staB1) + QCon_flow/QCon_flow_nominal*TAppCon_nominal
     "Condenser temperature used to compute efficiency, taking into account pinch temperature between fluid and refrigerant";
 
-  Modelica.SIunits.Temperature TEvaAct(start=TEva_nominal - TAppEva_nominal)=
+  Modelica.Units.SI.Temperature TEvaAct(start=TEva_nominal - TAppEva_nominal)=
     Medium2.temperature(staB2) - QEva_flow/QEva_flow_nominal*TAppEva_nominal
     "Evaporator temperature used to compute efficiency, taking into account pinch temperature between fluid and refrigerant";
 
@@ -155,29 +155,29 @@
            (TUseAct_nominal / (TCon_nominal + TAppCon_nominal - (TEva_nominal - TAppEva_nominal)))
     "Carnot effectiveness (=COP/COP_Carnot) used to compute COP";
 
-  // For Carnot_y, computing etaPL = f(yPL) introduces a nonlinear equation.
-  // The parameter below avoids this if a = {1}.
+// For Carnot_y, computing etaPL = f(yPL) introduces a nonlinear equation.
+  // The parameter below avoids this if a = {1}.
   final parameter Boolean evaluate_etaPL=
     (size(a, 1) == 1 and abs(a[1] - 1)  < Modelica.Constants.eps)
     "Flag, true if etaPL should be computed as it depends on yPL"
     annotation(Evaluate=true);
 
-  final parameter Modelica.SIunits.Temperature TUseAct_nominal=
+  final parameter Modelica.Units.SI.Temperature TUseAct_nominal=
     if COP_is_for_cooling
       then TEva_nominal - TAppEva_nominal
       else TCon_nominal + TAppCon_nominal
     "Nominal evaporator temperature for chiller or condenser temperature for heat pump, taking into account pinch temperature between fluid and refrigerant";
-  Modelica.SIunits.Temperature TUseAct=if COP_is_for_cooling then TEvaAct else TConAct
+  Modelica.Units.SI.Temperature TUseAct=if COP_is_for_cooling then TEvaAct else TConAct
     "Temperature of useful heat (evaporator for chiller, condenser for heat pump), taking into account pinch temperature between fluid and refrigerant";
 
-  final parameter Modelica.SIunits.SpecificHeatCapacity cp1_default=
+  final parameter Modelica.Units.SI.SpecificHeatCapacity cp1_default=
     Medium1.specificHeatCapacityCp(Medium1.setState_pTX(
       p = Medium1.p_default,
       T = Medium1.T_default,
       X = Medium1.X_default))
     "Specific heat capacity of medium 1 at default medium state";
 
-  final parameter Modelica.SIunits.SpecificHeatCapacity cp2_default=
+  final parameter Modelica.Units.SI.SpecificHeatCapacity cp2_default=
     Medium2.specificHeatCapacityCp(Medium2.setState_pTX(
       p = Medium2.p_default,
       T = Medium2.T_default,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Chillers/BaseClasses/PartialCarnot_y.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Chillers/BaseClasses/PartialCarnot_y.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Chillers/BaseClasses/PartialCarnot_y.mo"	2022-03-10 09:57:39.672144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Chillers/BaseClasses/PartialCarnot_y.mo"	2022-03-10 09:58:21.796149676 +0000
@@ -29,7 +29,7 @@
       final homotopyInitialization=homotopyInitialization,
       final Q_flow_nominal=QEva_flow_nominal));
 
-  parameter Modelica.SIunits.Power P_nominal(min=0)
+  parameter Modelica.Units.SI.Power P_nominal(min=0)
     "Nominal compressor power (at y=1)"
     annotation (Dialog(group="Nominal condition"));
 
@@ -38,9 +38,9 @@
     annotation (Placement(transformation(extent={{-140,70},{-100,110}})));
 
 protected
-  Modelica.SIunits.HeatFlowRate QCon_flow_internal(start=QCon_flow_nominal)=
+  Modelica.Units.SI.HeatFlowRate QCon_flow_internal(start=QCon_flow_nominal)=
     P - QEva_flow_internal "Condenser heat input";
-  Modelica.SIunits.HeatFlowRate QEva_flow_internal(start=QEva_flow_nominal)=
+  Modelica.Units.SI.HeatFlowRate QEva_flow_internal(start=QEva_flow_nominal)=
     if COP_is_for_cooling then -COP * P else (1-COP)*P "Evaporator heat input";
 
   Modelica.Blocks.Sources.RealExpression yEva_flow_in(
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Chillers/Carnot_TEva.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Chillers/Carnot_TEva.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Chillers/Carnot_TEva.mo"	2022-03-10 09:57:39.672144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Chillers/Carnot_TEva.mo"	2022-03-10 09:58:21.776149672 +0000
@@ -27,7 +27,7 @@
       final energyDynamics=energyDynamics,
       final homotopyInitialization=homotopyInitialization));
 
-  parameter Modelica.SIunits.HeatFlowRate QEva_flow_min(
+  parameter Modelica.Units.SI.HeatFlowRate QEva_flow_min(
     max=0) = -Modelica.Constants.inf
     "Maximum heat flow rate for cooling (negative)";
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Chillers/Examples/Carnot_TEva.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Chillers/Examples/Carnot_TEva.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Chillers/Examples/Carnot_TEva.mo"	2022-03-10 09:57:39.672144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Chillers/Examples/Carnot_TEva.mo"	2022-03-10 09:58:21.740149669 +0000
@@ -5,14 +5,14 @@
  package Medium1 = IBPSA.Media.Water "Medium model";
  package Medium2 = IBPSA.Media.Water "Medium model";
 
-  parameter Modelica.SIunits.TemperatureDifference dTEva_nominal=-10
+  parameter Modelica.Units.SI.TemperatureDifference dTEva_nominal=-10
     "Temperature difference evaporator outlet-inlet";
-  parameter Modelica.SIunits.TemperatureDifference dTCon_nominal=10
+  parameter Modelica.Units.SI.TemperatureDifference dTCon_nominal=10
     "Temperature difference condenser outlet-inlet";
   parameter Real COPc_nominal = 3 "Chiller COP";
-  parameter Modelica.SIunits.HeatFlowRate QEva_flow_nominal = -100E3
+  parameter Modelica.Units.SI.HeatFlowRate QEva_flow_nominal = -100E3
     "Evaporator heat flow rate";
-  parameter Modelica.SIunits.MassFlowRate m2_flow_nominal=
+  parameter Modelica.Units.SI.MassFlowRate m2_flow_nominal=
     QEva_flow_nominal/dTEva_nominal/4200
     "Nominal mass flow rate at chilled water side";
 
@@ -63,7 +63,7 @@
   Modelica.Blocks.Math.Add QCon_flow(k2=-1) "Condenser heat flow rate"
     annotation (Placement(transformation(extent={{48,-50},{68,-30}})));
 
-  final parameter Modelica.SIunits.SpecificHeatCapacity cp1_default=
+  final parameter Modelica.Units.SI.SpecificHeatCapacity cp1_default=
     Medium1.specificHeatCapacityCp(Medium1.setState_pTX(
       Medium1.p_default,
       Medium1.T_default,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Chillers/Examples/Carnot_y.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Chillers/Examples/Carnot_y.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Chillers/Examples/Carnot_y.mo"	2022-03-10 09:57:39.672144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Chillers/Examples/Carnot_y.mo"	2022-03-10 09:58:21.720149666 +0000
@@ -4,18 +4,18 @@
  package Medium1 = IBPSA.Media.Water "Medium model";
  package Medium2 = IBPSA.Media.Water "Medium model";
 
-  parameter Modelica.SIunits.Power P_nominal=10E3
+  parameter Modelica.Units.SI.Power P_nominal=10E3
     "Nominal compressor power (at y=1)";
-  parameter Modelica.SIunits.TemperatureDifference dTEva_nominal=-10
+  parameter Modelica.Units.SI.TemperatureDifference dTEva_nominal=-10
     "Temperature difference evaporator outlet-inlet";
-  parameter Modelica.SIunits.TemperatureDifference dTCon_nominal=10
+  parameter Modelica.Units.SI.TemperatureDifference dTCon_nominal=10
     "Temperature difference condenser outlet-inlet";
   parameter Real COPc_nominal = 3 "Chiller COP";
 
-  parameter Modelica.SIunits.MassFlowRate m2_flow_nominal=
+  parameter Modelica.Units.SI.MassFlowRate m2_flow_nominal=
      -P_nominal*COPc_nominal/dTEva_nominal/4200
     "Nominal mass flow rate at chilled water side";
-  parameter Modelica.SIunits.MassFlowRate m1_flow_nominal=
+  parameter Modelica.Units.SI.MassFlowRate m1_flow_nominal=
     m2_flow_nominal*(COPc_nominal+1)/COPc_nominal
     "Nominal mass flow rate at condenser water wide";
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Chillers/Validation/CarnotVerifyCOP.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Chillers/Validation/CarnotVerifyCOP.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Chillers/Validation/CarnotVerifyCOP.mo"	2022-03-10 09:57:39.672144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Chillers/Validation/CarnotVerifyCOP.mo"	2022-03-10 09:58:21.692149662 +0000
@@ -7,32 +7,32 @@
 
   parameter Real COP_nominal = 3 "Coefficient of performance";
 
-  parameter Modelica.SIunits.Temperature TCon_nominal = 273.15+30
+  parameter Modelica.Units.SI.Temperature TCon_nominal = 273.15+30
     "Nominal condensor temperature";
-  parameter Modelica.SIunits.Temperature TEva_nominal = 273.15 + 5
+  parameter Modelica.Units.SI.Temperature TEva_nominal = 273.15 + 5
     "Nominal evaporator temperature";
 
-  parameter Modelica.SIunits.HeatFlowRate QEva_flow_nominal=-10E3
+  parameter Modelica.Units.SI.HeatFlowRate QEva_flow_nominal=-10E3
     "Nominal evaporator heat flow rate (QEva_flow_nominal < 0)";
 
-  parameter Modelica.SIunits.HeatFlowRate QCon_flow_nominal=-QEva_flow_nominal * (1+1/COP_nominal)
+  parameter Modelica.Units.SI.HeatFlowRate QCon_flow_nominal=-QEva_flow_nominal * (1+1/COP_nominal)
     "Nominal condenser heat flow rate (QCon_flow_nominal > 0)";
 
-  parameter Modelica.SIunits.TemperatureDifference dTEva_nominal=-10
+  parameter Modelica.Units.SI.TemperatureDifference dTEva_nominal=-10
     "Temperature difference evaporator outlet-inlet";
 
-  parameter Modelica.SIunits.TemperatureDifference dTCon_nominal=10
+  parameter Modelica.Units.SI.TemperatureDifference dTCon_nominal=10
     "Temperature difference condenser outlet-inlet";
 
-  parameter Modelica.SIunits.MassFlowRate mCon_flow_nominal=
+  parameter Modelica.Units.SI.MassFlowRate mCon_flow_nominal=
     QCon_flow_nominal/cp_default/dTCon_nominal
     "Nominal mass flow rate at condenser";
 
-  parameter Modelica.SIunits.MassFlowRate mEva_flow_nominal=
+  parameter Modelica.Units.SI.MassFlowRate mEva_flow_nominal=
     QEva_flow_nominal/cp_default/dTEva_nominal
     "Nominal mass flow rate of evaporator";
 
-  final parameter Modelica.SIunits.SpecificHeatCapacity cp_default=
+  final parameter Modelica.Units.SI.SpecificHeatCapacity cp_default=
     Medium.specificHeatCapacityCp(Medium.setState_pTX(
       p = Medium.p_default,
       T = Medium.T_default,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Chillers/Validation/CarnotVerifyEtaCarnot.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Chillers/Validation/CarnotVerifyEtaCarnot.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Chillers/Validation/CarnotVerifyEtaCarnot.mo"	2022-03-10 09:57:39.672144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Chillers/Validation/CarnotVerifyEtaCarnot.mo"	2022-03-10 09:58:21.608149652 +0000
@@ -8,42 +8,42 @@
   parameter Real etaCarnot_nominal=0.315046
     "Carnot effectiveness (=COP/COP_Carnot) used if use_eta_Carnot_nominal = true";
 
-  parameter Modelica.SIunits.TemperatureDifference TAppCon_nominal=2
+  parameter Modelica.Units.SI.TemperatureDifference TAppCon_nominal=2
     "Temperature difference between refrigerant and working fluid outlet in condenser";
 
-  parameter Modelica.SIunits.TemperatureDifference TAppEva_nominal=2
+  parameter Modelica.Units.SI.TemperatureDifference TAppEva_nominal=2
     "Temperature difference between refrigerant and working fluid outlet in evaporator";
 
   parameter Real COP_nominal = etaCarnot_nominal * (TEva_nominal-TAppEva_nominal)/
     (TCon_nominal + TAppCon_nominal - (TEva_nominal-TAppEva_nominal))  "Coefficient of performance";
 
-  parameter Modelica.SIunits.Temperature TCon_nominal = 273.15+30
+  parameter Modelica.Units.SI.Temperature TCon_nominal = 273.15+30
     "Nominal condensor temperature";
 
-  parameter Modelica.SIunits.Temperature TEva_nominal = 273.15 + 5
+  parameter Modelica.Units.SI.Temperature TEva_nominal = 273.15 + 5
     "Nominal evaporator temperature";
 
-  parameter Modelica.SIunits.HeatFlowRate QEva_flow_nominal=-10E3
+  parameter Modelica.Units.SI.HeatFlowRate QEva_flow_nominal=-10E3
     "Nominal evaporator heat flow rate (QEva_flow_nominal < 0)";
 
-  parameter Modelica.SIunits.HeatFlowRate QCon_flow_nominal=-QEva_flow_nominal * (1+1/COP_nominal)
+  parameter Modelica.Units.SI.HeatFlowRate QCon_flow_nominal=-QEva_flow_nominal * (1+1/COP_nominal)
     "Nominal condenser heat flow rate (QCon_flow_nominal > 0)";
 
-  parameter Modelica.SIunits.TemperatureDifference dTEva_nominal=-10
+  parameter Modelica.Units.SI.TemperatureDifference dTEva_nominal=-10
     "Temperature difference evaporator outlet-inlet";
 
-  parameter Modelica.SIunits.TemperatureDifference dTCon_nominal=10
+  parameter Modelica.Units.SI.TemperatureDifference dTCon_nominal=10
     "Temperature difference condenser outlet-inlet";
 
-  parameter Modelica.SIunits.MassFlowRate mCon_flow_nominal=
+  parameter Modelica.Units.SI.MassFlowRate mCon_flow_nominal=
     QCon_flow_nominal/cp_default/dTCon_nominal
     "Nominal mass flow rate at condenser";
 
-  parameter Modelica.SIunits.MassFlowRate mEva_flow_nominal=
+  parameter Modelica.Units.SI.MassFlowRate mEva_flow_nominal=
     QEva_flow_nominal/cp_default/dTEva_nominal
     "Nominal mass flow rate of evaporator";
 
-  final parameter Modelica.SIunits.SpecificHeatCapacity cp_default=
+  final parameter Modelica.Units.SI.SpecificHeatCapacity cp_default=
     Medium.specificHeatCapacityCp(Medium.setState_pTX(
       p = Medium.p_default,
       T = Medium.T_default,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Chillers/Validation/Carnot_TEva_2ndLaw.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Chillers/Validation/Carnot_TEva_2ndLaw.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Chillers/Validation/Carnot_TEva_2ndLaw.mo"	2022-03-10 09:57:39.672144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Chillers/Validation/Carnot_TEva_2ndLaw.mo"	2022-03-10 09:58:21.576149648 +0000
@@ -5,18 +5,18 @@
 
   package Medium = IBPSA.Media.Water "Medium model";
 
-  parameter Modelica.SIunits.TemperatureDifference dTEva_nominal=-4
+  parameter Modelica.Units.SI.TemperatureDifference dTEva_nominal=-4
     "Temperature difference evaporator outlet-inlet";
-  parameter Modelica.SIunits.TemperatureDifference dTCon_nominal=4
+  parameter Modelica.Units.SI.TemperatureDifference dTCon_nominal=4
     "Temperature difference condenser outlet-inlet";
   parameter Real COPc_nominal = 3 "Chiller COP";
-  parameter Modelica.SIunits.HeatFlowRate QEva_flow_nominal = -100E3
+  parameter Modelica.Units.SI.HeatFlowRate QEva_flow_nominal = -100E3
     "Evaporator heat flow rate";
-  final parameter Modelica.SIunits.MassFlowRate m2_flow_nominal=
+  final parameter Modelica.Units.SI.MassFlowRate m2_flow_nominal=
     QEva_flow_nominal/dTEva_nominal/4200
     "Nominal mass flow rate at chilled water side";
 
-  final parameter Modelica.SIunits.MassFlowRate m1_flow_nominal=
+  final parameter Modelica.Units.SI.MassFlowRate m1_flow_nominal=
     -m2_flow_nominal/dTCon_nominal*dTEva_nominal
     "Nominal mass flow rate at condeser water side";
 
@@ -58,15 +58,15 @@
         Modelica.Media.Interfaces.PartialMedium
       "Medium model";
 
-    parameter Modelica.SIunits.TemperatureDifference dTEva_nominal
+    parameter Modelica.Units.SI.TemperatureDifference dTEva_nominal
       "Temperature difference evaporator outlet-inlet";
-    parameter Modelica.SIunits.TemperatureDifference dTCon_nominal
+    parameter Modelica.Units.SI.TemperatureDifference dTCon_nominal
       "Temperature difference condenser outlet-inlet";
-    parameter Modelica.SIunits.HeatFlowRate QEva_flow_nominal
+    parameter Modelica.Units.SI.HeatFlowRate QEva_flow_nominal
       "Evaporator heat flow rate";
-    parameter Modelica.SIunits.MassFlowRate m1_flow_nominal
+    parameter Modelica.Units.SI.MassFlowRate m1_flow_nominal
       "Nominal mass flow rate at condeser water side";
-    parameter Modelica.SIunits.MassFlowRate m2_flow_nominal
+    parameter Modelica.Units.SI.MassFlowRate m2_flow_nominal
       "Nominal mass flow rate at chilled water side";
 
     IBPSA.Fluid.Sources.MassFlowSource_T sou1(
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Chillers/Validation/Carnot_TEva_reverseFlow.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Chillers/Validation/Carnot_TEva_reverseFlow.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Chillers/Validation/Carnot_TEva_reverseFlow.mo"	2022-03-10 09:57:39.672144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Chillers/Validation/Carnot_TEva_reverseFlow.mo"	2022-03-10 09:58:21.480149636 +0000
@@ -5,17 +5,17 @@
  package Medium1 = IBPSA.Media.Water "Medium model";
  package Medium2 = IBPSA.Media.Water "Medium model";
 
-  parameter Modelica.SIunits.TemperatureDifference dTEva_nominal=-10
+  parameter Modelica.Units.SI.TemperatureDifference dTEva_nominal=-10
     "Temperature difference evaporator inlet-outlet";
-  parameter Modelica.SIunits.TemperatureDifference dTCon_nominal=10
+  parameter Modelica.Units.SI.TemperatureDifference dTCon_nominal=10
     "Temperature difference condenser outlet-inlet";
   parameter Real COPc_nominal = 3 "Chiller COP";
-  parameter Modelica.SIunits.HeatFlowRate QEva_flow_nominal = -100E3
+  parameter Modelica.Units.SI.HeatFlowRate QEva_flow_nominal = -100E3
     "Evaporator heat flow rate";
-  parameter Modelica.SIunits.MassFlowRate m2_flow_nominal=
+  parameter Modelica.Units.SI.MassFlowRate m2_flow_nominal=
     QEva_flow_nominal/dTEva_nominal/4200
     "Nominal mass flow rate at chilled water side";
-  parameter Modelica.SIunits.MassFlowRate m1_flow_nominal=
+  parameter Modelica.Units.SI.MassFlowRate m1_flow_nominal=
     m2_flow_nominal*(COPc_nominal+1)/COPc_nominal
     "Nominal mass flow rate at condenser water wide";
 
@@ -67,7 +67,7 @@
   Modelica.Blocks.Math.Add QCon_flow(k2=-1) "Condenser heat flow rate"
     annotation (Placement(transformation(extent={{40,-50},{60,-30}})));
 
-  final parameter Modelica.SIunits.SpecificHeatCapacity cp1_default=
+  final parameter Modelica.Units.SI.SpecificHeatCapacity cp1_default=
     Medium1.specificHeatCapacityCp(Medium1.setState_pTX(
       Medium1.p_default,
       Medium1.T_default,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Delays/DelayFirstOrder.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Delays/DelayFirstOrder.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Delays/DelayFirstOrder.mo"	2022-03-10 09:57:39.672144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Delays/DelayFirstOrder.mo"	2022-03-10 09:58:21.436149630 +0000
@@ -4,11 +4,11 @@
   extends IBPSA.Fluid.MixingVolumes.MixingVolume(final V=V_nominal,
       final mSenFac=1);
 
-  parameter Modelica.SIunits.Time tau = 60 "Time constant at nominal flow"
+  parameter Modelica.Units.SI.Time tau = 60 "Time constant at nominal flow"
     annotation (Dialog(tab="Dynamics", group="Nominal condition"));
 
 protected
-   parameter Modelica.SIunits.Volume V_nominal = m_flow_nominal*tau/rho_default
+   parameter Modelica.Units.SI.Volume V_nominal = m_flow_nominal*tau/rho_default
     "Volume of delay element";
   annotation (    Icon(coordinateSystem(preserveAspectRatio=true,  extent={{-100,-100},{100,
             100}}), graphics={Ellipse(
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Delays/Examples/Delay.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Delays/Examples/Delay.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Delays/Examples/Delay.mo"	2022-03-10 09:57:39.672144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Delays/Examples/Delay.mo"	2022-03-10 09:58:21.424149629 +0000
@@ -1,8 +1,8 @@
 within BuildSysPro.IBPSA.Fluid.Delays.Examples;
 model Delay
   extends Modelica.Icons.Example;
-// We set X_default to a small enough value to avoid saturation at the medium temperature
-// that is used in this model.
+  // We set X_default to a small enough value to avoid saturation at the medium temperature
+  // that is used in this model.
  package Medium = IBPSA.Media.Air (X_default={0.001,0.999});
 
     Modelica.Blocks.Sources.Constant PAtm(k=101325)
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Examples/FlowSystem/Basic.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Examples/FlowSystem/Basic.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Examples/FlowSystem/Basic.mo"	2022-03-10 09:57:39.672144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Examples/FlowSystem/Basic.mo"	2022-03-10 09:58:21.404149626 +0000
@@ -109,7 +109,7 @@
   Modelica.Blocks.Sources.Sine sine(
     amplitude=0.5,
     offset=0.5,
-    freqHz=0.001)
+f    =0.001)
     "Valve control signal"
     annotation (Placement(transformation(extent={{-140,20},{-120,40}})));
   IBPSA.Fluid.Actuators.Valves.ThreeWayLinear valSouth(
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Examples/Performance/Example1v2.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Examples/Performance/Example1v2.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Examples/Performance/Example1v2.mo"	2022-03-10 09:57:39.672144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Examples/Performance/Example1v2.mo"	2022-03-10 09:58:21.208149601 +0000
@@ -1,7 +1,7 @@
 within BuildSysPro.IBPSA.Fluid.Examples.Performance;
 model Example1v2 "Example 1 model with mixing volume"
   extends IBPSA.Fluid.Examples.Performance.BaseClasses.Example1;
-  parameter Modelica.SIunits.Time tau=10 "Time constant at nominal flow";
+  parameter Modelica.Units.SI.Time tau=10 "Time constant at nominal flow";
 
   Fluid.Delays.DelayFirstOrder[nRes.k] vol(
     redeclare each package Medium = Medium,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Examples/Performance/Example2.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Examples/Performance/Example2.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Examples/Performance/Example2.mo"	2022-03-10 09:57:39.672144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Examples/Performance/Example2.mo"	2022-03-10 09:58:21.192149598 +0000
@@ -3,9 +3,9 @@
   extends Modelica.Icons.Example;
 
   package Medium = Modelica.Media.Water.ConstantPropertyLiquidWater;
-  parameter Modelica.SIunits.MassFlowRate m_flow_nominal=1
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=1
     "Nominal mass flow rate";
-  parameter Modelica.SIunits.PressureDifference dp_nominal=1
+  parameter Modelica.Units.SI.PressureDifference dp_nominal=1
     "Pressure drop at nominal mass flow rate";
   Fluid.Movers.FlowControlled_dp pump_dp(
     redeclare package Medium = Medium,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Examples/Performance/Example3.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Examples/Performance/Example3.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Examples/Performance/Example3.mo"	2022-03-10 09:57:39.672144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Examples/Performance/Example3.mo"	2022-03-10 09:58:21.176149596 +0000
@@ -4,9 +4,9 @@
   extends Modelica.Icons.Example;
 
   package Medium = Modelica.Media.Water.ConstantPropertyLiquidWater;
-  parameter Modelica.SIunits.MassFlowRate m_flow_nominal=1
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=1
     "Nominal mass flow rate";
-  parameter Modelica.SIunits.PressureDifference dp_nominal=1
+  parameter Modelica.Units.SI.PressureDifference dp_nominal=1
     "Pressure drop at nominal mass flow rate";
   Fluid.Movers.FlowControlled_m_flow pump(
     redeclare package Medium = Medium,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Examples/Performance/Example4.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Examples/Performance/Example4.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Examples/Performance/Example4.mo"	2022-03-10 09:57:39.672144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Examples/Performance/Example4.mo"	2022-03-10 09:58:21.156149594 +0000
@@ -6,7 +6,7 @@
   parameter Boolean allowFlowReversal=false
     "= false to simplify equations, assuming, but not enforcing, no flow reversal";
 
-  Modelica.SIunits.MassFlowRate m_condens = min(0, -vol.ports[1].m_flow*(bou.X[1] - xSat.X[1]))
+  Modelica.Units.SI.MassFlowRate m_condens = min(0, -vol.ports[1].m_flow*(bou.X[1] - xSat.X[1]))
     "Water vapor mass flow rate";
   Fluid.MixingVolumes.MixingVolumeMoistAir vol(
     nPorts=2,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Examples/Performance/Example6.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Examples/Performance/Example6.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Examples/Performance/Example6.mo"	2022-03-10 09:57:39.672144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Examples/Performance/Example6.mo"	2022-03-10 09:58:21.116149589 +0000
@@ -4,10 +4,9 @@
   extends Modelica.Icons.Example;
   parameter Integer nCapacitors = 500;
   parameter Real R = 0.001;
-   //annotation(Evaluate=true);
+   //annotation(Evaluate=true);
   parameter Real C = 1000;
-   //annotation(Evaluate=true);
-
+   //annotation(Evaluate=true);
   Real[nCapacitors] T;
   Real[nCapacitors+1] Q_flow;
 initial equation
@@ -19,8 +18,7 @@
     Q_flow[i] = (T[i-1] - T[i])/R;
     der(T[i])=(Q_flow[i]-Q_flow[i+1])/C;
   end for;
-  Q_flow[nCapacitors+1]=0; //adiabatic
-
+  Q_flow[nCapacitors+1]=0; //adiabatic
   annotation (Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-120,
             -40},{40,60}}),    graphics={Text(
           extent={{-62,24},{-18,-4}},
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Examples/Performance/PressureDrop/ParallelDp.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Examples/Performance/PressureDrop/ParallelDp.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Examples/Performance/PressureDrop/ParallelDp.mo"	2022-03-10 09:57:39.672144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Examples/Performance/PressureDrop/ParallelDp.mo"	2022-03-10 09:58:21.072149583 +0000
@@ -4,9 +4,9 @@
   extends Modelica.Icons.Example;
   package Medium = IBPSA.Media.Air;
   parameter Integer nRes(min=2) = 10 "Number of resistances";
-  parameter Modelica.SIunits.PressureDifference dp_nominal=1
+  parameter Modelica.Units.SI.PressureDifference dp_nominal=1
     "Pressure drop at nominal mass flow rate";
-  parameter Modelica.SIunits.MassFlowRate m_flow_nominal=1
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=1
     "Nominal mass flow rate";
 
   Sources.Boundary_pT sou(
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Examples/Performance/PressureDrop/ParallelFlow.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Examples/Performance/PressureDrop/ParallelFlow.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Examples/Performance/PressureDrop/ParallelFlow.mo"	2022-03-10 09:57:39.672144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Examples/Performance/PressureDrop/ParallelFlow.mo"	2022-03-10 09:58:21.008149575 +0000
@@ -4,9 +4,9 @@
   extends Modelica.Icons.Example;
   package Medium = IBPSA.Media.Air;
   parameter Integer nRes(min=2) = 10 "Number of resistances";
-  parameter Modelica.SIunits.PressureDifference dp_nominal=1
+  parameter Modelica.Units.SI.PressureDifference dp_nominal=1
     "Pressure drop at nominal mass flow rate";
-  parameter Modelica.SIunits.MassFlowRate m_flow_nominal=1
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=1
     "Nominal mass flow rate";
 
   Sources.MassFlowSource_T sou(
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Examples/Performance/PressureDrop/SeriesDp.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Examples/Performance/PressureDrop/SeriesDp.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Examples/Performance/PressureDrop/SeriesDp.mo"	2022-03-10 09:57:39.672144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Examples/Performance/PressureDrop/SeriesDp.mo"	2022-03-10 09:58:20.992149573 +0000
@@ -4,9 +4,9 @@
   extends Modelica.Icons.Example;
   package Medium = IBPSA.Media.Air;
   parameter Integer nRes(min=2) = 10 "Number of resistances";
-  parameter Modelica.SIunits.PressureDifference dp_nominal=1
+  parameter Modelica.Units.SI.PressureDifference dp_nominal=1
     "Pressure drop at nominal mass flow rate";
-  parameter Modelica.SIunits.MassFlowRate m_flow_nominal=1
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=1
     "Nominal mass flow rate";
 
   Sources.Boundary_pT sou(
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Examples/Performance/PressureDrop/SeriesFlow.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Examples/Performance/PressureDrop/SeriesFlow.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Examples/Performance/PressureDrop/SeriesFlow.mo"	2022-03-10 09:57:39.672144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Examples/Performance/PressureDrop/SeriesFlow.mo"	2022-03-10 09:58:20.968149571 +0000
@@ -4,9 +4,9 @@
   extends Modelica.Icons.Example;
   package Medium = IBPSA.Media.Air;
   parameter Integer nRes(min=2) = 10 "Number of resistances";
-  parameter Modelica.SIunits.PressureDifference dp_nominal=1
+  parameter Modelica.Units.SI.PressureDifference dp_nominal=1
     "Pressure drop at nominal mass flow rate";
-  parameter Modelica.SIunits.MassFlowRate m_flow_nominal=1
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=1
     "Nominal mass flow rate";
 
   Sources.MassFlowSource_T sou(
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Examples/Performance/PressureDrop/SeriesParallelDp.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Examples/Performance/PressureDrop/SeriesParallelDp.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Examples/Performance/PressureDrop/SeriesParallelDp.mo"	2022-03-10 09:57:39.672144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Examples/Performance/PressureDrop/SeriesParallelDp.mo"	2022-03-10 09:58:20.948149567 +0000
@@ -4,9 +4,9 @@
   extends Modelica.Icons.Example;
   package Medium = IBPSA.Media.Air;
   parameter Integer nRes(min=2) = 10 "Number of resistances";
-  parameter Modelica.SIunits.PressureDifference dp_nominal=1
+  parameter Modelica.Units.SI.PressureDifference dp_nominal=1
     "Pressure drop at nominal mass flow rate";
-  parameter Modelica.SIunits.MassFlowRate m_flow_nominal=1
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=1
     "Nominal mass flow rate";
 
   Sources.Boundary_pT sou(
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Examples/Performance/PressureDrop/SeriesParallelFlow.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Examples/Performance/PressureDrop/SeriesParallelFlow.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Examples/Performance/PressureDrop/SeriesParallelFlow.mo"	2022-03-10 09:57:39.672144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Examples/Performance/PressureDrop/SeriesParallelFlow.mo"	2022-03-10 09:58:20.928149565 +0000
@@ -4,9 +4,9 @@
   extends Modelica.Icons.Example;
   package Medium = IBPSA.Media.Air;
   parameter Integer nRes(min=2) = 10 "Number of resistances";
-  parameter Modelica.SIunits.PressureDifference dp_nominal=1
+  parameter Modelica.Units.SI.PressureDifference dp_nominal=1
     "Pressure drop at nominal mass flow rate";
-  parameter Modelica.SIunits.MassFlowRate m_flow_nominal=1
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=1
     "Nominal mass flow rate";
 
   Sources.MassFlowSource_T sou(
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Examples/SimpleHouse.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Examples/SimpleHouse.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Examples/SimpleHouse.mo"	2022-03-10 09:57:39.672144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Examples/SimpleHouse.mo"	2022-03-10 09:58:20.896149561 +0000
@@ -6,18 +6,18 @@
   package MediumAir = IBPSA.Media.Air;
   package MediumWater = IBPSA.Media.Water;
 
-  parameter Modelica.SIunits.Area A_wall = 100 "Wall area";
-  parameter Modelica.SIunits.Area A_win = 5 "Window area";
+  parameter Modelica.Units.SI.Area A_wall = 100 "Wall area";
+  parameter Modelica.Units.SI.Area A_win = 5 "Window area";
   parameter Real g_win(min=0, max=1, unit="1") = 0.3 "Solar heat gain coefficient of window";
-  parameter Modelica.SIunits.Volume V_zone = A_wall*3 "Wall area";
-  parameter Modelica.SIunits.HeatFlowRate QHea_nominal = 700
+  parameter Modelica.Units.SI.Volume V_zone = A_wall*3 "Wall area";
+  parameter Modelica.Units.SI.HeatFlowRate QHea_nominal = 700
     "Nominal capacity of heating system";
-  parameter Modelica.SIunits.MassFlowRate mWat_flow_nominal=QHea_nominal/10/4200
+  parameter Modelica.Units.SI.MassFlowRate mWat_flow_nominal=QHea_nominal/10/4200
     "Nominal mass flow rate for water loop";
-  parameter Modelica.SIunits.MassFlowRate mAir_flow_nominal=V_zone*2*1.2/3600
+  parameter Modelica.Units.SI.MassFlowRate mAir_flow_nominal=V_zone*2*1.2/3600
     "Nominal mass flow rate for air loop";
 
-  parameter Modelica.SIunits.PressureDifference dpAir_nominal=200
+  parameter Modelica.Units.SI.PressureDifference dpAir_nominal=200
     "Pressure drop at nominal mass flow rate for air loop";
   parameter Boolean allowFlowReversal=false
     "= false because flow will not reverse in these circuits";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/Adaptors/Examples/ThermalZoneHVACNoExhaust.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/Adaptors/Examples/ThermalZoneHVACNoExhaust.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/Adaptors/Examples/ThermalZoneHVACNoExhaust.mo"	2022-03-10 09:57:39.672144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/Adaptors/Examples/ThermalZoneHVACNoExhaust.mo"	2022-03-10 09:58:20.844149554 +0000
@@ -10,12 +10,12 @@
     "Adaptor for an HVAC system that is exposed through an FMI interface"
     annotation (Placement(transformation(extent={{20,0},{40,20}})));
 
-  parameter Modelica.SIunits.HeatFlowRate Q_flow_nominal = 30*6*6
+  parameter Modelica.Units.SI.HeatFlowRate Q_flow_nominal = 30*6*6
     "Nominal heat loss of the room";
 
-  parameter Modelica.SIunits.Volume VRoo = 6*6*2.7 "Room volume";
+  parameter Modelica.Units.SI.Volume VRoo = 6*6*2.7 "Room volume";
 
-  parameter Modelica.SIunits.MassFlowRate m_flow_nominal=VRoo*2*1.2/3600
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=VRoo*2*1.2/3600
     "Nominal mass flow rate";
 
   IBPSA.Fluid.FMI.Adaptors.ThermalZone con(redeclare package Medium =
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/Adaptors/HVAC.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/Adaptors/HVAC.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/Adaptors/HVAC.mo"	2022-03-10 09:57:39.676144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/Adaptors/HVAC.mo"	2022-03-10 09:58:20.768149545 +0000
@@ -6,9 +6,9 @@
       Modelica.Media.Interfaces.PartialMedium "Medium model within the source"
      annotation (choicesAllMatching=true);
 
-  // Don't use annotation(Dialog(connectorSizing=true)) for nPorts because
-  // otherwise, in IBPSA.Fluid.FMI.ExportContainers.Examples.FMUs.HVACZones
-  // the fluid ports can not be assigned between the different zones by the user.
+// Don't use annotation(Dialog(connectorSizing=true)) for nPorts because
+  // otherwise, in IBPSA.Fluid.FMI.ExportContainers.Examples.FMUs.HVACZones
+  // the fluid ports can not be assigned between the different zones by the user.
   parameter Integer nPorts(min=2) "Number of ports"
       annotation (Dialog(connectorSizing=false));
 
@@ -97,8 +97,10 @@
        Medium.nC > 0 "Trace substance concentration of supply air"
     annotation (Placement(transformation(extent={{-40,10},{-20,30}})));
 
-  ///////////////////////////////////////////////////////////////////////////
-  // Internal blocks
+
+///////////////////////////////////////////////////////////////////////////
+  // Internal blocks
+
   block RealVectorExpression
     "Set vector output signal to a time varying vector Real expression"
     parameter Integer n "Dimension of output signal";
@@ -139,7 +141,6 @@
 "));
 
   end RealVectorExpression;
-
 initial equation
    assert(Medium.nXi < 2,
    "The medium must have zero or one independent mass fraction Medium.nXi.");
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/Adaptors/Inlet.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/Adaptors/Inlet.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/Adaptors/Inlet.mo"	2022-03-10 09:57:39.676144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/Adaptors/Inlet.mo"	2022-03-10 09:58:20.728149541 +0000
@@ -42,32 +42,29 @@
 initial equation
    assert(Medium.nXi < 2,
    "The medium must have zero or one independent mass fraction Medium.nXi.");
-equation
-  // To locally balance the model, the pressure is only imposed at the
-  // outlet model.
-  // The sign is negative because inlet.m_flow > 0
-  // means that fluid flows out of this component
-  -port_b.m_flow     = inlet.m_flow;
+equation
+// To locally balance the model, the pressure is only imposed at the
+// outlet model.
+// The sign is negative because inlet.m_flow > 0
+// means that fluid flows out of this component
+  -port_b.m_flow = inlet.m_flow;
 
   port_b.h_outflow  = Medium.specificEnthalpy_pTX(
                         p = p_in_internal,
                         T = inlet.forward.T,
                         X = if Medium.nXi == 1 then cat(1, {X_w_in_internal}, {1-X_w_in_internal}) else zeros(Medium.nX));
 
-  port_b.C_outflow  = inlet.forward.C;
-
-  // Conditional connector for mass fraction for forward flow
-  if Medium.nXi == 0 then
-    X_w_in_internal = 0;
-  else
-    connect(X_w_in_internal, inlet.forward.X_w);
+  port_b.C_outflow  = inlet.forward.C;
+// Conditional connector for mass fraction for forward flow
+  if Medium.nXi == 0 then
+    X_w_in_internal = 0;
+  else
+    connect(X_w_in_internal, inlet.forward.X_w);
   end if;
-  port_b.Xi_outflow = fill(X_w_in_internal, Medium.nXi);
-
-  // Conditional connector for flow reversal
-  connect(inlet.backward, bacPro_internal);
-
-  // Mass fraction for reverse flow
+  port_b.Xi_outflow = fill(X_w_in_internal, Medium.nXi);
+// Conditional connector for flow reversal
+  connect(inlet.backward, bacPro_internal);
+// Mass fraction for reverse flow
   X_w_out_internal = if Medium.nXi > 0 and allowFlowReversal then inStream(port_b.Xi_outflow[1]) else 0;
   connect(bacPro_internal.X_w, X_w_out_internal);
 
@@ -80,13 +77,12 @@
   else
     bacPro_internal.T  = Medium.T_default;
     bacPro_internal.C  = fill(0, Medium.nC);
-  end if;
-
-  // Conditional connectors for pressure
-  if use_p_in then
-  connect(inlet.p, p_in_internal);
-  else
-    p_in_internal = Medium.p_default;
+  end if;
+// Conditional connectors for pressure
+  if use_p_in then
+    connect(inlet.p, p_in_internal);
+  else
+    p_in_internal = Medium.p_default;
   end if;
   connect(p, p_in_internal);
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/Adaptors/Outlet.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/Adaptors/Outlet.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/Adaptors/Outlet.mo"	2022-03-10 09:57:39.676144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/Adaptors/Outlet.mo"	2022-03-10 09:58:20.708149537 +0000
@@ -54,42 +54,38 @@
     h = inStream(port_a.h_outflow),
     X = cat(1, inStream(port_a.Xi_outflow), {1-sum(inStream(port_a.Xi_outflow))}));
 
-  inStream(port_a.C_outflow)  = outlet.forward.C;
-
-  // Mass fraction for forward flow
+  inStream(port_a.C_outflow)  = outlet.forward.C;
+// Mass fraction for forward flow
   X_w_in_internal = if Medium.nXi > 0 then inStream(port_a.Xi_outflow[1]) else 0;
-  connect(outlet.forward.X_w, X_w_in_internal);
-
-  // Conditional connector for mass fraction for backward flow
-  if Medium.nXi > 0 and allowFlowReversal then
-    connect(X_w_out_internal, outlet.backward.X_w);
-  else
-    X_w_out_internal = 0;
+  connect(outlet.forward.X_w, X_w_in_internal);
+// Conditional connector for mass fraction for backward flow
+  if Medium.nXi > 0 and allowFlowReversal then
+    connect(X_w_out_internal, outlet.backward.X_w);
+  else
+    X_w_out_internal = 0;
   end if;
-  port_a.Xi_outflow = fill(X_w_out_internal, Medium.nXi);
-
-  // Conditional connector for flow reversal
-  connect(outlet.backward, bacPro_internal);
-  if not allowFlowReversal then
-    bacPro_internal.T  = Medium.T_default;
-    bacPro_internal.C  = fill(0, Medium.nC);
-    if Medium.nXi > 0 then
-      // This test for nXi is needed for IBPSA.Fluid.FMI.Validation.HeaterFan_noReverseFlow
-      // to work with IBPSA.Media.Water
-      connect(bacPro_internal.X_w, X_w_out_internal);
-    end if;
+  port_a.Xi_outflow = fill(X_w_out_internal, Medium.nXi);
+// Conditional connector for flow reversal
+  connect(outlet.backward, bacPro_internal);
+  if not allowFlowReversal then
+    bacPro_internal.T = Medium.T_default;
+    bacPro_internal.C = fill(0, Medium.nC);
+    if Medium.nXi > 0 then
+// This test for nXi is needed for IBPSA.Fluid.FMI.Validation.HeaterFan_noReverseFlow
+// to work with IBPSA.Media.Water
+      connect(bacPro_internal.X_w, X_w_out_internal);
+    end if;
   end if;
   bacPro_internal.T  = Medium.temperature_phX(
     p = p_in_internal,
     h = port_a.h_outflow,
     X = port_a.Xi_outflow);
-  bacPro_internal.C  = port_a.C_outflow;
-
-  // Conditional connectors for pressure
-  if use_p_in then
-    connect(outlet.p, p_in_internal);
-  else
-    p_in_internal = Medium.p_default;
+  bacPro_internal.C  = port_a.C_outflow;
+// Conditional connectors for pressure
+  if use_p_in then
+    connect(outlet.p, p_in_internal);
+  else
+    p_in_internal = Medium.p_default;
   end if;
   connect(p, p_in_internal);
   port_a.p = p_in_internal;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/Adaptors/ThermalZone.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/Adaptors/ThermalZone.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/Adaptors/ThermalZone.mo"	2022-03-10 09:57:39.676144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/Adaptors/ThermalZone.mo"	2022-03-10 09:58:20.692149535 +0000
@@ -6,9 +6,9 @@
       Modelica.Media.Interfaces.PartialMedium
     "Medium model within the source" annotation (choicesAllMatching=true);
 
-  // Don't use annotation(Dialog(connectorSizing=true)) for nPorts because
-  // otherwise, in IBPSA.Fluid.FMI.ExportContainers.Examples.FMUs.HVACZones
-  // the fluid ports can not be assigned between the different zones by the user.
+// Don't use annotation(Dialog(connectorSizing=true)) for nPorts because
+  // otherwise, in IBPSA.Fluid.FMI.ExportContainers.Examples.FMUs.HVACZones
+  // the fluid ports can not be assigned between the different zones by the user.
   parameter Integer nPorts(final min=2) "Number of fluid ports"
     annotation (Dialog(connectorSizing=false));
 
@@ -79,8 +79,10 @@
   Modelica.Blocks.Sources.Constant const(final k=0) "Outputs zero"
     annotation (Placement(transformation(extent={{30,68},{50,88}})));
 
-  ///////////////////////////////////////////////////////////////////////////
-  // Internal blocks
+
+///////////////////////////////////////////////////////////////////////////
+  // Internal blocks
+
   block RealVectorExpression
     "Set vector output signal to a time varying vector Real expression"
     parameter Integer n "Dimension of output signal";
@@ -151,7 +153,7 @@
       "Internal connector for water vapor concentration in kg/kg total air";
 
   equation
-  // Conditional connector
+// Conditional connector
   connect(Xi_internal, Xi);
   if Medium.nXi == 0 then
     Xi_internal = zeros(Medium.nXi);
@@ -182,7 +184,6 @@
 

 "));
   end x_i_toX_w;
-
 initial equation
    assert(Medium.nXi < 2,
    "The medium must have zero or one independent mass fraction Medium.nXi.");
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/BaseClasses/X_w_toX.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/BaseClasses/X_w_toX.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/BaseClasses/X_w_toX.mo"	2022-03-10 09:57:39.676144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/BaseClasses/X_w_toX.mo"	2022-03-10 09:58:20.628149528 +0000
@@ -15,14 +15,14 @@
 protected
   Modelica.Blocks.Interfaces.RealInput X_w_internal(final unit="kg/kg")
     "Internal connector for water mass fraction per total air mass";
-equation
-  // Conditional connector
+equation
+// Conditional connector
   connect(X_w_internal, X_w);
   if Medium.nXi == 0 then
     X_w_internal = 0;
-  end if;
-  // Assign vector to output connector
- X = if Medium.nX == 1 then ones(Medium.nX) else cat(1, {X_w_internal}, {1-X_w_internal});
+  end if;
+// Assign vector to output connector
+  X = if Medium.nX == 1 then ones(Medium.nX) else cat(1, {X_w_internal}, {1 - X_w_internal});
   annotation (Documentation(revisions="
 
    
 
  • 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/BaseClasses/hOut_toT.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/BaseClasses/hOut_toT.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/BaseClasses/hOut_toT.mo"	2022-03-10 09:57:39.676144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/BaseClasses/hOut_toT.mo"	2022-03-10 09:58:20.616149526 +0000
@@ -21,7 +21,7 @@
     "Internal connector for water vapor concentration in kg/kg total air";
 
 equation
-  // Conditional connectors
+// Conditional connectors
   connect(Xi_internal, Xi);
   if Medium.nXi == 0 then
     Xi_internal = zeros(Medium.nXi);
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/Conversion/AirToOutlet.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/Conversion/AirToOutlet.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/Conversion/AirToOutlet.mo"	2022-03-10 09:57:39.676144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/Conversion/AirToOutlet.mo"	2022-03-10 09:58:20.592149522 +0000
@@ -91,7 +91,7 @@
     final unit = "kg/kg")
     "Internal connector for water vapor concentration in kg/kg total air";
 
-   // Conditional connectors for the backward flowing medium
+// Conditional connectors for the backward flowing medium
   IBPSA.Fluid.FMI.Interfaces.FluidProperties bacPro_internal(redeclare final
       package Medium =       Medium)
     "Internal connector for fluid properties for back flow";
@@ -111,35 +111,30 @@
     "Internal connector for zone water vapor mass fraction, required if X_wZon is removed";
   Modelica.Blocks.Interfaces.RealOutput CZon_internal[Medium.nC]
     "Internal connector for trace substances";
-equation
-  // Conditional connectors
+equation
+// Conditional connectors
   connect(Xi_internal, Xi);
   if Medium.nXi == 0 then
     Xi_internal = zeros(Medium.nXi);
   end if;
 
-  outlet.m_flow = m_flow;
-  // If m_flow <= 0, output default properties.
-  // This avoids that changes in state variables of the return
-  // air are propagated to the room model which may trigger an
-  // evaluation of the room ODE, even though Q=max(0, m_flow) c_p (TSup-TZon).
-  connect(outlet.forward.X_w,  X_w_internal);
-
-  if m_flow >= 0 then
-    outlet.forward.T = Medium.temperature_phX(
-    p=Medium.p_default,
-    h=h,
-    X=cat(1, Xi_internal, {1-sum(Xi_internal)}));
-    // Xi internal has 1 or zero components, hence we can use the sum.
-    X_w_internal = sum(Xi_internal);
-    outlet.forward.C = C;
-  else
-    outlet.forward.T = Medium.T_default;
-    X_w_internal = Medium.X_default[1];
-    outlet.forward.C  = zeros(Medium.nC);
-  end if;
-
-  // Connectors for backward flow
+  outlet.m_flow = m_flow;
+// If m_flow <= 0, output default properties.
+// This avoids that changes in state variables of the return
+// air are propagated to the room model which may trigger an
+// evaluation of the room ODE, even though Q=max(0, m_flow) c_p (TSup-TZon).
+  connect(outlet.forward.X_w, X_w_internal);
+  if m_flow >= 0 then
+    outlet.forward.T = Medium.temperature_phX(p = Medium.p_default, h = h, X = cat(1, Xi_internal, {1 - sum(Xi_internal)}));
+// Xi internal has 1 or zero components, hence we can use the sum.
+    X_w_internal = sum(Xi_internal);
+    outlet.forward.C = C;
+  else
+    outlet.forward.T = Medium.T_default;
+    X_w_internal = Medium.X_default[1];
+    outlet.forward.C = zeros(Medium.nC);
+  end if;
+// Connectors for backward flow
   connect(TAirZon_internal, TAirZon);
   bacPro_internal.T = TAirZon_internal;
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/Conversion/InletToAir.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/Conversion/InletToAir.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/Conversion/InletToAir.mo"	2022-03-10 09:57:39.676144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/Conversion/InletToAir.mo"	2022-03-10 09:58:20.564149520 +0000
@@ -95,8 +95,8 @@
     "Internal connector for zone water vapor mass fraction, required if X_wZon is removed";
   Modelica.Blocks.Interfaces.RealInput CZon_internal[Medium.nC]
     "Internal connector for trace substances";
-equation
-  // Conditional connectors
+equation
+// Conditional connectors
   connect(TAirZon_internal, TAirZon);
   bacPro_internal.T = TAirZon_internal;
 
@@ -112,21 +112,16 @@
     CZon_internal = zeros(Medium.nC);
   end if;
 
-  connect(inlet.backward, bacPro_internal);
-
-  // Mass flow rate
-  m_flow = inlet.m_flow;
-
-  // Temperature
-  T = inlet.forward.T;
-
-  // Vapor concentration
- // X_w_internal = inlet.forward.X_w;
-  connect(inlet.forward.X_w, X_w);
-
-  // Species concentration
+  connect(inlet.backward, bacPro_internal);
+// Mass flow rate
+  m_flow = inlet.m_flow;
+// Temperature
+  T = inlet.forward.T;
+// Vapor concentration
+// X_w_internal = inlet.forward.X_w;
+  connect(inlet.forward.X_w, X_w);
+// Species concentration
   C = inlet.forward.C;
-
   annotation (defaultComponentName = "con",
     Documentation(info="
 
    
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/ExportContainers/Examples/FMUs/Fan.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/ExportContainers/Examples/FMUs/Fan.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/ExportContainers/Examples/FMUs/Fan.mo"	2022-03-10 09:57:39.676144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/ExportContainers/Examples/FMUs/Fan.mo"	2022-03-10 09:58:20.364149494 +0000
@@ -7,9 +7,9 @@
       final use_inputFilter=false,
       energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState));
 
-  parameter Modelica.SIunits.MassFlowRate m_flow_nominal=0.01
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=0.01
     "Nominal mass flow rate";
-  parameter Modelica.SIunits.PressureDifference dp_nominal(displayUnit="Pa")=500
+  parameter Modelica.Units.SI.PressureDifference dp_nominal(displayUnit="Pa")=500
     "Pressure drop at nominal mass flow rate";
 
   Modelica.Blocks.Interfaces.RealInput dp_in(min=0, final unit="Pa")
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/ExportContainers/Examples/FMUs/HVACZone.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/ExportContainers/Examples/FMUs/HVACZone.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/ExportContainers/Examples/FMUs/HVACZone.mo"	2022-03-10 09:57:39.676144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/ExportContainers/Examples/FMUs/HVACZone.mo"	2022-03-10 09:58:20.344149492 +0000
@@ -11,50 +11,50 @@
     "= true to allow flow reversal, false restricts to design direction (inlet -> outlet)"
     annotation(Dialog(tab="Assumptions"), Evaluate=true);
 
-  //////////////////////////////////////////////////////////
-  // Heat recovery effectiveness
+//////////////////////////////////////////////////////////
+  // Heat recovery effectiveness
   parameter Real eps = 0.8 "Heat recovery effectiveness";
 
   /////////////////////////////////////////////////////////
   // Air temperatures at design conditions
-  parameter Modelica.SIunits.Temperature TASup_nominal = 273.15+18
+  parameter Modelica.Units.SI.Temperature TASup_nominal = 273.15+18
     "Nominal air temperature supplied to room";
-  parameter Modelica.SIunits.Temperature TRooSet = 273.15+24
+  parameter Modelica.Units.SI.Temperature TRooSet = 273.15+24
     "Nominal room air temperature";
-  parameter Modelica.SIunits.Temperature TOut_nominal = 273.15+30
+  parameter Modelica.Units.SI.Temperature TOut_nominal = 273.15+30
     "Design outlet air temperature";
-  parameter Modelica.SIunits.Temperature THeaRecLvg=
+  parameter Modelica.Units.SI.Temperature THeaRecLvg=
     TOut_nominal - eps*(TOut_nominal-TRooSet)
     "Air temperature leaving the heat recovery";
 
-  /////////////////////////////////////////////////////////
-  // Cooling loads and air mass flow rates
+/////////////////////////////////////////////////////////
+  // Cooling loads and air mass flow rates
   parameter Real UA(unit="W/K") = 10E3 "Average UA-value of the room";
-  parameter Modelica.SIunits.HeatFlowRate QRooInt_flow=
+  parameter Modelica.Units.SI.HeatFlowRate QRooInt_flow=
      1000 "Internal heat gains of the room";
-  parameter Modelica.SIunits.HeatFlowRate QRooC_flow_nominal=
+  parameter Modelica.Units.SI.HeatFlowRate QRooC_flow_nominal=
     -QRooInt_flow-UA/30*(TOut_nominal-TRooSet)
     "Nominal cooling load of the room";
-  parameter Modelica.SIunits.MassFlowRate mA_flow_nominal=
+  parameter Modelica.Units.SI.MassFlowRate mA_flow_nominal=
     1.3*QRooC_flow_nominal/1006/(TASup_nominal-TRooSet)
     "Nominal air mass flow rate, increased by factor 1.3 to allow for recovery after temperature setback";
-  parameter Modelica.SIunits.TemperatureDifference dTFan = 2
+  parameter Modelica.Units.SI.TemperatureDifference dTFan = 2
     "Estimated temperature raise across fan that needs to be made up by the cooling coil";
-  parameter Modelica.SIunits.HeatFlowRate QCoiC_flow_nominal=4*
+  parameter Modelica.Units.SI.HeatFlowRate QCoiC_flow_nominal=4*
     (QRooC_flow_nominal + mA_flow_nominal*(TASup_nominal-THeaRecLvg-dTFan)*1006)
     "Cooling load of coil, taking into account economizer, and increased due to latent heat removal";
 
   /////////////////////////////////////////////////////////
   // Water temperatures and mass flow rates
-  parameter Modelica.SIunits.Temperature TWSup_nominal = 273.15+16
+  parameter Modelica.Units.SI.Temperature TWSup_nominal = 273.15+16
     "Water supply temperature";
-  parameter Modelica.SIunits.Temperature TWRet_nominal = 273.15+12
+  parameter Modelica.Units.SI.Temperature TWRet_nominal = 273.15+12
     "Water return temperature";
-  parameter Modelica.SIunits.MassFlowRate mW_flow_nominal=
+  parameter Modelica.Units.SI.MassFlowRate mW_flow_nominal=
     QCoiC_flow_nominal/(TWRet_nominal-TWSup_nominal)/4200
     "Nominal water mass flow rate";
-  /////////////////////////////////////////////////////////
-  // HVAC models
+  /////////////////////////////////////////////////////////
+  // HVAC models
   Modelica.Blocks.Sources.Constant zero(k=0) "Zero output signal"
     annotation (Placement(transformation(extent={{100,-100},{120,-80}})));
   Movers.FlowControlled_m_flow fan(
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/ExportContainers/Examples/FMUs/HVACZones.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/ExportContainers/Examples/FMUs/HVACZones.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/ExportContainers/Examples/FMUs/HVACZones.mo"	2022-03-10 09:57:39.676144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/ExportContainers/Examples/FMUs/HVACZones.mo"	2022-03-10 09:58:20.300149486 +0000
@@ -13,51 +13,51 @@
     "= true to allow flow reversal, false restricts to design direction (inlet -> outlet)"
     annotation(Dialog(tab="Assumptions"), Evaluate=true);
 
- // parameter Modelica.SIunits.Volume V=6*10*3 "Room volume";
-  //////////////////////////////////////////////////////////
-  // Heat recovery effectiveness
+// parameter Modelica.SIunits.Volume V=6*10*3 "Room volume";
+  //////////////////////////////////////////////////////////
+  // Heat recovery effectiveness
   parameter Real eps = 0.8 "Heat recovery effectiveness";
 
   /////////////////////////////////////////////////////////
   // Air temperatures at design conditions
-  parameter Modelica.SIunits.Temperature TASup_nominal = 273.15+18
+  parameter Modelica.Units.SI.Temperature TASup_nominal = 273.15+18
     "Nominal air temperature supplied to room";
-  parameter Modelica.SIunits.Temperature TRooSet = 273.15+24
+  parameter Modelica.Units.SI.Temperature TRooSet = 273.15+24
     "Nominal room air temperature";
-  parameter Modelica.SIunits.Temperature TOut_nominal = 273.15+30
+  parameter Modelica.Units.SI.Temperature TOut_nominal = 273.15+30
     "Design outlet air temperature";
-  parameter Modelica.SIunits.Temperature THeaRecLvg=
+  parameter Modelica.Units.SI.Temperature THeaRecLvg=
     TOut_nominal - eps*(TOut_nominal-TRooSet)
     "Air temperature leaving the heat recovery";
 
-  /////////////////////////////////////////////////////////
-  // Cooling loads and air mass flow rates
+/////////////////////////////////////////////////////////
+  // Cooling loads and air mass flow rates
   parameter Real UA(unit="W/K") = 10E3 "Average UA-value of the room";
-  parameter Modelica.SIunits.HeatFlowRate QRooInt_flow=
+  parameter Modelica.Units.SI.HeatFlowRate QRooInt_flow=
      1000 "Internal heat gains of the room";
-  parameter Modelica.SIunits.HeatFlowRate QRooC_flow_nominal=
+  parameter Modelica.Units.SI.HeatFlowRate QRooC_flow_nominal=
     -QRooInt_flow-UA/30*(TOut_nominal-TRooSet)
     "Nominal cooling load of the room";
-  parameter Modelica.SIunits.MassFlowRate mA_flow_nominal=
+  parameter Modelica.Units.SI.MassFlowRate mA_flow_nominal=
     1.3*QRooC_flow_nominal/1006/(TASup_nominal-TRooSet)
     "Nominal air mass flow rate, increased by factor 1.3 to allow for recovery after temperature setback";
-  parameter Modelica.SIunits.TemperatureDifference dTFan = 2
+  parameter Modelica.Units.SI.TemperatureDifference dTFan = 2
     "Estimated temperature raise across fan that needs to be made up by the cooling coil";
-  parameter Modelica.SIunits.HeatFlowRate QCoiC_flow_nominal=4*
+  parameter Modelica.Units.SI.HeatFlowRate QCoiC_flow_nominal=4*
     (QRooC_flow_nominal + mA_flow_nominal*(TASup_nominal-THeaRecLvg-dTFan)*1006)
     "Cooling load of coil, taking into account economizer, and increased due to latent heat removal";
 
   /////////////////////////////////////////////////////////
   // Water temperatures and mass flow rates
-  parameter Modelica.SIunits.Temperature TWSup_nominal = 273.15+16
+  parameter Modelica.Units.SI.Temperature TWSup_nominal = 273.15+16
     "Water supply temperature";
-  parameter Modelica.SIunits.Temperature TWRet_nominal = 273.15+12
+  parameter Modelica.Units.SI.Temperature TWRet_nominal = 273.15+12
     "Water return temperature";
-  parameter Modelica.SIunits.MassFlowRate mW_flow_nominal=
+  parameter Modelica.Units.SI.MassFlowRate mW_flow_nominal=
     QCoiC_flow_nominal/(TWRet_nominal-TWSup_nominal)/4200
     "Nominal water mass flow rate";
-  /////////////////////////////////////////////////////////
-  // HVAC models
+  /////////////////////////////////////////////////////////
+  // HVAC models
   Modelica.Blocks.Sources.Constant zer[nZon](each k=0) "Zero output signal"
     annotation (Placement(transformation(extent={{100,-100},{120,-80}})));
   Movers.FlowControlled_m_flow fan(
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/ExportContainers/Examples/FMUs/HeaterCooler_u.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/ExportContainers/Examples/FMUs/HeaterCooler_u.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/ExportContainers/Examples/FMUs/HeaterCooler_u.mo"	2022-03-10 09:57:39.676144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/ExportContainers/Examples/FMUs/HeaterCooler_u.mo"	2022-03-10 09:58:20.248149480 +0000
@@ -10,11 +10,11 @@
       massDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
       energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState));
 
-  parameter Modelica.SIunits.MassFlowRate m_flow_nominal=0.01
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=0.01
     "Nominal mass flow rate";
-  parameter Modelica.SIunits.PressureDifference dp_nominal(displayUnit="Pa")=0
+  parameter Modelica.Units.SI.PressureDifference dp_nominal(displayUnit="Pa")=0
     "Pressure";
-  parameter Modelica.SIunits.HeatFlowRate Q_flow_nominal=100
+  parameter Modelica.Units.SI.HeatFlowRate Q_flow_nominal=100
     "Heat flow rate at u=1, positive for heating";
   Modelica.Blocks.Interfaces.RealInput u(min=0, max=1, unit="1")
     "Control input"
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/ExportContainers/Examples/FMUs/Heater_T.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/ExportContainers/Examples/FMUs/Heater_T.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/ExportContainers/Examples/FMUs/Heater_T.mo"	2022-03-10 09:57:39.676144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/ExportContainers/Examples/FMUs/Heater_T.mo"	2022-03-10 09:58:20.228149476 +0000
@@ -9,13 +9,13 @@
       final QMax_flow=QMax_flow,
       final energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState));
 
-  parameter Modelica.SIunits.HeatFlowRate QMax_flow=Modelica.Constants.inf
+  parameter Modelica.Units.SI.HeatFlowRate QMax_flow=Modelica.Constants.inf
     "Maximum heat flow rate for heating (positive)";
-  parameter Modelica.SIunits.HeatFlowRate QMin_flow=-Modelica.Constants.inf
+  parameter Modelica.Units.SI.HeatFlowRate QMin_flow=-Modelica.Constants.inf
     "Maximum heat flow rate for cooling (negative)";
-  parameter Modelica.SIunits.MassFlowRate m_flow_nominal=0.01
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=0.01
     "Nominal mass flow rate";
-  parameter Modelica.SIunits.PressureDifference dp_nominal(displayUnit="Pa")=0
+  parameter Modelica.Units.SI.PressureDifference dp_nominal(displayUnit="Pa")=0
     "Pressure";
 
   Modelica.Blocks.Interfaces.RealInput TSet(unit="K", displayUnit="degC")
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/ExportContainers/Examples/FMUs/Humidifier_u.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/ExportContainers/Examples/FMUs/Humidifier_u.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/ExportContainers/Examples/FMUs/Humidifier_u.mo"	2022-03-10 09:57:39.676144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/ExportContainers/Examples/FMUs/Humidifier_u.mo"	2022-03-10 09:58:20.208149474 +0000
@@ -10,13 +10,13 @@
       massDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
       final energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState));
 
-  parameter Modelica.SIunits.MassFlowRate m_flow_nominal=0.01
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=0.01
     "Nominal mass flow rate";
 
-  parameter Modelica.SIunits.PressureDifference dp_nominal(displayUnit="Pa")=0
+  parameter Modelica.Units.SI.PressureDifference dp_nominal(displayUnit="Pa")=0
     "Pressure";
 
-  parameter Modelica.SIunits.MassFlowRate mWat_flow_nominal=0.01*0.005
+  parameter Modelica.Units.SI.MassFlowRate mWat_flow_nominal=0.01*0.005
     "Water mass flow rate at u=1, positive for humidification";
 
   Modelica.Blocks.Interfaces.RealInput u(min=0, max=1, unit="1")
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/ExportContainers/Examples/FMUs/IdealSource_m_flow.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/ExportContainers/Examples/FMUs/IdealSource_m_flow.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/ExportContainers/Examples/FMUs/IdealSource_m_flow.mo"	2022-03-10 09:57:39.676144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/ExportContainers/Examples/FMUs/IdealSource_m_flow.mo"	2022-03-10 09:58:20.192149473 +0000
@@ -14,13 +14,12 @@
   "The mass flow rate of port_a and port_b is not conserved.
   This indicates a wrong configuration of your system model.");
   outlet.m_flow = m_flow_in;
-
-  // We use connect statements
-  // because outlet.backward and inlet.backward
-  // is removed if allowFlowReversal=false.
-  // The connect is applied on the components of the port
-  // to avoid also connecting the mass flow rate which would
-  // yield an overdetermined system of equations.
+// We use connect statements
+// because outlet.backward and inlet.backward
+// is removed if allowFlowReversal=false.
+// The connect is applied on the components of the port
+// to avoid also connecting the mass flow rate which would
+// yield an overdetermined system of equations.
   connect(inlet.forward, outlet.forward);
   connect(outlet.backward, inlet.backward);
   connect(outlet.p, inlet.p);
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/ExportContainers/Examples/FMUs/MixingVolume.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/ExportContainers/Examples/FMUs/MixingVolume.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/ExportContainers/Examples/FMUs/MixingVolume.mo"	2022-03-10 09:57:39.676144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/ExportContainers/Examples/FMUs/MixingVolume.mo"	2022-03-10 09:58:20.180149471 +0000
@@ -3,10 +3,10 @@
   extends IBPSA.Fluid.FMI.ExportContainers.PartialTwoPort(
       redeclare package Medium = IBPSA.Media.Air);
 
-  parameter Modelica.SIunits.Volume V=1 "Volume";
-  parameter Modelica.SIunits.MassFlowRate m_flow_nominal=0.01
-    "Nominal mass flow rate";
 
+  parameter Modelica.Units.SI.Volume V=1 "Volume";
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=0.01
+    "Nominal mass flow rate";
 protected
   IBPSA.Fluid.FMI.Adaptors.Inlet bouIn(redeclare final package Medium =
                Medium, final allowFlowReversal=allowFlowReversal)
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/ExportContainers/Examples/FMUs/PressureDrop.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/ExportContainers/Examples/FMUs/PressureDrop.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/ExportContainers/Examples/FMUs/PressureDrop.mo"	2022-03-10 09:57:39.676144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/ExportContainers/Examples/FMUs/PressureDrop.mo"	2022-03-10 09:58:20.164149468 +0000
@@ -7,9 +7,9 @@
         final m_flow_nominal=m_flow_nominal, final dp_nominal=if
           use_p_in then dp_nominal else 0));
 
-  parameter Modelica.SIunits.MassFlowRate m_flow_nominal=0.01
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=0.01
     "Nominal mass flow rate";
-  parameter Modelica.SIunits.PressureDifference dp_nominal(displayUnit="Pa")=100
+  parameter Modelica.Units.SI.PressureDifference dp_nominal(displayUnit="Pa")=100
     "Pressure drop at nominal mass flow rate";
   annotation (
   Documentation(info="
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/ExportContainers/Examples/FMUs/ResistanceVolume.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/ExportContainers/Examples/FMUs/ResistanceVolume.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/ExportContainers/Examples/FMUs/ResistanceVolume.mo"	2022-03-10 09:57:39.676144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/ExportContainers/Examples/FMUs/ResistanceVolume.mo"	2022-03-10 09:58:20.152149466 +0000
@@ -4,10 +4,10 @@
   extends IBPSA.Fluid.FMI.ExportContainers.PartialTwoPort(
       redeclare package Medium = IBPSA.Media.Air);
 
-  parameter Modelica.SIunits.Volume V=1 "Volume";
-  parameter Modelica.SIunits.MassFlowRate m_flow_nominal=0.01
+  parameter Modelica.Units.SI.Volume V=1 "Volume";
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=0.01
     "Nominal mass flow rate";
-  parameter Modelica.SIunits.PressureDifference dp_nominal=100
+  parameter Modelica.Units.SI.PressureDifference dp_nominal=100
     "Nominal pressure drop";
 
   Modelica.Blocks.Sources.RealExpression dpCom(y=res.port_a.p - res.port_b.p) if
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/ExportContainers/Examples/FMUs/ThermalZone.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/ExportContainers/Examples/FMUs/ThermalZone.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/ExportContainers/Examples/FMUs/ThermalZone.mo"	2022-03-10 09:57:39.676144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/ExportContainers/Examples/FMUs/ThermalZone.mo"	2022-03-10 09:58:20.064149455 +0000
@@ -6,25 +6,25 @@
 
   replaceable package MediumA = IBPSA.Media.Air "Medium for air";
 
-  parameter Modelica.SIunits.Volume V=6*10*3 "Room volume";
+  parameter Modelica.Units.SI.Volume V=6*10*3 "Room volume";
 
   /////////////////////////////////////////////////////////
   // Air temperatures at design conditions
-  parameter Modelica.SIunits.Temperature TASup_nominal = 273.15+18
+  parameter Modelica.Units.SI.Temperature TASup_nominal = 273.15+18
     "Nominal air temperature supplied to room";
-  parameter Modelica.SIunits.Temperature TRooSet = 273.15+24
+  parameter Modelica.Units.SI.Temperature TRooSet = 273.15+24
     "Nominal room air temperature";
-  parameter Modelica.SIunits.Temperature TOut_nominal = 273.15+30
+  parameter Modelica.Units.SI.Temperature TOut_nominal = 273.15+30
     "Design outlet air temperature";
 
   /////////////////////////////////////////////////////////
   // Cooling loads and air mass flow rates
-  parameter Modelica.SIunits.HeatFlowRate QRooInt_flow=
+  parameter Modelica.Units.SI.HeatFlowRate QRooInt_flow=
      1000 "Internal heat gains of the room";
-  parameter Modelica.SIunits.HeatFlowRate QRooC_flow_nominal=
+  parameter Modelica.Units.SI.HeatFlowRate QRooC_flow_nominal=
     -QRooInt_flow-10E3/30*(TOut_nominal-TRooSet)
     "Nominal cooling load of the room";
-  parameter Modelica.SIunits.MassFlowRate mA_flow_nominal=
+  parameter Modelica.Units.SI.MassFlowRate mA_flow_nominal=
     1.3*QRooC_flow_nominal/1006/(TASup_nominal-TRooSet)
     "Nominal air mass flow rate, increased by factor 1.3 to allow for recovery after temperature setback";
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/ExportContainers/Examples/FMUs/ThermalZones.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/ExportContainers/Examples/FMUs/ThermalZones.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/ExportContainers/Examples/FMUs/ThermalZones.mo"	2022-03-10 09:57:39.676144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/ExportContainers/Examples/FMUs/ThermalZones.mo"	2022-03-10 09:58:20.032149451 +0000
@@ -8,25 +8,25 @@
 
   replaceable package MediumA = IBPSA.Media.Air "Medium for air";
 
-  parameter Modelica.SIunits.Volume V=6*10*3 "Room volume";
+  parameter Modelica.Units.SI.Volume V=6*10*3 "Room volume";
 
   /////////////////////////////////////////////////////////
   // Air temperatures at design conditions
-  parameter Modelica.SIunits.Temperature TASup_nominal = 273.15+18
+  parameter Modelica.Units.SI.Temperature TASup_nominal = 273.15+18
     "Nominal air temperature supplied to room";
-  parameter Modelica.SIunits.Temperature TRooSet = 273.15+24
+  parameter Modelica.Units.SI.Temperature TRooSet = 273.15+24
     "Nominal room air temperature";
-  parameter Modelica.SIunits.Temperature TOut_nominal = 273.15+30
+  parameter Modelica.Units.SI.Temperature TOut_nominal = 273.15+30
     "Design outlet air temperature";
 
   /////////////////////////////////////////////////////////
   // Cooling loads and air mass flow rates
-  parameter Modelica.SIunits.HeatFlowRate QRooInt_flow=
+  parameter Modelica.Units.SI.HeatFlowRate QRooInt_flow=
      1000 "Internal heat gains of the room";
-  parameter Modelica.SIunits.HeatFlowRate QRooC_flow_nominal=
+  parameter Modelica.Units.SI.HeatFlowRate QRooC_flow_nominal=
     -QRooInt_flow-10E3/30*(TOut_nominal-TRooSet)
     "Nominal cooling load of the room";
-  parameter Modelica.SIunits.MassFlowRate mA_flow_nominal=
+  parameter Modelica.Units.SI.MassFlowRate mA_flow_nominal=
     1.3*QRooC_flow_nominal/1006/(TASup_nominal-TRooSet)
     "Nominal air mass flow rate, increased by factor 1.3 to allow for recovery after temperature setback";
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/ExportContainers/HVACZone.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/ExportContainers/HVACZone.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/ExportContainers/HVACZone.mo"	2022-03-10 09:57:39.676144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/ExportContainers/HVACZone.mo"	2022-03-10 09:58:19.972149444 +0000
@@ -6,7 +6,7 @@
       Modelica.Media.Interfaces.PartialMedium "Medium in the component"
       annotation (choicesAllMatching = true);
 
-  // Set allowFlowReversal = true to get access to the states of the zone.
+// Set allowFlowReversal = true to get access to the states of the zone.
   Interfaces.Outlet fluPor[size(hvacAda.fluPor, 1)](
     redeclare each final package Medium = Medium,
     each final use_p_in=false,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/ExportContainers/HVACZones.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/ExportContainers/HVACZones.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/ExportContainers/HVACZones.mo"	2022-03-10 09:57:39.676144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/ExportContainers/HVACZones.mo"	2022-03-10 09:58:19.944149440 +0000
@@ -11,7 +11,7 @@
   parameter Integer nPorts(min=2)
     "Number of fluid ports for each zone (must be the same for every zone)";
 
-  // Set allowFlowReversal = true to get access to the states of the zone.
+// Set allowFlowReversal = true to get access to the states of the zone.
   Interfaces.Outlet fluPor[nZon, nPorts](
     redeclare each final package Medium = Medium,
     each final use_p_in = false,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/ExportContainers/Validation/FMUs/ThermalZoneAir1.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/ExportContainers/Validation/FMUs/ThermalZoneAir1.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/ExportContainers/Validation/FMUs/ThermalZoneAir1.mo"	2022-03-10 09:57:39.676144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/ExportContainers/Validation/FMUs/ThermalZoneAir1.mo"	2022-03-10 09:58:19.756149417 +0000
@@ -3,25 +3,25 @@
   extends IBPSA.Fluid.FMI.ExportContainers.ThermalZone(redeclare package Medium
       =                IBPSA.Media.Air, nPorts=2);
 
-  parameter Modelica.SIunits.Volume V=6*10*3 "Room volume";
+  parameter Modelica.Units.SI.Volume V=6*10*3 "Room volume";
 
   /////////////////////////////////////////////////////////
   // Air temperatures at design conditions
-  parameter Modelica.SIunits.Temperature TASup_nominal = 273.15+18
+  parameter Modelica.Units.SI.Temperature TASup_nominal = 273.15+18
     "Nominal air temperature supplied to room";
-  parameter Modelica.SIunits.Temperature TRooSet = 273.15+24
+  parameter Modelica.Units.SI.Temperature TRooSet = 273.15+24
     "Nominal room air temperature";
-  parameter Modelica.SIunits.Temperature TOut_nominal = 273.15+30
+  parameter Modelica.Units.SI.Temperature TOut_nominal = 273.15+30
     "Design outlet air temperature";
 
   /////////////////////////////////////////////////////////
   // Cooling loads and air mass flow rates
-  parameter Modelica.SIunits.HeatFlowRate QRooInt_flow=
+  parameter Modelica.Units.SI.HeatFlowRate QRooInt_flow=
      1000 "Internal heat gains of the room";
-  parameter Modelica.SIunits.HeatFlowRate QRooC_flow_nominal=
+  parameter Modelica.Units.SI.HeatFlowRate QRooC_flow_nominal=
     -QRooInt_flow-10E3/30*(TOut_nominal-TRooSet)
     "Nominal cooling load of the room";
-  parameter Modelica.SIunits.MassFlowRate m_flow_nominal=
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=
     1.3*QRooC_flow_nominal/1006/(TASup_nominal-TRooSet)
     "Nominal air mass flow rate, increased by factor 1.3 to allow for recovery after temperature setback";
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/FlowSplitter_u.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/FlowSplitter_u.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/FlowSplitter_u.mo"	2022-03-10 09:57:39.676144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/FlowSplitter_u.mo"	2022-03-10 09:58:19.680149408 +0000
@@ -6,7 +6,7 @@
       Modelica.Media.Interfaces.PartialMedium "Medium in the component"
       annotation (choicesAllMatching = true);
 
-  parameter Modelica.SIunits.MassFlowRate m_flow_nominal[nout](
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal[nout](
     each min=0) "Nominal mass flow rate for each outlet";
   parameter Boolean allowFlowReversal = true
     "= true to allow flow reversal, false restricts to design direction (inlet -> outlet)"
@@ -34,7 +34,7 @@
     annotation (Placement(transformation(extent={{-140,60},{-100,100}}),
         iconTransformation(extent={{-120,70},{-100,90}})));
 protected
-  final parameter Modelica.SIunits.MassFlowRate mAve_flow_nominal=
+  final parameter Modelica.Units.SI.MassFlowRate mAve_flow_nominal=
       sum(m_flow_nominal)/nout "Average nominal mass flow rate";
 protected
   IBPSA.Fluid.FMI.Interfaces.FluidProperties bacPro_internal(redeclare final
@@ -48,26 +48,24 @@
     assert(m_flow_nominal[i] > 0,
       "Nominal mass flow rate must be bigger than zero.");
   end for;
-equation
-  for i in 1:nout loop
-    assert(u[i] >= 0, "Control signal must be non-negative.");
-    // Dymola 2015 FD01 (on Linux 64) does not automatically
-    // remove the conditional equation below. We thus have to manually check
-    // if use_p_in is true before connecting the inlet and outlet pressures.
-    if use_p_in then
-      connect(inlet.p, outlet[i].p);
-    end if;
-    outlet[i].m_flow = u[i]*m_flow_nominal[i];
-    connect(outlet[i].forward, inlet.forward);
-  end for;
-
-  // As reverse flow is not supported, we assign
-  // default values for the inlet.backward properties
+equation
+  for i in 1:nout loop
+    assert(u[i] >= 0, "Control signal must be non-negative.");
+// Dymola 2015 FD01 (on Linux 64) does not automatically
+// remove the conditional equation below. We thus have to manually check
+// if use_p_in is true before connecting the inlet and outlet pressures.
+    if use_p_in then
+      connect(inlet.p, outlet[i].p);
+    end if;
+    outlet[i].m_flow = u[i] * m_flow_nominal[i];
+    connect(outlet[i].forward, inlet.forward);
+  end for;
+// As reverse flow is not supported, we assign
+// default values for the inlet.backward properties
   bacPro_internal.T = Medium.T_default;
   connect(bacPro_internal.X_w, X_w_out_internal);
-  bacPro_internal.C  = zeros(Medium.nC);
-
-  // Conditional connector
+  bacPro_internal.C  = zeros(Medium.nC);
+// Conditional connector
   connect(bacPro_internal, inlet.backward);
   annotation(defaultComponentName="spl",
 Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/Interfaces/MassFractionConnector.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/Interfaces/MassFractionConnector.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/Interfaces/MassFractionConnector.mo"	2022-03-10 09:57:39.676144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/Interfaces/MassFractionConnector.mo"	2022-03-10 09:58:19.636149402 +0000
@@ -1,6 +1,6 @@
 within BuildSysPro.IBPSA.Fluid.FMI.Interfaces;
 connector MassFractionConnector =
-  Modelica.SIunits.MassFraction
+  Modelica.Units.SI.MassFraction
   "Connector for mass fraction of water vapor per kg total mass"
   annotation (
   defaultComponentName="X_w",
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/Interfaces/PressureInput.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/Interfaces/PressureInput.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/Interfaces/PressureInput.mo"	2022-03-10 09:57:39.676144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/Interfaces/PressureInput.mo"	2022-03-10 09:58:19.624149401 +0000
@@ -1,6 +1,6 @@
 within BuildSysPro.IBPSA.Fluid.FMI.Interfaces;
 connector PressureInput =
-  input Modelica.SIunits.AbsolutePressure(displayUnit="Pa")
+  input Modelica.Units.SI.AbsolutePressure(displayUnit="Pa")
   "Connector for pressure input"
   annotation (
   defaultComponentName="p",
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/Interfaces/PressureOutput.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/Interfaces/PressureOutput.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/Interfaces/PressureOutput.mo"	2022-03-10 09:57:39.676144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/Interfaces/PressureOutput.mo"	2022-03-10 09:58:19.616149400 +0000
@@ -1,6 +1,6 @@
 within BuildSysPro.IBPSA.Fluid.FMI.Interfaces;
 connector PressureOutput =
-  output Modelica.SIunits.AbsolutePressure(displayUnit="Pa")
+  output Modelica.Units.SI.AbsolutePressure(displayUnit="Pa")
   "Connector for pressure output"
   annotation (
   defaultComponentName="p",
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/Sink_T.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/Sink_T.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/Sink_T.mo"	2022-03-10 09:57:39.676144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/Sink_T.mo"	2022-03-10 09:58:19.608149398 +0000
@@ -51,8 +51,8 @@
   output IBPSA.Fluid.FMI.Interfaces.MassFractionConnector X_w_in_internal
     "Internal connector for mass fraction of forward flow properties";
 
-equation
- // Conditional connector for flow reversal
+equation
+// Conditional connector for flow reversal
   connect(inlet.backward, bacPro_internal);
   connect(bacPro_internal.X_w, X_w_in_internal);
   if allowFlowReversal and Medium.nXi > 0 then
@@ -67,14 +67,13 @@
   else
     bacPro_internal.T = Medium.T_default;
     bacPro_internal.C  = fill(0, Medium.nC);
-  end if;
-
-  // Propagate pressure to output signal connector
-  // using conditional connectors
-  if use_p_in then
-    connect(inlet.p, p_in_internal);
-  else
-    p_in_internal = Medium.p_default;
+  end if;
+// Propagate pressure to output signal connector
+// using conditional connectors
+  if use_p_in then
+    connect(inlet.p, p_in_internal);
+  else
+    p_in_internal = Medium.p_default;
   end if;
   connect(p, p_in_internal);
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/Source_T.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/Source_T.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/Source_T.mo"	2022-03-10 09:57:39.676144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/Source_T.mo"	2022-03-10 09:58:19.596149396 +0000
@@ -51,20 +51,19 @@
 initial equation
    assert(Medium.nXi < 2,
    "The medium must have zero or one independent mass fraction Medium.nXi.");
-equation
-   // Conditional connect statements for pressure
-   if use_p_in then
-     connect(p_in, p_in_internal);
-   else
-     p_in_internal = Medium.p_default;
-   end if;
-   connect(outlet.p, p_in_internal);
-
-  // Conditional connectors for mass fraction
-  if Medium.nXi > 0 then
-    connect(X_w_in_internal, X_w_in);
-  else
-    X_w_in_internal = 0;
+equation
+// Conditional connect statements for pressure
+  if use_p_in then
+    connect(p_in, p_in_internal);
+  else
+    p_in_internal = Medium.p_default;
+  end if;
+   connect(outlet.p, p_in_internal);
+// Conditional connectors for mass fraction
+  if Medium.nXi > 0 then
+    connect(X_w_in_internal, X_w_in);
+  else
+    X_w_in_internal = 0;
   end if;
   connect(outlet.forward.X_w, X_w_in_internal);
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/Validation/FlowSplitter_u.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/Validation/FlowSplitter_u.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/Validation/FlowSplitter_u.mo"	2022-03-10 09:57:39.676144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/Validation/FlowSplitter_u.mo"	2022-03-10 09:58:19.572149394 +0000
@@ -3,7 +3,7 @@
   extends Modelica.Icons.Example;
   package Medium = IBPSA.Media.Air "Medium model";
 
-  parameter Modelica.SIunits.MassFlowRate m_flow_nominal=0.1
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=0.1
     "Nominal mass flow rate";
 
   parameter Boolean use_p_in = false
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/Validation/HeaterFan.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/Validation/HeaterFan.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/Validation/HeaterFan.mo"	2022-03-10 09:57:39.676144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/Validation/HeaterFan.mo"	2022-03-10 09:58:19.516149387 +0000
@@ -4,11 +4,11 @@
   extends Modelica.Icons.Example;
   package Medium = IBPSA.Media.Air "Medium model";
 
-  parameter Modelica.SIunits.MassFlowRate m_flow_nominal=Q_flow_nominal/1000/10
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=Q_flow_nominal/1000/10
     "Nominal mass flow rate";
-  parameter Modelica.SIunits.PressureDifference dp_nominal(displayUnit="Pa")=2000
+  parameter Modelica.Units.SI.PressureDifference dp_nominal(displayUnit="Pa")=2000
     "Pressure";
-  parameter Modelica.SIunits.HeatFlowRate Q_flow_nominal = 1000
+  parameter Modelica.Units.SI.HeatFlowRate Q_flow_nominal = 1000
     "Heat flow rate at u=1, positive for heating";
 
   parameter Boolean use_p_in = true
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/Validation/HeaterFanPressureDriven.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/Validation/HeaterFanPressureDriven.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/Validation/HeaterFanPressureDriven.mo"	2022-03-10 09:57:39.676144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/Validation/HeaterFanPressureDriven.mo"	2022-03-10 09:58:19.496149385 +0000
@@ -4,11 +4,11 @@
   extends Modelica.Icons.Example;
   package Medium = IBPSA.Media.Air "Medium model";
 
-  parameter Modelica.SIunits.MassFlowRate m_flow_nominal=Q_flow_nominal/1000/10
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=Q_flow_nominal/1000/10
     "Nominal mass flow rate";
-  parameter Modelica.SIunits.PressureDifference dp_nominal(displayUnit="Pa")=2000
+  parameter Modelica.Units.SI.PressureDifference dp_nominal(displayUnit="Pa")=2000
     "Pressure";
-  parameter Modelica.SIunits.HeatFlowRate Q_flow_nominal = 1000
+  parameter Modelica.Units.SI.HeatFlowRate Q_flow_nominal = 1000
     "Heat flow rate at u=1, positive for heating";
 
   constant Boolean use_p_in = true
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/Validation/HeaterFan_noReverseFlow.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/Validation/HeaterFan_noReverseFlow.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/Validation/HeaterFan_noReverseFlow.mo"	2022-03-10 09:57:39.676144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FMI/Validation/HeaterFan_noReverseFlow.mo"	2022-03-10 09:58:19.476149381 +0000
@@ -11,11 +11,11 @@
     "= true to use a pressure from connector, false to output Medium.p_default"
     annotation(Evaluate=true);
 
-  parameter Modelica.SIunits.MassFlowRate m_flow_nominal=Q_flow_nominal/1000/10
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=Q_flow_nominal/1000/10
     "Nominal mass flow rate";
-  parameter Modelica.SIunits.PressureDifference dp_nominal(displayUnit="Pa")=2000
+  parameter Modelica.Units.SI.PressureDifference dp_nominal(displayUnit="Pa")=2000
     "Pressure";
-  parameter Modelica.SIunits.HeatFlowRate Q_flow_nominal = 1000
+  parameter Modelica.Units.SI.HeatFlowRate Q_flow_nominal = 1000
     "Heat flow rate at u=1, positive for heating";
 
   ExportContainers.Examples.FMUs.Fan floMac(
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/BaseClasses/PlugFlow.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/BaseClasses/PlugFlow.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/BaseClasses/PlugFlow.mo"	2022-03-10 09:57:39.676144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/BaseClasses/PlugFlow.mo"	2022-03-10 09:58:19.448149378 +0000
@@ -3,27 +3,27 @@
   "Lossless pipe model with spatialDistribution plug flow implementation"
   extends IBPSA.Fluid.Interfaces.PartialTwoPort;
 
-  parameter Modelica.SIunits.Length dh
+  parameter Modelica.Units.SI.Length dh
     "Hydraulic diameter (assuming a round cross section area)";
-  parameter Modelica.SIunits.Length length(min=0) "Pipe length";
-  final parameter Modelica.SIunits.Area A=Modelica.Constants.pi*(dh/2)^2
+  parameter Modelica.Units.SI.Length length(min=0) "Pipe length";
+  final parameter Modelica.Units.SI.Area A=Modelica.Constants.pi*(dh/2)^2
     "Cross-sectional area of pipe";
 
   parameter Medium.MassFlowRate m_flow_small
     "Small mass flow rate for regularization of zero flow"
     annotation(Dialog(tab = "Advanced"));
-  parameter Modelica.SIunits.Temperature T_start_in=Medium.T_default
+  parameter Modelica.Units.SI.Temperature T_start_in=Medium.T_default
     "Initial temperature in pipe at inlet"
     annotation (Dialog(group="Initialization"));
-  parameter Modelica.SIunits.Temperature T_start_out=Medium.T_default
+  parameter Modelica.Units.SI.Temperature T_start_out=Medium.T_default
     "Initial temperature in pipe at outlet"
     annotation (Dialog(group="Initialization"));
 
-  Modelica.SIunits.Length x
+  Modelica.Units.SI.Length x
     "Spatial coordinate for spatialDistribution operator";
-  Modelica.SIunits.Velocity v "Flow velocity of medium in pipe";
+  Modelica.Units.SI.Velocity v "Flow velocity of medium in pipe";
 
-  Modelica.SIunits.VolumeFlowRate V_flow=
+  Modelica.Units.SI.VolumeFlowRate V_flow=
       port_a.m_flow/Modelica.Fluid.Utilities.regStep(port_a.m_flow,
                   Medium.density(
                     Medium.setState_phX(
@@ -39,13 +39,13 @@
     "Volume flow rate at inflowing port (positive when flow from port_a to port_b)";
 
 protected
-  parameter Modelica.SIunits.SpecificEnthalpy h_ini_in=Medium.specificEnthalpy(
+  parameter Modelica.Units.SI.SpecificEnthalpy h_ini_in=Medium.specificEnthalpy(
       Medium.setState_pTX(
       T=T_start_in,
       p=Medium.p_default,
       X=Medium.X_default)) "For initialization of spatialDistribution inlet";
 
-  parameter Modelica.SIunits.SpecificEnthalpy h_ini_out=Medium.specificEnthalpy(
+  parameter Modelica.Units.SI.SpecificEnthalpy h_ini_out=Medium.specificEnthalpy(
        Medium.setState_pTX(
       T=T_start_out,
       p=Medium.p_default,
@@ -61,11 +61,10 @@
     "Properties c_i/m close to the connection point if flow into the component";
 initial equation
   x = 0;
-equation
-  // No pressure drop
-  port_a.p = port_b.p;
-
-  // Mass balance (no storage)
+equation
+// No pressure drop
+  port_a.p = port_b.p;
+// Mass balance (no storage)
   port_a.m_flow + port_b.m_flow = 0;
 
   der(x) = v;
@@ -77,17 +76,10 @@
     x/length,
     v >= 0,
     {0.0, 1.0},
-    {h_ini_in, h_ini_out});
-
-  // Transport of substances
-  for i in 1:Medium.nXi loop
-  (port_a.Xi_outflow[i], port_b.Xi_outflow[i]) = spatialDistribution(
-    Xi_inflow_a[i],
-    Xi_inflow_b[i],
-    x/length,
-    v >= 0,
-    {0.0, 1.0},
-    {0.01, 0.01});
+    {h_ini_in, h_ini_out});
+// Transport of substances
+  for i in 1:Medium.nXi loop
+    (port_a.Xi_outflow[i], port_b.Xi_outflow[i]) = spatialDistribution(Xi_inflow_a[i], Xi_inflow_b[i], x / length, v >= 0, {0.0, 1.0}, {0.01, 0.01});
   end for;
 
   for i in 1:Medium.nC loop
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/BaseClasses/PlugFlowCore.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/BaseClasses/PlugFlowCore.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/BaseClasses/PlugFlowCore.mo"	2022-03-10 09:57:39.676144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/BaseClasses/PlugFlowCore.mo"	2022-03-10 09:58:19.416149374 +0000
@@ -3,23 +3,23 @@
   "Pipe model using spatialDistribution for temperature delay with modified delay tracker"
   extends IBPSA.Fluid.Interfaces.PartialTwoPort;
 
-  parameter Modelica.SIunits.Length dh
+  parameter Modelica.Units.SI.Length dh
     "Hydraulic diameter (assuming a round cross section area)";
 
-  parameter Modelica.SIunits.Velocity v_nominal
+  parameter Modelica.Units.SI.Velocity v_nominal
     "Velocity at m_flow_nominal (used to compute default value for hydraulic diameter dh)"
     annotation(Dialog(group="Nominal condition"));
 
-  parameter Modelica.SIunits.Length length(min=0) "Pipe length";
+  parameter Modelica.Units.SI.Length length(min=0) "Pipe length";
 
-  parameter Modelica.SIunits.MassFlowRate m_flow_nominal(min=0)
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal(min=0)
     "Nominal mass flow rate" annotation (Dialog(group="Nominal condition"));
 
-  parameter Modelica.SIunits.MassFlowRate m_flow_small(min=0) = 1E-4*abs(
+  parameter Modelica.Units.SI.MassFlowRate m_flow_small(min=0) = 1E-4*abs(
     m_flow_nominal) "Small mass flow rate for regularization of zero flow"
     annotation (Dialog(tab="Advanced"));
 
-  parameter Modelica.SIunits.Height roughness=2.5e-5
+  parameter Modelica.Units.SI.Height roughness=2.5e-5
     "Average height of surface asperities (default: smooth steel pipe)"
     annotation (Dialog(group="Geometry"));
 
@@ -35,18 +35,18 @@
   parameter Boolean from_dp=false
     "= true, use m_flow = f(dp) else dp = f(m_flow)"
     annotation (Evaluate=true, Dialog(tab="Advanced"));
-  parameter Modelica.SIunits.Length thickness(min=0) "Pipe wall thickness";
+  parameter Modelica.Units.SI.Length thickness(min=0) "Pipe wall thickness";
 
-  parameter Modelica.SIunits.Temperature T_start_in=Medium.T_default
+  parameter Modelica.Units.SI.Temperature T_start_in=Medium.T_default
     "Initialization temperature at pipe inlet"
     annotation (Dialog(tab="Initialization"));
-  parameter Modelica.SIunits.Temperature T_start_out=Medium.T_default
+  parameter Modelica.Units.SI.Temperature T_start_out=Medium.T_default
     "Initialization temperature at pipe outlet"
     annotation (Dialog(tab="Initialization"));
   parameter Boolean initDelay=false
     "Initialize delay for a constant mass flow rate if true, otherwise start from 0"
     annotation (Dialog(tab="Initialization"));
-  parameter Modelica.SIunits.MassFlowRate m_flow_start=0
+  parameter Modelica.Units.SI.MassFlowRate m_flow_start=0
     annotation (Dialog(tab="Initialization", enable=initDelay));
 
   parameter Real ReC=4000
@@ -126,13 +126,13 @@
     annotation (Placement(transformation(extent={{-10,90},{10,110}})));
 
 protected
-  parameter Modelica.SIunits.Density rho_default=Medium.density_pTX(
+
+  parameter Modelica.Units.SI.Density rho_default=Medium.density_pTX(
       p=Medium.p_default,
       T=Medium.T_default,
       X=Medium.X_default)
     "Default density (e.g., rho_liquidWater = 995, rho_air = 1.2)"
     annotation (Dialog(group="Advanced"));
-
 equation
   connect(senMasFlo.m_flow, timDel.m_flow) annotation (Line(
       points={{-40,-11},{-40,-40},{-12,-40}},
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/BaseClasses/PlugFlowHeatLoss.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/BaseClasses/PlugFlowHeatLoss.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/BaseClasses/PlugFlowHeatLoss.mo"	2022-03-10 09:57:39.676144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/BaseClasses/PlugFlowHeatLoss.mo"	2022-03-10 09:58:19.372149368 +0000
@@ -4,18 +4,17 @@
   extends Fluid.Interfaces.PartialTwoPortTransport(
     final allowFlowReversal=true,
     final dp_start=0);
-    // allowFlowReversal set to true because this model is used for inlet and outlets
-
+    // allowFlowReversal set to true because this model is used for inlet and outlets
   parameter Real C(unit="J/(K.m)")
     "Thermal capacity per unit length of pipe";
   parameter Real R(unit="(m.K)/W")
     "Thermal resistance per unit length from fluid to boundary temperature";
 
-  parameter Modelica.SIunits.MassFlowRate m_flow_nominal "Nominal mass flow rate";
-  parameter Modelica.SIunits.Temperature T_start
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal "Nominal mass flow rate";
+  parameter Modelica.Units.SI.Temperature T_start
     "Initial output temperature";
 
-  final parameter Modelica.SIunits.Time tau_char=R*C "Characteristic delay time";
+  final parameter Modelica.Units.SI.Time tau_char=R*C "Characteristic delay time";
 
   Modelica.Blocks.Interfaces.RealInput tau(unit="s") "Time delay at pipe level"
     annotation (Placement(transformation(
@@ -26,18 +25,18 @@
     "Heat port to connect environment (negative if heat is lost to ambient)"
     annotation (Placement(transformation(extent={{-10,90},{10,110}})));
 
-  Modelica.SIunits.Temperature T_a_inflow(start=T_start)
+  Modelica.Units.SI.Temperature T_a_inflow(start=T_start)
     "Temperature at port_a for inflowing fluid";
-  Modelica.SIunits.Temperature T_b_outflow(start=T_start)
+  Modelica.Units.SI.Temperature T_b_outflow(start=T_start)
     "Temperature at port_b for outflowing fluid";
-  Modelica.SIunits.Temperature TAmb=heatPort.T "Environment temperature";
+  Modelica.Units.SI.Temperature TAmb=heatPort.T "Environment temperature";
 
 protected
   parameter Medium.ThermodynamicState sta_default=Medium.setState_pTX(
       T=Medium.T_default,
       p=Medium.p_default,
       X=Medium.X_default) "Default medium state";
-  parameter Modelica.SIunits.SpecificHeatCapacity cp_default=
+  parameter Modelica.Units.SI.SpecificHeatCapacity cp_default=
       Medium.specificHeatCapacityCp(state=sta_default)
     "Heat capacity of medium";
 
@@ -57,8 +56,7 @@
         port_a.p,
         inStream(port_a.h_outflow),
         port_b.Xi_outflow));
-
-  // Heat losses
+// Heat losses
   T_b_outflow = TAmb + (T_a_inflow - TAmb)*Modelica.Math.exp(-tau/tau_char);
 
   heatPort.Q_flow = -IBPSA.Utilities.Math.Functions.spliceFunction(
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/BaseClasses/PlugFlowTransportDelay.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/BaseClasses/PlugFlowTransportDelay.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/BaseClasses/PlugFlowTransportDelay.mo"	2022-03-10 09:57:39.676144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/BaseClasses/PlugFlowTransportDelay.mo"	2022-03-10 09:58:19.356149365 +0000
@@ -1,34 +1,34 @@
 within BuildSysPro.IBPSA.Fluid.FixedResistances.BaseClasses;
 model PlugFlowTransportDelay "Delay time for given normalized velocity"
 
-  parameter Modelica.SIunits.Length length "Pipe length";
-  parameter Modelica.SIunits.Length dh
+  parameter Modelica.Units.SI.Length length "Pipe length";
+  parameter Modelica.Units.SI.Length dh
     "Hydraulic diameter (assuming a round cross section area)";
-  parameter Modelica.SIunits.Density rho "Standard density of fluid";
+  parameter Modelica.Units.SI.Density rho "Standard density of fluid";
   parameter Boolean initDelay=false
     "Initialize delay for a constant m_flow_start if true, otherwise start from 0"
     annotation (Dialog(group="Initialization"));
-  parameter Modelica.SIunits.MassFlowRate m_flow_start=0
+  parameter Modelica.Units.SI.MassFlowRate m_flow_start=0
     "Initialization of mass flow rate to calculate initial time delay"
     annotation (Dialog(group="Initialization", enable=initDelay));
 
-  parameter Modelica.SIunits.MassFlowRate m_flow_nominal(min=0)
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal(min=0)
     "Nominal mass flow rate" annotation (Dialog(group="Nominal condition"));
 
-  final parameter Modelica.SIunits.Time t_in_start=
+  final parameter Modelica.Units.SI.Time t_in_start=
     if initDelay and (abs(m_flow_start) > 1E-10*m_flow_nominal)
       then min(length/m_flow_start*(rho*dh^2/4*Modelica.Constants.pi), 0) else 0
     "Initial value of input time at inlet";
-  final parameter Modelica.SIunits.Time t_out_start=
+  final parameter Modelica.Units.SI.Time t_out_start=
     if initDelay and (abs(m_flow_start) > 1E-10*m_flow_nominal)
      then min(-length/m_flow_start*(rho*dh^2/4*Modelica.Constants.pi), 0) else 0
     "Initial value of input time at outlet";
 
-  Modelica.SIunits.Time time_out_rev "Reverse flow direction output time";
-  Modelica.SIunits.Time time_out_des "Design flow direction output time";
+  Modelica.Units.SI.Time time_out_rev "Reverse flow direction output time";
+  Modelica.Units.SI.Time time_out_des "Design flow direction output time";
 
   Real x(start=0) "Spatial coordinate for spatialDistribution operator";
-  Modelica.SIunits.Frequency u "Normalized fluid velocity (1/s)";
+  Modelica.Units.SI.Frequency u "Normalized fluid velocity (1/s)";
 
   Modelica.Blocks.Interfaces.RealInput m_flow "Mass flow of fluid" annotation (
       Placement(transformation(extent={{-140,-20},{-100,20}}),
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/BaseClasses/Validation/PlugFlowCore.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/BaseClasses/Validation/PlugFlowCore.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/BaseClasses/Validation/PlugFlowCore.mo"	2022-03-10 09:57:39.676144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/BaseClasses/Validation/PlugFlowCore.mo"	2022-03-10 09:58:19.324149361 +0000
@@ -4,16 +4,16 @@
   replaceable package Medium = IBPSA.Media.Water "Medium in pipes"
                                             annotation (
       choicesAllMatching=true);
-  parameter Modelica.SIunits.Length dh=0.1
+  parameter Modelica.Units.SI.Length dh=0.1
     "Hydraulic diameter (assuming a round cross section area)";
-  parameter Modelica.SIunits.Length dIns = 0.05
+  parameter Modelica.Units.SI.Length dIns = 0.05
     "Thickness of pipe insulation";
-  parameter Modelica.SIunits.ThermalConductivity kIns= 0.028
+  parameter Modelica.Units.SI.ThermalConductivity kIns= 0.028
    "Heat conductivity of pipe insulation";
 
-  parameter Modelica.SIunits.SpecificHeatCapacity cPip=500
+  parameter Modelica.Units.SI.SpecificHeatCapacity cPip=500
     "Specific heat of pipe wall material. 2300 for PE, 500 for steel";
-  parameter Modelica.SIunits.Density rhoPip=8000
+  parameter Modelica.Units.SI.Density rhoPip=8000
     "Density of pipe wall material. 930 for PE, 8000 for steel";
 
   parameter Real R=1/(kIns*2*Modelica.Constants.pi/
@@ -23,7 +23,7 @@
   parameter Real C=rho_default*Modelica.Constants.pi*(
       dh/2)^2*cp_default "Thermal capacity per unit length of water in pipe";
 
-  parameter Modelica.SIunits.Density rho_default=Medium.density_pTX(
+  parameter Modelica.Units.SI.Density rho_default=Medium.density_pTX(
       p=Medium.p_default,
       T=Medium.T_default,
       X=Medium.X_default)
@@ -35,7 +35,7 @@
       p=Medium.p_default,
       X=Medium.X_default) "Default medium state";
 
-  parameter Modelica.SIunits.SpecificHeatCapacity cp_default=
+  parameter Modelica.Units.SI.SpecificHeatCapacity cp_default=
       Medium.specificHeatCapacityCp(state=sta_default)
     "Heat capacity of medium";
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/HydraulicDiameter.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/HydraulicDiameter.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/HydraulicDiameter.mo"	2022-03-10 09:57:39.676144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/HydraulicDiameter.mo"	2022-03-10 09:58:19.204149346 +0000
@@ -4,25 +4,25 @@
         eta_default*dh/4*Modelica.Constants.pi*ReC/m_flow_nominal_pos,
       final dp_nominal=fac*dpStraightPipe_nominal);
 
-  parameter Modelica.SIunits.Length dh=sqrt(4*m_flow_nominal/rho_default/v_nominal/Modelica.Constants.pi)
+  parameter Modelica.Units.SI.Length dh=sqrt(4*m_flow_nominal/rho_default/v_nominal/Modelica.Constants.pi)
     "Hydraulic diameter (assuming a round cross section area)";
 
-  parameter Modelica.SIunits.Length length "Length of the pipe";
+  parameter Modelica.Units.SI.Length length "Length of the pipe";
 
   parameter Real ReC(min=0)=4000
     "Reynolds number where transition to turbulent starts";
 
-  parameter Modelica.SIunits.Velocity v_nominal = if rho_default < 500 then 1.5 else 0.15
+  parameter Modelica.Units.SI.Velocity v_nominal = if rho_default < 500 then 1.5 else 0.15
     "Velocity at m_flow_nominal (used to compute default value for hydraulic diameter dh)"
     annotation(Dialog(group="Nominal condition"));
 
-  parameter Modelica.SIunits.Length roughness(min=0) = 2.5e-5
+  parameter Modelica.Units.SI.Length roughness(min=0) = 2.5e-5
     "Absolute roughness of pipe, with a default for a smooth steel pipe (dummy if use_roughness = false)";
 
   parameter Real fac(min=1) = 2
     "Factor to take into account resistance of bends etc., fac=dp_nominal/dpStraightPipe_nominal";
 
-  final parameter Modelica.SIunits.PressureDifference dpStraightPipe_nominal(displayUnit="Pa")=
+  final parameter Modelica.Units.SI.PressureDifference dpStraightPipe_nominal(displayUnit="Pa")=
       Modelica.Fluid.Pipes.BaseClasses.WallFriction.Detailed.pressureLoss_m_flow(
       m_flow=m_flow_nominal,
       rho_a=rho_default,
@@ -35,11 +35,11 @@
       m_flow_small=m_flow_small)
     "Pressure loss of a straight pipe at m_flow_nominal";
 
-  Modelica.SIunits.Velocity v = m_flow/(rho_default*ARound)
+  Modelica.Units.SI.Velocity v = m_flow/(rho_default*ARound)
     "Flow velocity (assuming a round cross section area)";
 
 protected
-  parameter Modelica.SIunits.Area ARound = dh^2*Modelica.Constants.pi/4
+  parameter Modelica.Units.SI.Area ARound = dh^2*Modelica.Constants.pi/4
      "Cross sectional area (assuming a round cross section area)";
 
   parameter Medium.ThermodynamicState state_default=
@@ -48,10 +48,10 @@
       p=Medium.p_default,
       X=Medium.X_default[1:Medium.nXi]) "Default state";
 
-  parameter Modelica.SIunits.Density rho_default = Medium.density(state_default)
+  parameter Modelica.Units.SI.Density rho_default = Medium.density(state_default)
     "Density at nominal condition";
 
-  parameter Modelica.SIunits.DynamicViscosity mu_default = Medium.dynamicViscosity(
+  parameter Modelica.Units.SI.DynamicViscosity mu_default = Medium.dynamicViscosity(
       state_default)
     "Dynamic viscosity at nominal condition";
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/Junction.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/Junction.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/Junction.mo"	2022-03-10 09:57:39.676144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/Junction.mo"	2022-03-10 09:58:19.196149345 +0000
@@ -26,11 +26,11 @@
       homotopyInitialization=homotopyInitialization,
       deltaM=deltaM));
 
-  parameter Modelica.SIunits.MassFlowRate[3] m_flow_nominal
+  parameter Modelica.Units.SI.MassFlowRate[3] m_flow_nominal
     "Mass flow rate. Set negative at outflowing ports."
     annotation(Dialog(group = "Nominal condition"));
 
-  parameter Modelica.SIunits.Pressure[3] dp_nominal(each displayUnit = "Pa")
+  parameter Modelica.Units.SI.Pressure[3] dp_nominal(each displayUnit = "Pa")
     "Pressure drop at nominal mass flow rate, set to zero or negative number at outflowing ports."
     annotation(Dialog(group = "Nominal condition"));
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/LosslessPipe.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/LosslessPipe.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/LosslessPipe.mo"	2022-03-10 09:57:39.676144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/LosslessPipe.mo"	2022-03-10 09:58:19.184149344 +0000
@@ -3,15 +3,13 @@
   extends IBPSA.Fluid.Interfaces.PartialTwoPortInterface;
   final parameter Boolean from_dp=true "Used to satisfy replaceable models";
 equation
-  dp=0;
-  // Isenthalpic state transformation (no storage and no loss of energy)
+  dp=0;
+// Isenthalpic state transformation (no storage and no loss of energy)
   port_a.h_outflow = if allowFlowReversal then inStream(port_b.h_outflow) else Medium.h_default;
-  port_b.h_outflow = inStream(port_a.h_outflow);
-
-  // Mass balance (no storage)
-  port_a.m_flow + port_b.m_flow = 0;
-
-  // Transport of substances
+  port_b.h_outflow = inStream(port_a.h_outflow);
+// Mass balance (no storage)
+  port_a.m_flow + port_b.m_flow = 0;
+// Transport of substances
   port_a.Xi_outflow = if allowFlowReversal then inStream(port_b.Xi_outflow) else Medium.X_default[1:Medium.nXi];
   port_b.Xi_outflow = inStream(port_a.Xi_outflow);
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/PlugFlowPipe.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/PlugFlowPipe.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/PlugFlowPipe.mo"	2022-03-10 09:57:39.676144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/PlugFlowPipe.mo"	2022-03-10 09:58:19.176149343 +0000
@@ -7,61 +7,61 @@
     "= true, use m_flow = f(dp) else dp = f(m_flow)"
     annotation (Dialog(tab="Advanced"));
 
-  parameter Modelica.SIunits.Length dh=sqrt(4*m_flow_nominal/rho_default/v_nominal/Modelica.Constants.pi)
+  parameter Modelica.Units.SI.Length dh=sqrt(4*m_flow_nominal/rho_default/v_nominal/Modelica.Constants.pi)
     "Hydraulic diameter (assuming a round cross section area)"
     annotation (Dialog(group="Material"));
 
-  parameter Modelica.SIunits.Velocity v_nominal = 1.5
+  parameter Modelica.Units.SI.Velocity v_nominal = 1.5
     "Velocity at m_flow_nominal (used to compute default value for hydraulic diameter dh)"
     annotation(Dialog(group="Nominal condition"));
 
   parameter Real ReC=4000
     "Reynolds number where transition to turbulent starts";
 
-  parameter Modelica.SIunits.Height roughness=2.5e-5
+  parameter Modelica.Units.SI.Height roughness=2.5e-5
     "Average height of surface asperities (default: smooth steel pipe)"
     annotation (Dialog(group="Material"));
 
-  parameter Modelica.SIunits.Length length "Pipe length"
+  parameter Modelica.Units.SI.Length length "Pipe length"
     annotation (Dialog(group="Material"));
 
-  parameter Modelica.SIunits.MassFlowRate m_flow_nominal
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal
     "Nominal mass flow rate" annotation (Dialog(group="Nominal condition"));
 
-  parameter Modelica.SIunits.MassFlowRate m_flow_small = 1E-4*abs(
+  parameter Modelica.Units.SI.MassFlowRate m_flow_small = 1E-4*abs(
     m_flow_nominal) "Small mass flow rate for regularization of zero flow"
     annotation (Dialog(tab="Advanced"));
 
-  parameter Modelica.SIunits.Length dIns
+  parameter Modelica.Units.SI.Length dIns
     "Thickness of pipe insulation, used to compute R"
     annotation (Dialog(group="Thermal resistance"));
 
-  parameter Modelica.SIunits.ThermalConductivity kIns
+  parameter Modelica.Units.SI.ThermalConductivity kIns
     "Heat conductivity of pipe insulation, used to compute R"
     annotation (Dialog(group="Thermal resistance"));
 
-  parameter Modelica.SIunits.SpecificHeatCapacity cPip=2300
+  parameter Modelica.Units.SI.SpecificHeatCapacity cPip=2300
     "Specific heat of pipe wall material. 2300 for PE, 500 for steel"
     annotation (Dialog(group="Material"));
 
-  parameter Modelica.SIunits.Density rhoPip(displayUnit="kg/m3")=930
+  parameter Modelica.Units.SI.Density rhoPip(displayUnit="kg/m3")=930
     "Density of pipe wall material. 930 for PE, 8000 for steel"
     annotation (Dialog(group="Material"));
 
-  parameter Modelica.SIunits.Length thickness = 0.0035
+  parameter Modelica.Units.SI.Length thickness = 0.0035
     "Pipe wall thickness"
     annotation (Dialog(group="Material"));
 
-  parameter Modelica.SIunits.Temperature T_start_in(start=Medium.T_default)=
+  parameter Modelica.Units.SI.Temperature T_start_in(start=Medium.T_default)=
     Medium.T_default "Initialization temperature at pipe inlet"
     annotation (Dialog(tab="Initialization"));
-  parameter Modelica.SIunits.Temperature T_start_out(start=Medium.T_default)=
+  parameter Modelica.Units.SI.Temperature T_start_out(start=Medium.T_default)=
     T_start_in "Initialization temperature at pipe outlet"
     annotation (Dialog(tab="Initialization"));
   parameter Boolean initDelay(start=false) = false
     "Initialize delay for a constant mass flow rate if true, otherwise start from 0"
     annotation (Dialog(tab="Initialization"));
-  parameter Modelica.SIunits.MassFlowRate m_flow_start=0 "Initial value of mass flow rate through pipe"
+  parameter Modelica.Units.SI.MassFlowRate m_flow_start=0 "Initial value of mass flow rate through pipe"
     annotation (Dialog(tab="Initialization", enable=initDelay));
 
   parameter Real R(unit="(m.K)/W")=1/(kIns*2*Modelica.Constants.pi/
@@ -106,12 +106,12 @@
     final linearized=linearized) "Describing the pipe behavior"
     annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
 
-  // In the volume, below, we scale down V and use
-  // mSenFac. Otherwise, for air, we would get very large volumes
-  // which affect the delay of water vapor and contaminants.
-  // See also IBPSA.Fluid.FixedResistances.Validation.PlugFlowPipes.TransportWaterAir
-  // for why mSenFac is 10 and not 1000, as this gives more reasonable
-  // temperature step response
+// In the volume, below, we scale down V and use
+  // mSenFac. Otherwise, for air, we would get very large volumes
+  // which affect the delay of water vapor and contaminants.
+  // See also IBPSA.Fluid.FixedResistances.Validation.PlugFlowPipes.TransportWaterAir
+  // for why mSenFac is 10 and not 1000, as this gives more reasonable
+  // temperature step response
   Fluid.MixingVolumes.MixingVolume vol(
     redeclare final package Medium = Medium,
     final m_flow_nominal=m_flow_nominal,
@@ -124,10 +124,10 @@
     annotation (Placement(transformation(extent={{60,20},{80,40}})));
 
 protected
-  parameter Modelica.SIunits.HeatCapacity CPip=
+  parameter Modelica.Units.SI.HeatCapacity CPip=
     length*((dh + 2*thickness)^2 - dh^2)*Modelica.Constants.pi/4*cPip*rhoPip "Heat capacity of pipe wall";
 
-  final parameter Modelica.SIunits.Volume VEqu=CPip/(rho_default*cp_default)
+  final parameter Modelica.Units.SI.Volume VEqu=CPip/(rho_default*cp_default)
     "Equivalent water volume to represent pipe wall thermal inertia";
 
   parameter Medium.ThermodynamicState sta_default=Medium.setState_pTX(
@@ -135,7 +135,7 @@
       p=Medium.p_default,
       X=Medium.X_default) "Default medium state";
 
-  parameter Modelica.SIunits.SpecificHeatCapacity cp_default=
+  parameter Modelica.Units.SI.SpecificHeatCapacity cp_default=
       Medium.specificHeatCapacityCp(state=sta_default)
     "Heat capacity of medium";
 
@@ -143,13 +143,13 @@
     rho_default*Modelica.Constants.pi*(dh/2)^2*cp_default
     "Thermal capacity per unit length of water in pipe";
 
-  parameter Modelica.SIunits.Density rho_default=Medium.density_pTX(
+
+  parameter Modelica.Units.SI.Density rho_default=Medium.density_pTX(
       p=Medium.p_default,
       T=Medium.T_default,
       X=Medium.X_default)
     "Default density (e.g., rho_liquidWater = 995, rho_air = 1.2)"
     annotation (Dialog(group="Advanced"));
-
 equation
   for i in 1:nPorts loop
     connect(vol.ports[i + 1], ports_b[i])
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/PressureDrop.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/PressureDrop.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/PressureDrop.mo"	2022-03-10 09:57:39.676144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/PressureDrop.mo"	2022-03-10 09:58:19.144149340 +0000
@@ -30,48 +30,35 @@
 
  assert(m_flow_nominal_pos > 0, "m_flow_nominal_pos must be non-zero. Check parameters.");
 equation
-  // Pressure drop calculation
-  if computeFlowResistance then
-    if linearized then
-      if from_dp then
-        m_flow = dp*coeff;
-      else
-        dp = m_flow*coeff;
-      end if;
-    else
-      if homotopyInitialization then
-        if from_dp then
-          m_flow = homotopy(actual=
-            IBPSA.Fluid.BaseClasses.FlowModels.basicFlowFunction_dp(
-                  dp=dp,
-                  k=k,
-                  m_flow_turbulent=m_flow_turbulent), simplified=
-            m_flow_nominal_pos*dp/dp_nominal_pos);
-        else
-          dp = homotopy(actual=
-            IBPSA.Fluid.BaseClasses.FlowModels.basicFlowFunction_m_flow(
-                  m_flow=m_flow,
-                  k=k,
-                  m_flow_turbulent=m_flow_turbulent), simplified=
-            dp_nominal_pos*m_flow/m_flow_nominal_pos);
-         end if;  // from_dp
-      else // do not use homotopy
-        if from_dp then
-          m_flow =
-            IBPSA.Fluid.BaseClasses.FlowModels.basicFlowFunction_dp(
-                  dp=dp,
-                  k=k,
-                  m_flow_turbulent=m_flow_turbulent);
-        else
-          dp =
-            IBPSA.Fluid.BaseClasses.FlowModels.basicFlowFunction_m_flow(
-                  m_flow=m_flow,
-                  k=k,
-                  m_flow_turbulent=m_flow_turbulent);
-        end if;  // from_dp
-      end if; // homotopyInitialization
-    end if; // linearized
-  else // do not compute flow resistance
+// Pressure drop calculation
+  if computeFlowResistance then
+  if linearized then
+      if from_dp then
+        m_flow = dp * coeff;
+      else
+        dp = m_flow * coeff;
+      end if;
+    else
+      if homotopyInitialization then
+        if from_dp then
+          m_flow = homotopy(actual = IBPSA.Fluid.BaseClasses.FlowModels.basicFlowFunction_dp(dp = dp, k = k, m_flow_turbulent = m_flow_turbulent), simplified = m_flow_nominal_pos * dp / dp_nominal_pos);
+        else
+          dp = homotopy(actual = IBPSA.Fluid.BaseClasses.FlowModels.basicFlowFunction_m_flow(m_flow = m_flow, k = k, m_flow_turbulent = m_flow_turbulent), simplified = dp_nominal_pos * m_flow / m_flow_nominal_pos);
+        end if;
+// from_dp
+      else
+// do not use homotopy
+        if from_dp then
+          m_flow = IBPSA.Fluid.BaseClasses.FlowModels.basicFlowFunction_dp(dp = dp, k = k, m_flow_turbulent = m_flow_turbulent);
+        else
+          dp = IBPSA.Fluid.BaseClasses.FlowModels.basicFlowFunction_m_flow(m_flow = m_flow, k = k, m_flow_turbulent = m_flow_turbulent);
+        end if;
+// from_dp
+      end if;
+// homotopyInitialization
+    end if; // linearized
+  else
+// do not compute flow resistance
     dp = 0;
   end if;  // computeFlowResistance
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/BaseClasses/PipeDataULg.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/BaseClasses/PipeDataULg.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/BaseClasses/PipeDataULg.mo"	2022-03-10 09:57:39.676144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/BaseClasses/PipeDataULg.mo"	2022-03-10 09:58:19.060149329 +0000
@@ -1,11 +1,11 @@
-within BuildSysPro.IBPSA.Fluid.FixedResistances.Validation.PlugFlowPipes.Data.BaseClasses;
+within BuildSysPro.IBPSA.Fluid.FixedResistances.Validation.PlugFlowPipes.Data.BaseClasses;
 partial record PipeDataULg "Base class for ULg experimental data"
   extends PipeDataBaseDefinition;
-  parameter Modelica.SIunits.Temp_C T_start_in = 20
+  parameter Modelica.Units.NonSI.Temperature_degC T_start_in = 20
     "Initial temperature at inlet";
-  parameter Modelica.SIunits.Temp_C T_start_out = 20
+  parameter Modelica.Units.NonSI.Temperature_degC T_start_out = 20
     "Initial temperature at outlet";
-  parameter Modelica.SIunits.MassFlowRate m_flowIni = 0
+  parameter Modelica.Units.SI.MassFlowRate m_flowIni = 0
     "Mass flow initialization";
   annotation (Documentation(info="
 
    
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/PipeDataAIT151218.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/PipeDataAIT151218.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/PipeDataAIT151218.mo"	2022-03-10 09:57:39.676144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/PipeDataAIT151218.mo"	2022-03-10 09:58:19.052149327 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.IBPSA.Fluid.FixedResistances.Validation.PlugFlowPipes.Data;
+within BuildSysPro.IBPSA.Fluid.FixedResistances.Validation.PlugFlowPipes.Data;
 record PipeDataAIT151218
   "Experimental data from AIT monitoring data December 18, 2015"
     extends BaseClasses.PipeDataBaseDefinition(final n=9, data=[0,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/PipeDataULg150801.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/PipeDataULg150801.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/PipeDataULg150801.mo"	2022-03-10 09:57:39.676144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/PipeDataULg150801.mo"	2022-03-10 09:58:18.840149301 +0000
@@ -1,12 +1,12 @@
-within BuildSysPro.IBPSA.Fluid.FixedResistances.Validation.PlugFlowPipes.Data;
+within BuildSysPro.IBPSA.Fluid.FixedResistances.Validation.PlugFlowPipes.Data;
 record PipeDataULg150801
   "Experimental data from ULg's pipe test bench from August 1"
-  //   Column 1: Time in s
-  //   Column 2: Mass flow rate in kg/s
-  //   Column 3: Outlet pipe temperature in °C
-  //   Column 4: Outlet water temperature in °C
-  //   Column 5: Inlet pipe temperature in °C
-  //   Column 6: Inlet water temperature in °C
+  //   Column 1: Time in s
+  //   Column 2: Mass flow rate in kg/s
+  //   Column 3: Outlet pipe temperature in °C
+  //   Column 4: Outlet water temperature in °C
+  //   Column 5: Inlet pipe temperature in °C
+  //   Column 6: Inlet water temperature in °C
   extends
     IBPSA.Fluid.FixedResistances.Validation.PlugFlowPipes.Data.BaseClasses.PipeDataULg(
     final n=5,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/PipeDataULg151202.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/PipeDataULg151202.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/PipeDataULg151202.mo"	2022-03-10 09:57:39.676144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/PipeDataULg151202.mo"	2022-03-10 09:58:18.800149295 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.IBPSA.Fluid.FixedResistances.Validation.PlugFlowPipes.Data;
+within BuildSysPro.IBPSA.Fluid.FixedResistances.Validation.PlugFlowPipes.Data;
 record PipeDataULg151202
   "Experimental data from ULg's pipe test bench from December 2, 2015"
   extends
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/PipeDataULg151204_1.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/PipeDataULg151204_1.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/PipeDataULg151204_1.mo"	2022-03-10 09:57:39.676144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/PipeDataULg151204_1.mo"	2022-03-10 09:58:18.784149293 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.IBPSA.Fluid.FixedResistances.Validation.PlugFlowPipes.Data;
+within BuildSysPro.IBPSA.Fluid.FixedResistances.Validation.PlugFlowPipes.Data;
 record PipeDataULg151204_1
   "Experimental data from ULg's pipe test bench from December 4, 2015 (1);
   increase followed by a decrease in temperature"
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/PipeDataULg151204_2.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/PipeDataULg151204_2.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/PipeDataULg151204_2.mo"	2022-03-10 09:57:39.676144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/PipeDataULg151204_2.mo"	2022-03-10 09:58:18.768149291 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.IBPSA.Fluid.FixedResistances.Validation.PlugFlowPipes.Data;
+within BuildSysPro.IBPSA.Fluid.FixedResistances.Validation.PlugFlowPipes.Data;
 record PipeDataULg151204_2
   "Experimental data from ULg's pipe test bench from December 4, 2015 (2)"
   extends
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/PipeDataULg151204_4.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/PipeDataULg151204_4.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/PipeDataULg151204_4.mo"	2022-03-10 09:57:39.676144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/PipeDataULg151204_4.mo"	2022-03-10 09:58:18.744149289 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.IBPSA.Fluid.FixedResistances.Validation.PlugFlowPipes.Data;
+within BuildSysPro.IBPSA.Fluid.FixedResistances.Validation.PlugFlowPipes.Data;
 record PipeDataULg151204_4
   "Experimental data from ULg's pipe test bench from December 4, 2015 (4); an increase followed by a decrease temperature"
   extends
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/PipeDataULg160104_2.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/PipeDataULg160104_2.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/PipeDataULg160104_2.mo"	2022-03-10 09:57:39.676144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/PipeDataULg160104_2.mo"	2022-03-10 09:58:18.732149288 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.IBPSA.Fluid.FixedResistances.Validation.PlugFlowPipes.Data;
+within BuildSysPro.IBPSA.Fluid.FixedResistances.Validation.PlugFlowPipes.Data;
 record PipeDataULg160104_2 "Experimental data from ULg's pipe test bench from 4 January 2016. Low mass flow"
   extends
     IBPSA.Fluid.FixedResistances.Validation.PlugFlowPipes.Data.BaseClasses.PipeDataULg(
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/PipeDataULg160118_1.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/PipeDataULg160118_1.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/PipeDataULg160118_1.mo"	2022-03-10 09:57:39.680144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/PipeDataULg160118_1.mo"	2022-03-10 09:58:18.260149227 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.IBPSA.Fluid.FixedResistances.Validation.PlugFlowPipes.Data;
+within BuildSysPro.IBPSA.Fluid.FixedResistances.Validation.PlugFlowPipes.Data;
 record PipeDataULg160118_1
   "Experimental data from ULg's pipe test bench from January 18, 2016"
   extends
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/package.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/package.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/package.mo"	2022-03-10 09:57:39.680144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/Validation/PlugFlowPipes/Data/package.mo"	2022-03-10 09:58:19.088149332 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.IBPSA.Fluid.FixedResistances.Validation.PlugFlowPipes;
+within BuildSysPro.IBPSA.Fluid.FixedResistances.Validation.PlugFlowPipes;
 package Data "Experimental data for verification of pipe models"
 
 annotation (Documentation(info="
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/Validation/PlugFlowPipes/MSLAIT.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/Validation/PlugFlowPipes/MSLAIT.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/Validation/PlugFlowPipes/MSLAIT.mo"	2022-03-10 09:57:39.680144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/Validation/PlugFlowPipes/MSLAIT.mo"	2022-03-10 09:58:18.228149224 +0000
@@ -83,10 +83,10 @@
         origin={124,-8})));
   inner Modelica.Fluid.System system
     annotation (Placement(transformation(extent={{-140,140},{-120,160}})));
-  parameter Modelica.SIunits.ThermalResistance R=
+  parameter Modelica.Units.SI.ThermalResistance R=
     1/(2*kIns*Modelica.Constants.pi)*log(0.18/0.0899) + 1/(2*2.4*Modelica.Constants.pi)*log(2/0.18)
     "Thermal resistance of main pipes";
-  parameter Modelica.SIunits.ThermalResistance R80=
+  parameter Modelica.Units.SI.ThermalResistance R80=
     1/(2*0.024*Modelica.Constants.pi)*log(0.07/0.0337) + 1/(2*2.4*Modelica.Constants.pi)*log(2/0.07)
     "Thermal resistance of service pipes";
 
@@ -246,11 +246,11 @@
         extent={{-10,-10},{10,10}},
         rotation=90,
         origin={-22,62})));
-  parameter Modelica.SIunits.ThermalConductivity kIns=0.024
+  parameter Modelica.Units.SI.ThermalConductivity kIns=0.024
     "Heat conductivity of pipe insulation material";
-  parameter Modelica.SIunits.Length dIns=0.045
+  parameter Modelica.Units.SI.Length dIns=0.045
     "Thickness of pipe insulation";
-  parameter Modelica.SIunits.Diameter diameter=0.089
+  parameter Modelica.Units.SI.Diameter diameter=0.089
     "Outer diameter of pipe";
   Fluid.Sensors.TemperatureTwoPort
                             senTem_p2(redeclare package Medium = Medium,
@@ -291,9 +291,9 @@
         rotation=90,
         origin={42,80})));
 
-  parameter Modelica.SIunits.MassFlowRate m_flow_nominal=1
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=1
     "Nominal mass flow rate, used for regularization near zero flow";
-  parameter Modelica.SIunits.Time tauHeaTra=6500
+  parameter Modelica.Units.SI.Time tauHeaTra=6500
     "Time constant for heat transfer, default 20 minutes";
 
   Fluid.Sources.MassFlowSource_T Point5(
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/Validation/PlugFlowPipes/MSLAIT2Nodes.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/Validation/PlugFlowPipes/MSLAIT2Nodes.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/Validation/PlugFlowPipes/MSLAIT2Nodes.mo"	2022-03-10 09:57:39.680144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/Validation/PlugFlowPipes/MSLAIT2Nodes.mo"	2022-03-10 09:58:18.144149213 +0000
@@ -245,11 +245,11 @@
         extent={{-10,-10},{10,10}},
         rotation=90,
         origin={-28,68})));
-  parameter Modelica.SIunits.ThermalConductivity kIns=0.024
+  parameter Modelica.Units.SI.ThermalConductivity kIns=0.024
     "Heat conductivity";
-  parameter Modelica.SIunits.Length dIns=0.045
+  parameter Modelica.Units.SI.Length dIns=0.045
     "Thickness of pipe insulation";
-  parameter Modelica.SIunits.Diameter diameter=0.089
+  parameter Modelica.Units.SI.Diameter diameter=0.089
     "Outer diameter of pipe";
   Fluid.Sensors.TemperatureTwoPort
                             senTem_p2(redeclare package Medium = Medium,
@@ -290,9 +290,9 @@
         rotation=90,
         origin={18,112})));
 
-  parameter Modelica.SIunits.MassFlowRate m_flow_nominal=1
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=1
     "Nominal mass flow rate, used for regularization near zero flow";
-  parameter Modelica.SIunits.Time tauHeaTra=6500
+  parameter Modelica.Units.SI.Time tauHeaTra=6500
     "Time constant for heat transfer, default 20 minutes";
 
   Modelica.Blocks.Logical.Switch switch
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/Validation/PlugFlowPipes/PlugFlowAIT.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/Validation/PlugFlowPipes/PlugFlowAIT.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/Validation/PlugFlowPipes/PlugFlowAIT.mo"	2022-03-10 09:57:39.680144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/Validation/PlugFlowPipes/PlugFlowAIT.mo"	2022-03-10 09:58:18.068149204 +0000
@@ -3,7 +3,7 @@
   "Validation pipe against data from Austrian Institute of Technology"
   extends Modelica.Icons.Example;
   package Medium = IBPSA.Media.Water;
-  parameter Modelica.SIunits.Length Lcap=1
+  parameter Modelica.Units.SI.Length Lcap=1
     "Length over which transient effects typically take place";
   parameter Real R80(unit="(m.K)/W")=1/(2*0.024*Modelica.Constants.pi)
       *log(0.07/0.0337) + 1/(2*2.4*Modelica.Constants.pi)*log(2/0.07) "Thermal resistance per unit length of service pipes";
@@ -12,12 +12,12 @@
     "Flag to decide whether volumes are included at the end points of the pipe";
   parameter Boolean allowFlowReversal=true
     "= true to allow flow reversal, false restricts to design direction (port_a -> port_b)";
-  parameter Modelica.SIunits.MassFlowRate m_flow_nominal=1
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=1
     "Nominal mass flow rate, used for regularization near zero flow";
-  parameter Modelica.SIunits.Time tauHeaTra=6500
+  parameter Modelica.Units.SI.Time tauHeaTra=6500
     "Time constant for heat transfer, default 20 minutes";
 
-  parameter Modelica.SIunits.Length thickness=0.0032 "Pipe wall thickness";
+  parameter Modelica.Units.SI.Length thickness=0.0032 "Pipe wall thickness";
 
   Fluid.Sources.MassFlowSource_T Point1(
     redeclare package Medium = Medium,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/Validation/PlugFlowPipes/PlugFlowULg.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/Validation/PlugFlowPipes/PlugFlowULg.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/Validation/PlugFlowPipes/PlugFlowULg.mo"	2022-03-10 09:57:39.680144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/Validation/PlugFlowPipes/PlugFlowULg.mo"	2022-03-10 09:58:18.012149196 +0000
@@ -1,15 +1,15 @@
-within BuildSysPro.IBPSA.Fluid.FixedResistances.Validation.PlugFlowPipes;
+within BuildSysPro.IBPSA.Fluid.FixedResistances.Validation.PlugFlowPipes;
 model PlugFlowULg "Validation against data from Université de Liège"
   extends Modelica.Icons.Example;
   package Medium = IBPSA.Media.Water;
 
-  parameter Modelica.SIunits.MassFlowRate m_flow_nominal=1
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=1
     "Nominal mass flow rate, used for regularization near zero flow";
-  parameter Modelica.SIunits.Temperature T_start_in=pipeDataULg.T_start_in + 273.15
+  parameter Modelica.Units.SI.Temperature T_start_in=pipeDataULg.T_start_in + 273.15
     "Initial temperature at pipe inlet";
-  parameter Modelica.SIunits.Temperature T_start_out=pipeDataULg.T_start_out + 273.15
+  parameter Modelica.Units.SI.Temperature T_start_out=pipeDataULg.T_start_out + 273.15
     "Initial temperature at pipe outlet";
-  parameter Modelica.SIunits.SpecificHeatCapacity cp_default=
+  parameter Modelica.Units.SI.SpecificHeatCapacity cp_default=
       Medium.specificHeatCapacityCp(state=sta_default)
     "Heat capacity of medium";
   parameter Medium.ThermodynamicState sta_default=Medium.setState_pTX(
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/Validation/PlugFlowPipes/TransportWaterAir.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/Validation/PlugFlowPipes/TransportWaterAir.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/Validation/PlugFlowPipes/TransportWaterAir.mo"	2022-03-10 09:57:39.680144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/Validation/PlugFlowPipes/TransportWaterAir.mo"	2022-03-10 09:58:17.960149189 +0000
@@ -6,7 +6,7 @@
   package MediumA = IBPSA.Media.Air (extraPropertiesNames={"CO2"})
    "Medium in the duct";
 
-  parameter Modelica.SIunits.Length length=20 "Pipe length";
+  parameter Modelica.Units.SI.Length length=20 "Pipe length";
 
   Modelica.Blocks.Sources.Step Tin(
     startTime=100,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/Validation/PressureDropsSeries.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/Validation/PressureDropsSeries.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/Validation/PressureDropsSeries.mo"	2022-03-10 09:57:39.680144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/FixedResistances/Validation/PressureDropsSeries.mo"	2022-03-10 09:58:17.848149176 +0000
@@ -6,7 +6,7 @@
 
    parameter Integer nRes(min=2) = 10 "Number of resistances";
 
-   parameter Modelica.SIunits.PressureDifference dp_nominal = 5
+   parameter Modelica.Units.SI.PressureDifference dp_nominal = 5
     "Nominal pressure drop for each resistance";
 
    Modelica.Blocks.Sources.Ramp P(
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalHEXOneUTube.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalHEXOneUTube.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalHEXOneUTube.mo"	2022-03-10 09:57:39.680144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalHEXOneUTube.mo"	2022-03-10 09:58:17.784149168 +0000
@@ -5,7 +5,7 @@
 
   parameter Integer nSeg(min=1) = 10
     "Number of segments to use in vertical discretization of the boreholes";
-  parameter Modelica.SIunits.Length hSeg = borFieDat.conDat.hBor/nSeg
+  parameter Modelica.Units.SI.Length hSeg = borFieDat.conDat.hBor/nSeg
     "Length of the internal heat exchanger";
 
   package Medium =
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalHEXTwoUTube.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalHEXTwoUTube.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalHEXTwoUTube.mo"	2022-03-10 09:57:39.680144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalHEXTwoUTube.mo"	2022-03-10 09:58:17.756149163 +0000
@@ -5,7 +5,7 @@
 
   parameter Integer nSeg(min=1) = 10
     "Number of segments to use in vertical discretization of the boreholes";
-  parameter Modelica.SIunits.Length hSeg = borFieDat.conDat.hBor/nSeg
+  parameter Modelica.Units.SI.Length hSeg = borFieDat.conDat.hBor/nSeg
     "Length of the internal heat exchanger";
 
   package Medium =
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalResistancesOneUTube.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalResistancesOneUTube.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalResistancesOneUTube.mo"	2022-03-10 09:57:39.680144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalResistancesOneUTube.mo"	2022-03-10 09:58:17.728149160 +0000
@@ -4,12 +4,12 @@
 
   parameter Integer nSeg(min=1) = 10
     "Number of segments to use in vertical discretization of the boreholes";
-  parameter Modelica.SIunits.Length hSeg = borFieDat.conDat.hBor/nSeg
+  parameter Modelica.Units.SI.Length hSeg = borFieDat.conDat.hBor/nSeg
     "Length of the internal heat exchanger";
-  parameter Modelica.SIunits.ThermalResistance Rgb_val=0.0430511 "Grout node to borehole wall thermal resistance";
-  parameter Modelica.SIunits.ThermalResistance Rgg_val=0.00605573 "Grout node to grout node thermal resistance";
-  parameter Modelica.SIunits.ThermalResistance RCondGro_val=0.14285 "Pipe to grout node thermal resistance";
-  parameter Modelica.SIunits.Temperature T_start=298.15 "Initial temperature";
+  parameter Modelica.Units.SI.ThermalResistance Rgb_val=0.0430511 "Grout node to borehole wall thermal resistance";
+  parameter Modelica.Units.SI.ThermalResistance Rgg_val=0.00605573 "Grout node to grout node thermal resistance";
+  parameter Modelica.Units.SI.ThermalResistance RCondGro_val=0.14285 "Pipe to grout node thermal resistance";
+  parameter Modelica.Units.SI.Temperature T_start=298.15 "Initial temperature";
 
   IBPSA.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses.InternalResistancesOneUTube
     intRes1UTub(
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalResistancesTwoUTube.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalResistancesTwoUTube.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalResistancesTwoUTube.mo"	2022-03-10 09:57:39.680144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalResistancesTwoUTube.mo"	2022-03-10 09:58:17.712149157 +0000
@@ -4,14 +4,14 @@
 
   parameter Integer nSeg(min=1) = 10
     "Number of segments to use in vertical discretization of the boreholes";
-  parameter Modelica.SIunits.Length hSeg = borFieDat.conDat.hBor/nSeg
+  parameter Modelica.Units.SI.Length hSeg = borFieDat.conDat.hBor/nSeg
     "Length of the internal heat exchanger";
-  parameter Modelica.SIunits.ThermalResistance Rgb_val=0.572601 "Grout node to borehole wall thermal resistance";
-  parameter Modelica.SIunits.ThermalResistance Rgg1_val=0.0406121 "Grout node to grout node thermal resistance";
-  parameter Modelica.SIunits.ThermalResistance Rgg2_val=0.216904
+  parameter Modelica.Units.SI.ThermalResistance Rgb_val=0.572601 "Grout node to borehole wall thermal resistance";
+  parameter Modelica.Units.SI.ThermalResistance Rgg1_val=0.0406121 "Grout node to grout node thermal resistance";
+  parameter Modelica.Units.SI.ThermalResistance Rgg2_val=0.216904
     "Thermal resistance between two grout nodes opposite to each other";
-  parameter Modelica.SIunits.ThermalResistance RCondGro_val=0.195099 "Pipe to grout node thermal resistance";
-  parameter Modelica.SIunits.Temperature T_start=298.15 "Initial temperature";
+  parameter Modelica.Units.SI.ThermalResistance RCondGro_val=0.195099 "Pipe to grout node thermal resistance";
+  parameter Modelica.Units.SI.Temperature T_start=298.15 "Initial temperature";
 
   Modelica.Thermal.HeatTransfer.Sources.FixedTemperature TWal(T=T_start)
     "Borehole wall temperature"
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/ConvectionResistanceCircularPipe.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/ConvectionResistanceCircularPipe.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/ConvectionResistanceCircularPipe.mo"	2022-03-10 09:57:39.680144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/ConvectionResistanceCircularPipe.mo"	2022-03-10 09:58:17.660149151 +0000
@@ -3,24 +3,24 @@
   "Validation of the correlation used to evaluate the convection resistance in circular pipes"
   extends Modelica.Icons.Example;
 
-  parameter Modelica.SIunits.Height hSeg = 1.0 "Height of the element";
-  parameter Modelica.SIunits.Radius rTub = 0.02 "Tube radius";
-  parameter Modelica.SIunits.Length eTub = 0.002 "Tube thickness";
+  parameter Modelica.Units.SI.Height hSeg = 1.0 "Height of the element";
+  parameter Modelica.Units.SI.Radius rTub = 0.02 "Tube radius";
+  parameter Modelica.Units.SI.Length eTub = 0.002 "Tube thickness";
   // thermal properties
-  parameter Modelica.SIunits.ThermalConductivity kMed = 0.6
+  parameter Modelica.Units.SI.ThermalConductivity kMed = 0.6
     "Thermal conductivity of the fluid";
-  parameter Modelica.SIunits.DynamicViscosity muMed = 1.002e-3
+  parameter Modelica.Units.SI.DynamicViscosity muMed = 1.002e-3
     "Dynamic viscosity of the fluid";
-  parameter Modelica.SIunits.SpecificHeatCapacity cpMed = 4182
+  parameter Modelica.Units.SI.SpecificHeatCapacity cpMed = 4182
     "Specific heat capacity of the fluid";
-  parameter Modelica.SIunits.MassFlowRate m_flow_nominal = 1
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = 1
     "Nominal mass flow rate";
 
   Real Re "Reynolds number";
   Real Nu "Reynolds number";
-  Modelica.SIunits.MassFlowRate m_flow "Mass flow rate";
-  Modelica.SIunits.ThermalResistance RConv "Convection resistance";
 
+  Modelica.Units.SI.MassFlowRate m_flow "Mass flow rate";
+  Modelica.Units.SI.ThermalResistance RConv "Convection resistance";
 equation
 
   Re = time;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesOneUTube.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesOneUTube.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesOneUTube.mo"	2022-03-10 09:57:39.680144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesOneUTube.mo"	2022-03-10 09:58:17.640149149 +0000
@@ -3,44 +3,44 @@
   "Validation of the thermal resistances using the method of Bauer et al. (2011) for a single U-tube borehole"
   extends Modelica.Icons.Example;
 
-  // Geometry of the borehole
+
+// Geometry of the borehole
   parameter Real Rb(unit="(m.K)/W") = 0.0
     "Borehole thermal resistance (Not used)";
-  parameter Modelica.SIunits.Height hSeg = 1.0 "Height of the element";
-  parameter Modelica.SIunits.Radius rBor = 0.07 "Radius of the borehole";
+  parameter Modelica.Units.SI.Height hSeg = 1.0 "Height of the element";
+  parameter Modelica.Units.SI.Radius rBor = 0.07 "Radius of the borehole";
   // Geometry of the pipe
-  parameter Modelica.SIunits.Radius rTub = 0.02 "Radius of the tube";
-  parameter Modelica.SIunits.Length eTub = 0.002 "Thickness of the tubes";
-  parameter Modelica.SIunits.Length sha = 0.03
+  parameter Modelica.Units.SI.Radius rTub = 0.02 "Radius of the tube";
+  parameter Modelica.Units.SI.Length eTub = 0.002 "Thickness of the tubes";
+  parameter Modelica.Units.SI.Length sha = 0.03
     "Shank spacing, defined as the distance between the center of a pipe and the center of the borehole";
 
   // Thermal properties (Solids)
-  parameter Modelica.SIunits.ThermalConductivity kFil = 1.5
+  parameter Modelica.Units.SI.ThermalConductivity kFil = 1.5
     "Thermal conductivity of the grout";
-  parameter Modelica.SIunits.ThermalConductivity kSoi = 2.5
+  parameter Modelica.Units.SI.ThermalConductivity kSoi = 2.5
     "Thermal conductivity of the soi";
-  parameter Modelica.SIunits.ThermalConductivity kTub = 0.4
+  parameter Modelica.Units.SI.ThermalConductivity kTub = 0.4
     "Thermal conductivity of the tube";
 
   // Thermal properties (Fluid)
-  parameter Modelica.SIunits.ThermalConductivity kMed = 0.6
+  parameter Modelica.Units.SI.ThermalConductivity kMed = 0.6
     "Thermal conductivity of the fluid";
-  parameter Modelica.SIunits.DynamicViscosity muMed = 1.0e-3
+  parameter Modelica.Units.SI.DynamicViscosity muMed = 1.0e-3
     "Dynamic viscosity of the fluid";
-  parameter Modelica.SIunits.SpecificHeatCapacity cpMed = 4180.0
+  parameter Modelica.Units.SI.SpecificHeatCapacity cpMed = 4180.0
     "Specific heat capacity of the fluid";
-  parameter Modelica.SIunits.MassFlowRate m_flow_nominal = 0.25
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = 0.25
     "Nominal mass flow rate";
 
-  // Outputs
+// Outputs
   parameter Real x(fixed=false) "Capacity location";
-  parameter Modelica.SIunits.ThermalResistance Rgb(fixed=false)
+  parameter Modelica.Units.SI.ThermalResistance Rgb(fixed=false)
     "Thermal resistance between grout zone and borehole wall";
-  parameter Modelica.SIunits.ThermalResistance Rgg(fixed=false)
+  parameter Modelica.Units.SI.ThermalResistance Rgg(fixed=false)
     "Thermal resistance between the two grout zones";
-  parameter Modelica.SIunits.ThermalResistance RCondGro(fixed=false)
+  parameter Modelica.Units.SI.ThermalResistance RCondGro(fixed=false)
     "Thermal resistance between: pipe wall to capacity in grout";
-
 initial equation
   (x,Rgb,Rgg,RCondGro) =
     IBPSA.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses.Functions.internalResistancesOneUTube(
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesOneUTubeNegative.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesOneUTubeNegative.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesOneUTubeNegative.mo"	2022-03-10 09:57:39.680144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesOneUTubeNegative.mo"	2022-03-10 09:58:17.588149143 +0000
@@ -3,44 +3,44 @@
   "Validation of the thermal resistances using the method of Bauer et al. (2011) for a single U-tube borehole"
   extends Modelica.Icons.Example;
 
-  // Geometry of the borehole
+
+// Geometry of the borehole
   parameter Real Rb(unit="(m.K)/W") = 0.0
     "Borehole thermal resistance (Not used)";
-  parameter Modelica.SIunits.Height hSeg = 1.0 "Height of the element";
-  parameter Modelica.SIunits.Radius rBor = 0.07 "Radius of the borehole";
+  parameter Modelica.Units.SI.Height hSeg = 1.0 "Height of the element";
+  parameter Modelica.Units.SI.Radius rBor = 0.07 "Radius of the borehole";
   // Geometry of the pipe
-  parameter Modelica.SIunits.Radius rTub = 0.02 "Radius of the tube";
-  parameter Modelica.SIunits.Length eTub = 0.002 "Thickness of the tubes";
-  parameter Modelica.SIunits.Length sha = 0.05
+  parameter Modelica.Units.SI.Radius rTub = 0.02 "Radius of the tube";
+  parameter Modelica.Units.SI.Length eTub = 0.002 "Thickness of the tubes";
+  parameter Modelica.Units.SI.Length sha = 0.05
     "Shank spacing, defined as the distance between the center of a pipe and the center of the borehole";
 
   // Thermal properties (Solids)
-  parameter Modelica.SIunits.ThermalConductivity kFil = 1.5
+  parameter Modelica.Units.SI.ThermalConductivity kFil = 1.5
     "Thermal conductivity of the grout";
-  parameter Modelica.SIunits.ThermalConductivity kSoi = 2.5
+  parameter Modelica.Units.SI.ThermalConductivity kSoi = 2.5
     "Thermal conductivity of the soi";
-  parameter Modelica.SIunits.ThermalConductivity kTub = 0.4
+  parameter Modelica.Units.SI.ThermalConductivity kTub = 0.4
     "Thermal conductivity of the tube";
 
   // Thermal properties (Fluid)
-  parameter Modelica.SIunits.ThermalConductivity kMed = 0.6
+  parameter Modelica.Units.SI.ThermalConductivity kMed = 0.6
     "Thermal conductivity of the fluid";
-  parameter Modelica.SIunits.DynamicViscosity muMed = 1.0e-3
+  parameter Modelica.Units.SI.DynamicViscosity muMed = 1.0e-3
     "Dynamic viscosity of the fluid";
-  parameter Modelica.SIunits.SpecificHeatCapacity cpMed = 4180.0
+  parameter Modelica.Units.SI.SpecificHeatCapacity cpMed = 4180.0
     "Specific heat capacity of the fluid";
-  parameter Modelica.SIunits.MassFlowRate m_flow_nominal = 0.25
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = 0.25
     "Nominal mass flow rate";
 
-  // Outputs
+// Outputs
   parameter Real x(fixed=false) "Capacity location";
-  parameter Modelica.SIunits.ThermalResistance Rgb(fixed=false)
+  parameter Modelica.Units.SI.ThermalResistance Rgb(fixed=false)
     "Thermal resistance between grout zone and borehole wall";
-  parameter Modelica.SIunits.ThermalResistance Rgg(fixed=false)
+  parameter Modelica.Units.SI.ThermalResistance Rgg(fixed=false)
     "Thermal resistance between the two grout zones";
-  parameter Modelica.SIunits.ThermalResistance RCondGro(fixed=false)
+  parameter Modelica.Units.SI.ThermalResistance RCondGro(fixed=false)
     "Thermal resistance between: pipe wall to capacity in grout";
-
 initial equation
   (x,Rgb,Rgg,RCondGro) =
     IBPSA.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses.Functions.internalResistancesOneUTube(
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesTwoUTube.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesTwoUTube.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesTwoUTube.mo"	2022-03-10 09:57:39.680144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesTwoUTube.mo"	2022-03-10 09:58:17.564149140 +0000
@@ -3,46 +3,46 @@
   "Validation of the thermal resistances using the method of Bauer et al. (2011) for a double U-tube borehole"
   extends Modelica.Icons.Example;
 
-  // Geometry of the borehole
+
+// Geometry of the borehole
   parameter Real Rb(unit="(m.K)/W") = 0.0
     "Borehole thermal resistance (Not used)";
-  parameter Modelica.SIunits.Height hSeg = 1.0 "Height of the element";
-  parameter Modelica.SIunits.Radius rBor = 0.07 "Radius of the borehole";
+  parameter Modelica.Units.SI.Height hSeg = 1.0 "Height of the element";
+  parameter Modelica.Units.SI.Radius rBor = 0.07 "Radius of the borehole";
   // Geometry of the pipe
-  parameter Modelica.SIunits.Radius rTub = 0.02 "Radius of the tube";
-  parameter Modelica.SIunits.Length eTub = 0.002 "Thickness of the tubes";
-  parameter Modelica.SIunits.Length sha = 0.025
+  parameter Modelica.Units.SI.Radius rTub = 0.02 "Radius of the tube";
+  parameter Modelica.Units.SI.Length eTub = 0.002 "Thickness of the tubes";
+  parameter Modelica.Units.SI.Length sha = 0.025
     "Shank spacing, defined as the distance between the center of a pipe and the center of the borehole";
 
   // Thermal properties (Solids)
-  parameter Modelica.SIunits.ThermalConductivity kFil = 0.5
+  parameter Modelica.Units.SI.ThermalConductivity kFil = 0.5
     "Thermal conductivity of the grout";
-  parameter Modelica.SIunits.ThermalConductivity kSoi = 2.5
+  parameter Modelica.Units.SI.ThermalConductivity kSoi = 2.5
     "Thermal conductivity of the soi";
-  parameter Modelica.SIunits.ThermalConductivity kTub = 0.4
+  parameter Modelica.Units.SI.ThermalConductivity kTub = 0.4
     "Thermal conductivity of the tube";
 
   // Thermal properties (Fluid)
-  parameter Modelica.SIunits.ThermalConductivity kMed = 0.6
+  parameter Modelica.Units.SI.ThermalConductivity kMed = 0.6
     "Thermal conductivity of the fluid";
-  parameter Modelica.SIunits.DynamicViscosity muMed = 1.0e-3
+  parameter Modelica.Units.SI.DynamicViscosity muMed = 1.0e-3
     "Dynamic viscosity of the fluid";
-  parameter Modelica.SIunits.SpecificHeatCapacity cpMed = 4180.0
+  parameter Modelica.Units.SI.SpecificHeatCapacity cpMed = 4180.0
     "Specific heat capacity of the fluid";
-  parameter Modelica.SIunits.MassFlowRate m_flow_nominal = 0.25
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = 0.25
     "Nominal mass flow rate";
 
-  // Outputs
+// Outputs
   parameter Real x(fixed=false) "Capacity location";
-  parameter Modelica.SIunits.ThermalResistance Rgb(fixed=false)
+  parameter Modelica.Units.SI.ThermalResistance Rgb(fixed=false)
     "Thermal resistance between grout zone and borehole wall";
-  parameter Modelica.SIunits.ThermalResistance Rgg1(fixed=false)
+  parameter Modelica.Units.SI.ThermalResistance Rgg1(fixed=false)
     "Thermal resistance between the two adjacent grout zones";
-  parameter Modelica.SIunits.ThermalResistance Rgg2(fixed=false)
+  parameter Modelica.Units.SI.ThermalResistance Rgg2(fixed=false)
     "Thermal resistance between the two opposite grout zones";
-  parameter Modelica.SIunits.ThermalResistance RCondGro(fixed=false)
+  parameter Modelica.Units.SI.ThermalResistance RCondGro(fixed=false)
     "Thermal resistance between: pipe wall to capacity in grout";
-
 initial equation
   (x,Rgb,Rgg1,Rgg2,RCondGro) =
     IBPSA.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses.Functions.internalResistancesTwoUTube(
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesTwoUTubeNegative.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesTwoUTubeNegative.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesTwoUTubeNegative.mo"	2022-03-10 09:57:39.680144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesTwoUTubeNegative.mo"	2022-03-10 09:58:17.548149137 +0000
@@ -3,46 +3,46 @@
   "Validation of the thermal resistances using the method of Bauer et al. (2011) for a double U-tube borehole"
   extends Modelica.Icons.Example;
 
-  // Geometry of the borehole
+
+// Geometry of the borehole
   parameter Real Rb(unit="(m.K)/W") = 0.0
     "Borehole thermal resistance (Not used)";
-  parameter Modelica.SIunits.Height hSeg = 1.0 "Height of the element";
-  parameter Modelica.SIunits.Radius rBor = 0.07 "Radius of the borehole";
+  parameter Modelica.Units.SI.Height hSeg = 1.0 "Height of the element";
+  parameter Modelica.Units.SI.Radius rBor = 0.07 "Radius of the borehole";
   // Geometry of the pipe
-  parameter Modelica.SIunits.Radius rTub = 0.02 "Radius of the tube";
-  parameter Modelica.SIunits.Length eTub = 0.002 "Thickness of the tubes";
-  parameter Modelica.SIunits.Length sha = 0.05
+  parameter Modelica.Units.SI.Radius rTub = 0.02 "Radius of the tube";
+  parameter Modelica.Units.SI.Length eTub = 0.002 "Thickness of the tubes";
+  parameter Modelica.Units.SI.Length sha = 0.05
     "Shank spacing, defined as the distance between the center of a pipe and the center of the borehole";
 
   // Thermal properties (Solids)
-  parameter Modelica.SIunits.ThermalConductivity kFil = 1.5
+  parameter Modelica.Units.SI.ThermalConductivity kFil = 1.5
     "Thermal conductivity of the grout";
-  parameter Modelica.SIunits.ThermalConductivity kSoi = 2.5
+  parameter Modelica.Units.SI.ThermalConductivity kSoi = 2.5
     "Thermal conductivity of the soi";
-  parameter Modelica.SIunits.ThermalConductivity kTub = 0.4
+  parameter Modelica.Units.SI.ThermalConductivity kTub = 0.4
     "Thermal conductivity of the tube";
 
   // Thermal properties (Fluid)
-  parameter Modelica.SIunits.ThermalConductivity kMed = 0.6
+  parameter Modelica.Units.SI.ThermalConductivity kMed = 0.6
     "Thermal conductivity of the fluid";
-  parameter Modelica.SIunits.DynamicViscosity muMed = 1.0e-3
+  parameter Modelica.Units.SI.DynamicViscosity muMed = 1.0e-3
     "Dynamic viscosity of the fluid";
-  parameter Modelica.SIunits.SpecificHeatCapacity cpMed = 4180.0
+  parameter Modelica.Units.SI.SpecificHeatCapacity cpMed = 4180.0
     "Specific heat capacity of the fluid";
-  parameter Modelica.SIunits.MassFlowRate m_flow_nominal = 0.25
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = 0.25
     "Nominal mass flow rate";
 
-  // Outputs
+// Outputs
   parameter Real x(fixed=false) "Capacity location";
-  parameter Modelica.SIunits.ThermalResistance Rgb(fixed=false)
+  parameter Modelica.Units.SI.ThermalResistance Rgb(fixed=false)
     "Thermal resistance between grout zone and borehole wall";
-  parameter Modelica.SIunits.ThermalResistance Rgg1(fixed=false)
+  parameter Modelica.Units.SI.ThermalResistance Rgg1(fixed=false)
     "Thermal resistance between the two adjacent grout zones";
-  parameter Modelica.SIunits.ThermalResistance Rgg2(fixed=false)
+  parameter Modelica.Units.SI.ThermalResistance Rgg2(fixed=false)
     "Thermal resistance between the two opposite grout zones";
-  parameter Modelica.SIunits.ThermalResistance RCondGro(fixed=false)
+  parameter Modelica.Units.SI.ThermalResistance RCondGro(fixed=false)
     "Thermal resistance between: pipe wall to capacity in grout";
-
 initial equation
   (x,Rgb,Rgg1,Rgg2,RCondGro) =
     IBPSA.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses.Functions.internalResistancesTwoUTube(
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/MultipoleThermalResistances_OneUTube.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/MultipoleThermalResistances_OneUTube.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/MultipoleThermalResistances_OneUTube.mo"	2022-03-10 09:57:39.680144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/MultipoleThermalResistances_OneUTube.mo"	2022-03-10 09:58:17.532149136 +0000
@@ -5,21 +5,21 @@
 
   parameter Integer nPip=2 "Number of pipes";
   parameter Integer J=3 "Number of multipoles";
-  parameter Modelica.SIunits.Position[nPip] xPip={0.03, -0.03}
+  parameter Modelica.Units.SI.Position[nPip] xPip={0.03, -0.03}
     "x-Coordinates of pipes";
-  parameter Modelica.SIunits.Position[nPip] yPip={0.00, 0.02}
+  parameter Modelica.Units.SI.Position[nPip] yPip={0.00, 0.02}
     "y-Coordinates of pipes";
-  parameter Modelica.SIunits.Radius rBor=0.07 "Borehole radius";
-  parameter Modelica.SIunits.Radius[nPip] rPip=fill(0.02, nPip)
+  parameter Modelica.Units.SI.Radius rBor=0.07 "Borehole radius";
+  parameter Modelica.Units.SI.Radius[nPip] rPip=fill(0.02, nPip)
     "Outter radius of pipes";
-  parameter Modelica.SIunits.ThermalConductivity kFil=1.5
+  parameter Modelica.Units.SI.ThermalConductivity kFil=1.5
     "Thermal conductivity of grouting material";
-  parameter Modelica.SIunits.ThermalConductivity kSoi=2.5
+  parameter Modelica.Units.SI.ThermalConductivity kSoi=2.5
     "Thermal conductivity of soil material";
   parameter Real[nPip] RFluPip(unit="(m.K)/W")=
     fill(1.2/(2*Modelica.Constants.pi*kFil), nPip)
     "Fluid to pipe wall thermal resistances";
-  parameter Modelica.SIunits.Temperature TBor=0
+  parameter Modelica.Units.SI.Temperature TBor=0
     "Average borehole wall temperature";
 
   parameter Real[nPip,nPip] RDelta_Ref=
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/MultipoleThermalResistances_TwoUTube.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/MultipoleThermalResistances_TwoUTube.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/MultipoleThermalResistances_TwoUTube.mo"	2022-03-10 09:57:39.680144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/MultipoleThermalResistances_TwoUTube.mo"	2022-03-10 09:58:17.516149133 +0000
@@ -5,21 +5,21 @@
 
   parameter Integer nPip=4 "Number of pipes";
   parameter Integer J=3 "Number of multipoles";
-  parameter Modelica.SIunits.Position[nPip] xPip={0.03, -0.03, -0.03, 0.03}
+  parameter Modelica.Units.SI.Position[nPip] xPip={0.03, -0.03, -0.03, 0.03}
     "x-Coordinates of pipes";
-  parameter Modelica.SIunits.Position[nPip] yPip={0.03, 0.03, -0.03, -0.03}
+  parameter Modelica.Units.SI.Position[nPip] yPip={0.03, 0.03, -0.03, -0.03}
     "y-Coordinates of pipes";
-  parameter Modelica.SIunits.Radius rBor=0.07 "Borehole radius";
-  parameter Modelica.SIunits.Radius[nPip] rPip=fill(0.02, nPip)
+  parameter Modelica.Units.SI.Radius rBor=0.07 "Borehole radius";
+  parameter Modelica.Units.SI.Radius[nPip] rPip=fill(0.02, nPip)
     "Outter radius of pipes";
-  parameter Modelica.SIunits.ThermalConductivity kFil=1.5
+  parameter Modelica.Units.SI.ThermalConductivity kFil=1.5
     "Thermal conductivity of grouting material";
-  parameter Modelica.SIunits.ThermalConductivity kSoi=2.5
+  parameter Modelica.Units.SI.ThermalConductivity kSoi=2.5
     "Thermal conductivity of soil material";
   parameter Real[nPip] RFluPip(unit="(m.K)/W")=
     fill(1.2/(2*Modelica.Constants.pi*kFil), nPip)
     "Fluid to pipe wall thermal resistances";
-  parameter Modelica.SIunits.Temperature TBor=0
+  parameter Modelica.Units.SI.Temperature TBor=0
     "Average borehole wall temperature";
 
   parameter Real[nPip,nPip] RDelta_Ref(unit="(m.K)/W")=
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/convectionResistanceCircularPipe.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/convectionResistanceCircularPipe.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/convectionResistanceCircularPipe.mo"	2022-03-10 09:57:39.680144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/convectionResistanceCircularPipe.mo"	2022-03-10 09:58:17.496149130 +0000
@@ -3,63 +3,54 @@
   "Thermal resistance from the fluid in pipes and the grout zones (Bauer et al. 2011)"
 
   // Geometry of the borehole
-  input Modelica.SIunits.Height hSeg "Height of the element";
-  input Modelica.SIunits.Radius rTub "Tube radius";
-  input Modelica.SIunits.Length eTub "Tube thickness";
+  input Modelica.Units.SI.Height hSeg "Height of the element";
+  input Modelica.Units.SI.Radius rTub "Tube radius";
+  input Modelica.Units.SI.Length eTub "Tube thickness";
   // thermal properties
-  input Modelica.SIunits.ThermalConductivity kMed
+  input Modelica.Units.SI.ThermalConductivity kMed
     "Thermal conductivity of the fluid";
-  input Modelica.SIunits.DynamicViscosity muMed
+  input Modelica.Units.SI.DynamicViscosity muMed
     "Dynamic viscosity of the fluid";
-  input Modelica.SIunits.SpecificHeatCapacity cpMed
+  input Modelica.Units.SI.SpecificHeatCapacity cpMed
     "Specific heat capacity of the fluid";
-  input Modelica.SIunits.MassFlowRate m_flow "Mass flow rate";
-  input Modelica.SIunits.MassFlowRate m_flow_nominal "Nominal mass flow rate";
+  input Modelica.Units.SI.MassFlowRate m_flow "Mass flow rate";
+  input Modelica.Units.SI.MassFlowRate m_flow_nominal "Nominal mass flow rate";
 
   // Outputs
-  output Modelica.SIunits.ThermalResistance RFluPip
+  output Modelica.Units.SI.ThermalResistance RFluPip
     "Convection resistance (or conduction in fluid if no mass flow)";
 
 protected
-  parameter Modelica.SIunits.Radius rTub_in = rTub - eTub
+  parameter Modelica.Units.SI.Radius rTub_in = rTub - eTub
     "Pipe inner radius";
-  Modelica.SIunits.CoefficientOfHeatTransfer h
+  Modelica.Units.SI.CoefficientOfHeatTransfer h
     "Convective heat transfer coefficient of the fluid";
 
   Real k(unit="s/kg")
     "Coefficient used in the computation of the convective heat transfer coefficient";
-  Modelica.SIunits.MassFlowRate m_flow_abs = IBPSA.Utilities.Math.Functions.spliceFunction(m_flow,-m_flow,m_flow,m_flow_nominal/30);
+  Modelica.Units.SI.MassFlowRate m_flow_abs = IBPSA.Utilities.Math.Functions.spliceFunction(m_flow,-m_flow,m_flow,m_flow_nominal/30);
   Real Re "Reynolds number";
   Real NuTurb "Nusselt at Re=2400";
   Real Nu "Nusselt";
 
-algorithm
-  // Convection resistance and Reynolds number
-  k := 2/(muMed*Modelica.Constants.pi*rTub_in);
-  Re := m_flow_abs*k;
-
-  if Re>=2400 then
-    // Turbulent, fully-developped flow in a smooth circular pipe with the
-    // Dittus-Boelter correlation: h = 0.023*k_f*Re*Pr/(2*rTub)
-    // Re = rho*v*DTub / mue_f
-    //    = m_flow/(pi r^2) * DTub/mue_f = 2*m_flow / ( mue*pi*rTub)
-    Nu := 0.023*(cpMed*muMed/kMed)^(0.35)*
-      IBPSA.Utilities.Math.Functions.regNonZeroPower(
-                      x=Re,
-                      n=0.8,
-                      delta=0.01*m_flow_nominal*k);
-  else
-    // Laminar, fully-developped flow in a smooth circular pipe with uniform
-    // imposed temperature: Nu=3.66 for Re<=2300. For 2300= 2400 then
+    Nu := 0.023 * (cpMed * muMed / kMed) ^ 0.35 * IBPSA.Utilities.Math.Functions.regNonZeroPower(x = Re, n = 0.8, delta = 0.01 * m_flow_nominal * k);
+  else
+    NuTurb := 0.023 * (cpMed * muMed / kMed) ^ 0.35 * 2400 ^ 0.8;
+    Nu := IBPSA.Utilities.Math.Functions.spliceFunction(NuTurb, 3.66, Re - (2300 + 2400) / 2, (2300 + 2400) / 2 - 2300);
+  end if;
+// Turbulent, fully-developped flow in a smooth circular pipe with the
+// Dittus-Boelter correlation: h = 0.023*k_f*Re*Pr/(2*rTub)
+// Re = rho*v*DTub / mue_f
+//    = m_flow/(pi r^2) * DTub/mue_f = 2*m_flow / ( mue*pi*rTub)
+// Laminar, fully-developped flow in a smooth circular pipe with uniform
+// imposed temperature: Nu=3.66 for Re<=2300. For 2300 0);
-      i := i + 1;
-    end while;
-  end if;
-  assert(test,
-  "Maximum number of iterations exceeded. Check the borehole geometry.
+algorithm
+// Internal thermal resistances
+  (RDelta, R) := IBPSA.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses.Functions.multipoleThermalResistances(2, 3, xPip, yPip, rBor, rPip, kFil, kSoi, RFluPip);
+// Rb and Ra
+  Rb_multipole := 1. / (1. / RDelta[1, 1] + 1. / RDelta[2, 2]);
+  Rb_internal := if use_Rb then Rb else Rb_multipole;
+// The short-circuit resistance in weigthed by the ratio between the used
+// value of Rb and the theoretical value
+  Ra := (R[1, 1] + R[2, 2] - 2 * R[1, 2]) * Rb_internal / Rb_multipole;
+// Conversion of Rb (resp. Ra) to Rg (resp. Rar) of Bauer:
+  Rg := (2 * Rb_internal - RCondPipe - RConv) / hSeg;
+  Rar :=(Ra-2*(RCondPipe + RConv))/hSeg;
+// If any of the internal delta-circuit resistances is negative, then
+// the location (x) of the thermal capacity is set to zero to limit
+// instabilities in the calculations. Otherwise, calculations follow the
+// method of Bauer et al. (2011).
+  if RDelta[1, 2] < 0 then
+    Rgb := Rg;
+    RCondGro := RCondPipe / hSeg;
+    Rgg := 2 * Rgb * Rar / (2 * Rgb - Rar);
+    test := true;
+  else
+    while test == false and i <= 10 loop
+      x := Modelica.Math.log(sqrt(rBor ^ 2 + 2 * rTub ^ 2) / (2 * rTub)) / Modelica.Math.log(rBor / (sqrt(2) * rTub)) * ((15 - i + 1) / 15);
+      Rgb := (1 - x) * Rg;
+      RCondGro := x * Rg + RCondPipe / hSeg;
+      Rgg := 2 * Rgb * (Rar - 2 * x * Rg) / (2 * Rgb - Rar + 2 * x * Rg);
+      test := (1 / Rgg + 1 / 2 / Rgb) ^ (-1) > 0;
+      i := i + 1;
+    end while;
+  end if;
+//Thermal resistance between the grout zone and borehole wall
+//Conduction resistance in grout from pipe wall to capacity in grout
+//Thermal resistance between the two grout zones
+// ********** Resistances and capacity location according to Bauer **********
+// Capacity location (with correction factor in case that the test is
+// negative)
+//Thermal resistance between the grout zone and borehole wall
+//Conduction resistance in grout from pipe wall to capacity in grout
+//Thermal resistance between the two grout zones
+// Thermodynamic test to check if negative R values make sense. If not,
+// decrease x-value.
+  assert(test, "Maximum number of iterations exceeded. Check the borehole geometry.
   The tubes may be too close to the borehole wall.
   Input to the function 
   IBPSA.Fluid.HeatExchangers.Boreholes.BaseClasses.singleUTubeResistances
@@ -102,7 +80,7 @@
            kSoi = " + String(kSoi) + " W/m/K
            kFil = " + String(kFil) + " W/m/K
            kTub = " + String(kTub) + " W/m/K
-           i = "  + String(i) + "
+           i = " + String(i) + "
   Computed x    = " + String(x) + " K/W
            Rgb  = " + String(Rgb) + " K/W
            Rgg  = " + String(Rgg) + " K/W");
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/internalResistancesTwoUTube.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/internalResistancesTwoUTube.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/internalResistancesTwoUTube.mo"	2022-03-10 09:57:39.680144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/internalResistancesTwoUTube.mo"	2022-03-10 09:58:17.452149125 +0000
@@ -5,98 +5,76 @@
     IBPSA.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses.Functions.partialInternalResistances;
 
   // Outputs
-  output Modelica.SIunits.ThermalResistance Rgb
+  output Modelica.Units.SI.ThermalResistance Rgb
     "Thermal resistance between a grout capacity and the borehole wall, as defined by Bauer et al (2010)";
-  output Modelica.SIunits.ThermalResistance Rgg1
+  output Modelica.Units.SI.ThermalResistance Rgg1
     "Thermal resistance between two neightbouring grout capacities, as defined by Bauer et al (2010)";
-  output Modelica.SIunits.ThermalResistance Rgg2
+  output Modelica.Units.SI.ThermalResistance Rgg2
     "Thermal resistance between two  grout capacities opposite to each other, as defined by Bauer et al (2010)";
-  output Modelica.SIunits.ThermalResistance RCondGro
+  output Modelica.Units.SI.ThermalResistance RCondGro
     "Thermal resistance between a pipe wall and the grout capacity, as defined by Bauer et al (2010)";
 protected
   Real[4,4] RDelta(unit="(m.K)/W") "Delta-circuit thermal resistances";
   Real[4,4] R(unit="(m.K)/W") "Internal thermal resistances";
-  Modelica.SIunits.Position[4] xPip = {-sha, sha, 0., 0.} "x-Coordinates of pipes";
-  Modelica.SIunits.Position[4] yPip = {0., 0., -sha, sha} "y-Coordinates of pipes";
-  Modelica.SIunits.Radius[4] rPip = {rTub, rTub, rTub, rTub} "Outer radius of pipes";
+  Modelica.Units.SI.Position[4] xPip = {-sha, sha, 0., 0.} "x-Coordinates of pipes";
+  Modelica.Units.SI.Position[4] yPip = {0., 0., -sha, sha} "y-Coordinates of pipes";
+  Modelica.Units.SI.Radius[4] rPip = {rTub, rTub, rTub, rTub} "Outer radius of pipes";
   Real[4] RFluPip(unit="(m.K)/W") = {RCondPipe+RConv, RCondPipe+RConv, RCondPipe+RConv, RCondPipe+RConv} "Fluid to pipe wall thermal resistances";
 
   Real Ra( unit="(m.K)/W")
     "Grout-to-grout resistance (2D) as defined by Hellstrom. Interaction between the different grout parts";
 
-  Modelica.SIunits.ThermalResistance Rg
+  Modelica.Units.SI.ThermalResistance Rg
     "Thermal resistance between outer borehole wall and one tube";
-  Modelica.SIunits.ThermalResistance Rar1
+  Modelica.Units.SI.ThermalResistance Rar1
     "Thermal resistance between the two closest pipe outer walls";
-  Modelica.SIunits.ThermalResistance Rar2
+  Modelica.Units.SI.ThermalResistance Rar2
     "Thermal resistance between the two farthest pipe outer walls";
 
-algorithm
-  // Internal thermal resistances
-  (RDelta,R) :=
-    IBPSA.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses.Functions.multipoleThermalResistances(
-                    4,
-                    3,
-                    xPip,
-                    yPip,
-                    rBor,
-                    rPip,
-                    kFil,
-                    kSoi,
-                    RFluPip);
-
-  // Rb and Ra
-  Rb_multipole := 1./(1./RDelta[1,1] + 1./RDelta[2,2] + 1./RDelta[3,3] + 1./RDelta[4,4]);
-  Rb_internal := if use_Rb then Rb else Rb_multipole;
-  // The short-circuit resistance in weigthed by the ratio between the used
-  // value of Rb and the theoretical value
-  Ra := (R[1,1] + R[3,3] - 2*R[1,3])*Rb_internal/Rb_multipole;
-
-  // ------ Calculation according to Bauer et al. (2010)
-  Rg := (4*Rb_internal - RCondPipe - RConv)/hSeg;
+algorithm
+// Internal thermal resistances
+  (RDelta, R) := IBPSA.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses.Functions.multipoleThermalResistances(4, 3, xPip, yPip, rBor, rPip, kFil, kSoi, RFluPip);
+// Rb and Ra
+  Rb_multipole := 1. / (1. / RDelta[1, 1] + 1. / RDelta[2, 2] + 1. / RDelta[3, 3] + 1. / RDelta[4, 4]);
+  Rb_internal := if use_Rb then Rb else Rb_multipole;
+// The short-circuit resistance in weigthed by the ratio between the used
+// value of Rb and the theoretical value
+  Ra := (R[1, 1] + R[3, 3] - 2 * R[1, 3]) * Rb_internal / Rb_multipole;
+// ------ Calculation according to Bauer et al. (2010)
+  Rg := (4 * Rb_internal - RCondPipe - RConv) / hSeg;
   Rar1 := ((2 + sqrt(2))*Rg*hSeg*(Ra - RCondPipe)/(Rg*hSeg + Ra - RCondPipe))/hSeg;
-  Rar2 := sqrt(2)*Rar1;
-
-  // If any of the internal delta-circuit resistances is negative, then
-  // the location (x) of the thermal capacity is set to zero to limit
-  // instabilities in the calculations. Otherwise, calculations follow the
-  // method of Bauer et al. (2011).
-  if (RDelta[1,2] < 0) or (RDelta[1,3] < 0) then
-    //Thermal resistance between the grout zone and borehole wall
-    Rgb := Rg;
-
-    //Conduction resistance in grout from pipe wall to capacity in grout
-    RCondGro := RCondPipe/hSeg;
-
-    //Thermal resistance between the two grout zones
-    Rgg1 := 2*Rgb*(Rar1)/(2*Rgb - Rar1);
-    Rgg2 := 2*Rgb*(Rar2)/(2*Rgb - Rar2);
-
-    test := true;
-  else
-    // ********** Resistances and capacity location according to Bauer **********
-    while test == false and i <= 16 loop
-      // Capacity location (with correction factor in case that the test is negative)
-      x := Modelica.Math.log(sqrt(rBor^2 + 4*rTub^2)/(2*sqrt(2)*rTub))/
-          Modelica.Math.log(rBor/(2*rTub))*((15 - i + 1)/15);
-
-      //Thermal resistance between the grout zone and borehole wall
-      Rgb := (1 - x)*Rg;
-
-      //Conduction resistance in grout from pipe wall to capacity in grout
-      RCondGro := x*Rg + RCondPipe/hSeg;
-
-      //Thermal resistance between the two grout zones
-      Rgg1 := 2*Rgb*(Rar1 - 2*x*Rg)/(2*Rgb - Rar1 + 2*x*Rg);
-      Rgg2 := 2*Rgb*(Rar2 - 2*x*Rg)/(2*Rgb - Rar2 + 2*x*Rg);
-
-      // Thermodynamic test to check if negative R values make sense. If not, decrease x-value.
-      test := (((1/Rgg1 + 1/2/Rgb)^(-1) > 0) and ((1/Rgg2 + 1/2/Rgb)^(-1) > 0));
-      i := i + 1;
-    end while;
-  end if;
-  assert(test,
-  "Maximum number of iterations exceeded. Check the borehole geometry.
+  Rar2 := sqrt(2)*Rar1;
+// If any of the internal delta-circuit resistances is negative, then
+// the location (x) of the thermal capacity is set to zero to limit
+// instabilities in the calculations. Otherwise, calculations follow the
+// method of Bauer et al. (2011).
+  if RDelta[1, 2] < 0 or RDelta[1, 3] < 0 then
+    Rgb := Rg;
+    RCondGro := RCondPipe / hSeg;
+    Rgg1 := 2 * Rgb * Rar1 / (2 * Rgb - Rar1);
+    Rgg2 := 2 * Rgb * Rar2 / (2 * Rgb - Rar2);
+    test := true;
+  else
+    while test == false and i <= 16 loop
+      x := Modelica.Math.log(sqrt(rBor ^ 2 + 4 * rTub ^ 2) / (2 * sqrt(2) * rTub)) / Modelica.Math.log(rBor / (2 * rTub)) * ((15 - i + 1) / 15);
+      Rgb := (1 - x) * Rg;
+      RCondGro := x * Rg + RCondPipe / hSeg;
+      Rgg1 := 2 * Rgb * (Rar1 - 2 * x * Rg) / (2 * Rgb - Rar1 + 2 * x * Rg);
+      Rgg2 := 2 * Rgb * (Rar2 - 2 * x * Rg) / (2 * Rgb - Rar2 + 2 * x * Rg);
+      test := (1 / Rgg1 + 1 / 2 / Rgb) ^ (-1) > 0 and (1 / Rgg2 + 1 / 2 / Rgb) ^ (-1) > 0;
+      i := i + 1;
+    end while;
+  end if;
+//Thermal resistance between the grout zone and borehole wall
+//Conduction resistance in grout from pipe wall to capacity in grout
+//Thermal resistance between the two grout zones
+// ********** Resistances and capacity location according to Bauer **********
+// Capacity location (with correction factor in case that the test is negative)
+//Thermal resistance between the grout zone and borehole wall
+//Conduction resistance in grout from pipe wall to capacity in grout
+//Thermal resistance between the two grout zones
+// Thermodynamic test to check if negative R values make sense. If not, decrease x-value.
+  assert(test, "Maximum number of iterations exceeded. Check the borehole geometry.
   The tubes may be too close to the borehole wall.
   Input to the function
   IBPSA.Fluid.HeatExchangers.Boreholes.BaseClasses.doubleUTubeResistances
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/multipoleFluidTemperature.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/multipoleFluidTemperature.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/multipoleFluidTemperature.mo"	2022-03-10 09:57:39.680144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/multipoleFluidTemperature.mo"	2022-03-10 09:58:17.432149123 +0000
@@ -4,19 +4,19 @@
 
   input Integer nPip "Number of pipes";
   input Integer J "Number of multipoles";
-  input Modelica.SIunits.Position xPip[nPip] "x-Coordinates of pipes";
-  input Modelica.SIunits.Position yPip[nPip] "y-Coordinates of pipes";
+  input Modelica.Units.SI.Position xPip[nPip] "x-Coordinates of pipes";
+  input Modelica.Units.SI.Position yPip[nPip] "y-Coordinates of pipes";
   input Real QPip_flow[nPip](unit="W/m") "Heat flow in pipes";
-  input Modelica.SIunits.Temperature TBor "Average borehole wall temperature";
-  input Modelica.SIunits.Radius rBor "Borehole radius";
-  input Modelica.SIunits.Radius rPip[nPip] "Outter radius of pipes";
-  input Modelica.SIunits.ThermalConductivity kFil "Thermal conductivity of grouting material";
-  input Modelica.SIunits.ThermalConductivity kSoi "Thermal conductivity of soil material";
+  input Modelica.Units.SI.Temperature TBor "Average borehole wall temperature";
+  input Modelica.Units.SI.Radius rBor "Borehole radius";
+  input Modelica.Units.SI.Radius rPip[nPip] "Outter radius of pipes";
+  input Modelica.Units.SI.ThermalConductivity kFil "Thermal conductivity of grouting material";
+  input Modelica.Units.SI.ThermalConductivity kSoi "Thermal conductivity of soil material";
   input Real RFluPip[nPip](unit="(m.K)/W") "Fluid to pipe wall thermal resistances";
   input Real eps=1.0e-5 "Iteration relative accuracy";
   input Integer it_max=100 "Maximum number of iterations";
 
-  output Modelica.SIunits.Temperature TFlu[nPip] "Fluid temperature in pipes";
+  output Modelica.Units.SI.Temperature TFlu[nPip] "Fluid temperature in pipes";
 
 protected
   Real pikFil(unit="(m.K)/W")=1/(2*Modelica.Constants.pi*kFil) "Coefficient based on grout thermal conductivity";
@@ -36,7 +36,7 @@
   Real R0[nPip,nPip](unit="(m.K)/W") "Line source approximation of thermal resistances";
   Complex deltaTFlu "Fluid temperature difference with line source approximation";
   Real rbm "Intermediate coefficient";
-  Modelica.SIunits.Distance dz "Pipe to pipe distance";
+  Modelica.Units.SI.Distance dz "Pipe to pipe distance";
   Real coeff[nPip,J] "Coefficient for multiplication with matrix F_mk";
   Real diff "Difference in subsequent multipole evaluations";
   Real diff_max "Maximum difference in subsequent multipole evaluations";
@@ -45,104 +45,84 @@
   Integer it "Iteration counter";
   Real eps_max "Convergence variable";
 
-algorithm
-  // Thermal resistance matrix from 0th order multipole
-  for i in 1:nPip loop
-    zPip_i := Complex(xPip[i], yPip[i]);
-    rbm := rBor^2/(rBor^2 - Modelica.ComplexMath.'abs'(zPip_i)^2);
-    R0[i, i] := pikFil*(log(rBor/rPip[i]) + betaPip[i] + sigma*log(rbm));
-    for j in 1:nPip loop
-      zPip_j := Complex(xPip[j], yPip[j]);
-      if i <> j then
-        dz := Modelica.ComplexMath.'abs'(zPip_i - zPip_j);
-        rbm := rBor^2/Modelica.ComplexMath.'abs'(rBor^2 - zPip_j*
-          Modelica.ComplexMath.conj(zPip_i));
-        R0[i, j] := pikFil*(log(rBor/dz) + sigma*log(rbm));
-      end if;
-    end for;
-  end for;
-
-  // Initialize maximum error and iteration counter
+algorithm
+// Thermal resistance matrix from 0th order multipole
+  for i in 1:nPip loop
+    zPip_i := Complex(xPip[i], yPip[i]);
+    rbm := rBor ^ 2 / (rBor ^ 2 - Modelica.ComplexMath.abs(zPip_i) ^ 2);
+    R0[i, i] := pikFil * (log(rBor / rPip[i]) + betaPip[i] + sigma * log(rbm));
+    for j in 1:nPip loop
+      zPip_j := Complex(xPip[j], yPip[j]);
+      if i <> j then
+        dz := Modelica.ComplexMath.abs(zPip_i - zPip_j);
+        rbm := rBor ^ 2 / Modelica.ComplexMath.abs(rBor ^ 2 - zPip_j * Modelica.ComplexMath.conj(zPip_i));
+        R0[i, j] := pikFil * (log(rBor / dz) + sigma * log(rbm));
+      end if;
+    end for;
+  end for;
+// Initialize maximum error and iteration counter
   eps_max := 1.0e99;
-  it := 0;
-  // Multipoles
-  if J > 0 then
-    for m in 1:nPip loop
-      for k in 1:J loop
-        coeff[m, k] := -(1 - k*betaPip[m])/(1 + k*betaPip[m]);
-        PRea[m, k] := 0;
-        PIma[m, k] := 0;
-      end for;
-    end for;
-    while eps_max > eps and it < it_max loop
-      it := it + 1;
-      (FRea,FIma) :=
-        IBPSA.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses.Functions.multipoleFmk(
-                        nPip,
-                        J,
-                        QPip_flow,
-                        PRea,
-                        PIma,
-                        rBor,
-                        rPip,
-                        xPip,
-                        yPip,
-                        kFil,
-                        kSoi);
-      for m in 1:nPip loop
-        for k in 1:J loop
-          F_mk := Complex(FRea[m, k], FIma[m, k]);
-          P_nj_new := coeff[m, k]*Modelica.ComplexMath.conj(F_mk);
-          PRea_new[m, k] := Modelica.ComplexMath.real(P_nj_new);
-          PIma_new[m, k] := Modelica.ComplexMath.imag(P_nj_new);
-        end for;
-      end for;
-      diff_max := 0;
-      diff_min := 1e99;
-      for m in 1:nPip loop
-        for k in 1:J loop
-          P_nj := Complex(PRea[m, k], PIma[m, k]);
-          P_nj_new := Complex(PRea_new[m, k], PIma_new[m, k]);
-          diff_max := max(diff_max,
-                           Modelica.ComplexMath.'abs'(P_nj_new - P_nj));
-          diff_min := min(diff_min,
-                           Modelica.ComplexMath.'abs'(P_nj_new - P_nj));
-        end for;
-      end for;
-      diff := diff_max - diff_min;
-      if it == 1 then
-        diff0 :=diff;
-      end if;
-      eps_max := diff/diff0;
-      PRea := PRea_new;
-      PIma := PIma_new;
-    end while;
-  end if;
-
-  // Fluid Temperatures
-  TFlu := TBor .+ R0*QPip_flow;
-  if J > 0 then
-    for m in 1:nPip loop
-      zPip_i :=Complex(xPip[m], yPip[m]);
-      deltaTFlu := Complex(0, 0);
-      for n in 1:nPip loop
-        zPip_j :=Complex(xPip[n], yPip[n]);
-        for j in 1:J loop
-          P_nj := Complex(PRea[n, j], PIma[n, j]);
-          if n <> m then
-            // Second term
-            deltaTFlu := deltaTFlu + P_nj*(rPip[n]/(zPip_i - zPip_j))^j;
-          end if;
-          // Third term
-          deltaTFlu := deltaTFlu + sigma*P_nj*(rPip[n]*
-            Modelica.ComplexMath.conj(zPip_i)/(rBor^2 - zPip_j*
-            Modelica.ComplexMath.conj(zPip_i)))^j;
-        end for;
-      end for;
-      TFlu[m] := TFlu[m] + Modelica.ComplexMath.real(deltaTFlu);
-    end for;
+  it := 0;
+// Multipoles
+  if J > 0 then
+    for m in 1:nPip loop
+      for k in 1:J loop
+        coeff[m, k] := -(1 - k * betaPip[m]) / (1 + k * betaPip[m]);
+        PRea[m, k] := 0;
+        PIma[m, k] := 0;
+      end for;
+    end for;
+    while eps_max > eps and it < it_max loop
+      it := it + 1;
+      (FRea, FIma) := IBPSA.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses.Functions.multipoleFmk(nPip, J, QPip_flow, PRea, PIma, rBor, rPip, xPip, yPip, kFil, kSoi);
+      for m in 1:nPip loop
+        for k in 1:J loop
+          F_mk := Complex(FRea[m, k], FIma[m, k]);
+          P_nj_new := coeff[m, k] * Modelica.ComplexMath.conj(F_mk);
+          PRea_new[m, k] := Modelica.ComplexMath.real(P_nj_new);
+          PIma_new[m, k] := Modelica.ComplexMath.imag(P_nj_new);
+        end for;
+      end for;
+      diff_max := 0;
+      diff_min := 1e99;
+      for m in 1:nPip loop
+        for k in 1:J loop
+          P_nj := Complex(PRea[m, k], PIma[m, k]);
+          P_nj_new := Complex(PRea_new[m, k], PIma_new[m, k]);
+          diff_max := max(diff_max, Modelica.ComplexMath.abs(P_nj_new - P_nj));
+          diff_min := min(diff_min, Modelica.ComplexMath.abs(P_nj_new - P_nj));
+        end for;
+      end for;
+      diff := diff_max - diff_min;
+      if it == 1 then
+        diff0 := diff;
+      end if;
+      eps_max := diff / diff0;
+      PRea := PRea_new;
+      PIma := PIma_new;
+    end while;
+  end if;
+// Fluid Temperatures
+  TFlu := TBor .+ R0 * QPip_flow;
+  if J > 0 then
+    for m in 1:nPip loop
+      zPip_i := Complex(xPip[m], yPip[m]);
+      deltaTFlu := Complex(0, 0);
+      for n in 1:nPip loop
+        zPip_j := Complex(xPip[n], yPip[n]);
+        for j in 1:J loop
+          P_nj := Complex(PRea[n, j], PIma[n, j]);
+          if n <> m then
+            deltaTFlu := deltaTFlu + P_nj * (rPip[n] / (zPip_i - zPip_j)) ^ j;
+          end if;
+          deltaTFlu := deltaTFlu + sigma * P_nj * (rPip[n] * Modelica.ComplexMath.conj(zPip_i) / (rBor ^ 2 - zPip_j * Modelica.ComplexMath.conj(zPip_i))) ^ j;
+        end for;
+      end for;
+      TFlu[m] := TFlu[m] + Modelica.ComplexMath.real(deltaTFlu);
+    end for;
   end if;
-
+// Second term
+// Third term
   annotation (Documentation(info="
 
     This model evaluates the fluid temperatures using the multipole method of Claesson and Hellstrom (2011).
 
    
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/multipoleFmk.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/multipoleFmk.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/multipoleFmk.mo"	2022-03-10 09:57:39.680144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/multipoleFmk.mo"	2022-03-10 09:58:17.404149118 +0000
@@ -1,74 +1,60 @@
-within BuildSysPro.IBPSA.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses.Functions;
-function multipoleFmk "Complex matrix F_mk from Claesson and Hellstrom (2011)"
-  extends Modelica.Icons.Function;
-
-  input Integer nPip "Number of pipes";
-  input Integer J "Number of multipoles";
-  input Real QPip_flow[nPip](unit="W/m") "Heat flow in pipes";
-  input Real PRea[nPip,J] "Multipoles (Real part)";
-  input Real PIma[nPip,J] "Multipoles (Imaginary part)";
-  input Modelica.SIunits.Radius rBor "Borehole radius";
-  input Modelica.SIunits.Radius rPip[nPip] "Outter radius of pipes";
-  input Modelica.SIunits.Position xPip[nPip] "x-Coordinates of pipes";
-  input Modelica.SIunits.Position yPip[nPip] "y-Coordinates of pipes";
-  input Modelica.SIunits.ThermalConductivity kFil "Thermal conductivity of grouting material";
-  input Modelica.SIunits.ThermalConductivity kSoi "Thermal conductivity of soil material";
-
-  output Real FRea[nPip,J] "Multipole coefficients";
-  output Real FIma[nPip,J] "Multipole coefficients";
-
-protected
-  Complex zPip_i "Position of pipe i";
-  Complex zPip_j "Position of pipe j";
-  Complex P_nj "Multipole of order j for pipe n";
-  Real pikFil(unit="(m.K)/W")=1/(2*Modelica.Constants.pi*kFil) "Coefficient based on grout thermal conductivity";
-  Real sigma=(kFil - kSoi)/(kFil + kSoi) "Thermal conductivity ratio";
-  Complex f "Intermedia value of multipole coefficient";
-  Integer j_pend "Maximum loop index in fourth term";
-
-algorithm
-
-  for m in 1:nPip loop
-    zPip_i := Complex(xPip[m], yPip[m]);
-    for k in 1:J loop
-      f := Complex(0, 0);
-      for n in 1:nPip loop
-        zPip_j := Complex(xPip[n], yPip[n]);
-        // First term
-        if m <> n then
-          f := f + QPip_flow[n]*pikFil/k*(rPip[m]/(zPip_j - zPip_i))^k;
-        end if;
-        // Second term
-        f := f + sigma*QPip_flow[n]*pikFil/k*(rPip[m]*Modelica.ComplexMath.conj(
-          zPip_j)/(rBor^2 - zPip_i*Modelica.ComplexMath.conj(zPip_j)))^k;
-        for j in 1:J loop
-          P_nj := Complex(PRea[n, j], PIma[n, j]);
-          // Third term
-          if m <> n then
-            f := f + P_nj*
-              IBPSA.Utilities.Math.Functions.binomial(j + k - 1,
-              j - 1)*rPip[n]^j*(-rPip[m])^k/(zPip_i - zPip_j)^(
-              j + k);
-          end if;
-          //Fourth term
-          j_pend := min(k, j);
-          for jp in 0:j_pend loop
-            f := f + sigma*Modelica.ComplexMath.conj(P_nj)*
-              IBPSA.Utilities.Math.Functions.binomial(j, jp)*
-              IBPSA.Utilities.Math.Functions.binomial(j + k -
-              jp - 1, j - 1)*rPip[n]^j*rPip[m]^k*zPip_i^(j - jp)
-              *Modelica.ComplexMath.conj(zPip_j)^(k - jp)/(rBor^
-              2 - zPip_i*Modelica.ComplexMath.conj(zPip_j))^(k +
-              j - jp);
-          end for;
-        end for;
-      end for;
-      FRea[m, k] := Modelica.ComplexMath.real(f);
-      FIma[m, k] := Modelica.ComplexMath.imag(f);
-    end for;
-  end for;
-
-  annotation (Documentation(info="
+within BuildSysPro.IBPSA.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses.Functions;
+
+function multipoleFmk "Complex matrix F_mk from Claesson and Hellstrom (2011)"
+  extends Modelica.Icons.Function;
+  input Integer nPip "Number of pipes";
+  input Integer J "Number of multipoles";
+  input Real QPip_flow[nPip](unit = "W/m") "Heat flow in pipes";
+  input Real PRea[nPip, J] "Multipoles (Real part)";
+  input Real PIma[nPip, J] "Multipoles (Imaginary part)";
+  input Modelica.Units.SI.Radius rBor "Borehole radius";
+  input Modelica.Units.SI.Radius rPip[nPip] "Outter radius of pipes";
+  input Modelica.Units.SI.Position xPip[nPip] "x-Coordinates of pipes";
+  input Modelica.Units.SI.Position yPip[nPip] "y-Coordinates of pipes";
+  input Modelica.Units.SI.ThermalConductivity kFil "Thermal conductivity of grouting material";
+  input Modelica.Units.SI.ThermalConductivity kSoi "Thermal conductivity of soil material";
+  output Real FRea[nPip, J] "Multipole coefficients";
+  output Real FIma[nPip, J] "Multipole coefficients";
+protected
+  Complex zPip_i "Position of pipe i";
+  Complex zPip_j "Position of pipe j";
+  Complex P_nj "Multipole of order j for pipe n";
+  Real pikFil(unit = "(m.K)/W") = 1 / (2 * Modelica.Constants.pi * kFil) "Coefficient based on grout thermal conductivity";
+  Real sigma = (kFil - kSoi) / (kFil + kSoi) "Thermal conductivity ratio";
+  Complex f "Intermedia value of multipole coefficient";
+  Integer j_pend "Maximum loop index in fourth term";
+algorithm
+  for m in 1:nPip loop
+    zPip_i := Complex(xPip[m], yPip[m]);
+    for k in 1:J loop
+      f := Complex(0, 0);
+      for n in 1:nPip loop
+        zPip_j := Complex(xPip[n], yPip[n]);
+        if m <> n then
+          f := f + QPip_flow[n] * pikFil / k * (rPip[m] / (zPip_j - zPip_i)) ^ k;
+        end if;
+        f := f + sigma * QPip_flow[n] * pikFil / k * (rPip[m] * Modelica.ComplexMath.conj(zPip_j) / (rBor ^ 2 - zPip_i * Modelica.ComplexMath.conj(zPip_j))) ^ k;
+        for j in 1:J loop
+          P_nj := Complex(PRea[n, j], PIma[n, j]);
+          if m <> n then
+            f := f + P_nj * IBPSA.Utilities.Math.Functions.binomial(j + k - 1, j - 1) * rPip[n] ^ j * (-rPip[m]) ^ k / (zPip_i - zPip_j) ^ (j + k);
+          end if;
+          j_pend := min(k, j);
+          for jp in 0:j_pend loop
+            f := f + sigma * Modelica.ComplexMath.conj(P_nj) * IBPSA.Utilities.Math.Functions.binomial(j, jp) * IBPSA.Utilities.Math.Functions.binomial(j + k - jp - 1, j - 1) * rPip[n] ^ j * rPip[m] ^ k * zPip_i ^ (j - jp) * Modelica.ComplexMath.conj(zPip_j) ^ (k - jp) / (rBor ^ 2 - zPip_i * Modelica.ComplexMath.conj(zPip_j)) ^ (k + j - jp);
+          end for;
+        end for;
+      end for;
+      FRea[m, k] := Modelica.ComplexMath.real(f);
+      FIma[m, k] := Modelica.ComplexMath.imag(f);
+    end for;
+  end for;
+// First term
+// Second term
+// Third term
+//Fourth term
+  annotation(
+    Documentation(info = "
 
    This model evaluates the complex coefficient matrix F_mk from Claesson and Hellstrom (2011).
 
    
 
    References
    
@@ -77,12 +63,12 @@
 
 HVAC&R Research,
 17(6): 895-911, 2011.
    
-", revisions="
+", revisions = "
 
      
 
    • 
 February 12, 2018, by Massimo Cimmino:
      
 First implementation.
 
      • 
 
    
-"));
-end multipoleFmk;
+"));
+end multipoleFmk;
\ No newline at end of file
Only in converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions: multipoleFmk.mo.after
Only in converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions: multipoleFmk.mo.before
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/multipoleThermalResistances.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/multipoleThermalResistances.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/multipoleThermalResistances.mo"	2022-03-10 09:57:39.680144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/multipoleThermalResistances.mo"	2022-03-10 09:58:17.388149117 +0000
@@ -5,21 +5,21 @@
 
   input Integer nPip "Number of pipes";
   input Integer J "Number of multipoles";
-  input Modelica.SIunits.Position xPip[nPip] "x-Coordinates of pipes";
-  input Modelica.SIunits.Position yPip[nPip] "y-Coordinates of pipes";
-  input Modelica.SIunits.Radius rBor "Borehole radius";
-  input Modelica.SIunits.Radius rPip[nPip] "Outter radius of pipes";
-  input Modelica.SIunits.ThermalConductivity kFil "Thermal conductivity of grouting material";
-  input Modelica.SIunits.ThermalConductivity kSoi "Thermal conductivity of soil material";
+  input Modelica.Units.SI.Position xPip[nPip] "x-Coordinates of pipes";
+  input Modelica.Units.SI.Position yPip[nPip] "y-Coordinates of pipes";
+  input Modelica.Units.SI.Radius rBor "Borehole radius";
+  input Modelica.Units.SI.Radius rPip[nPip] "Outter radius of pipes";
+  input Modelica.Units.SI.ThermalConductivity kFil "Thermal conductivity of grouting material";
+  input Modelica.Units.SI.ThermalConductivity kSoi "Thermal conductivity of soil material";
   input Real RFluPip[nPip](unit="(m.K)/W") "Fluid to pipe wall thermal resistances";
-  input Modelica.SIunits.Temperature TBor=0 "Average borehole wall temperature";
+  input Modelica.Units.SI.Temperature TBor=0 "Average borehole wall temperature";
 
   output Real RDelta[nPip,nPip](unit="(m.K)/W") "Delta-circuit thermal resistances";
   output Real R[nPip,nPip](unit="(m.K)/W") "Internal thermal resistances";
 
 protected
   Real QPip_flow[nPip](unit="W/m") "Pipe heat transfer rates";
-  Modelica.SIunits.Temperature TFlu[nPip] "Fluid temperatures";
+  Modelica.Units.SI.Temperature TFlu[nPip] "Fluid temperatures";
   Real K[nPip,nPip](unit="W/(m.K)") "Internal thermal conductances";
 
 algorithm
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/partialInternalResistances.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/partialInternalResistances.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/partialInternalResistances.mo"	2022-03-10 09:57:39.680144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/partialInternalResistances.mo"	2022-03-10 09:58:17.380149116 +0000
@@ -3,37 +3,37 @@
   "Partial model for borehole resistance calculation"
   extends Modelica.Icons.Function;
 
-  // Geometry of the borehole
+// Geometry of the borehole
   input Boolean use_Rb = false
     "True if the value Rb should be used instead of calculated";
   input Real Rb(unit="(m.K)/W") "Borehole thermal resistance";
-  input Modelica.SIunits.Height hSeg "Height of the element";
-  input Modelica.SIunits.Radius rBor "Radius of the borehole";
+  input Modelica.Units.SI.Height hSeg "Height of the element";
+  input Modelica.Units.SI.Radius rBor "Radius of the borehole";
   // Geometry of the pipe
-  input Modelica.SIunits.Radius rTub "Radius of the tube";
-  input Modelica.SIunits.Length eTub "Thickness of the tubes";
-  input Modelica.SIunits.Length sha
+  input Modelica.Units.SI.Radius rTub "Radius of the tube";
+  input Modelica.Units.SI.Length eTub "Thickness of the tubes";
+  input Modelica.Units.SI.Length sha
     "Shank spacing, defined as the distance between the center of a pipe and the center of the borehole";
 
   // Thermal properties
-  input Modelica.SIunits.ThermalConductivity kFil
+  input Modelica.Units.SI.ThermalConductivity kFil
     "Thermal conductivity of the grout";
-  input Modelica.SIunits.ThermalConductivity kSoi
+  input Modelica.Units.SI.ThermalConductivity kSoi
     "Thermal conductivity of the soi";
-  input Modelica.SIunits.ThermalConductivity kTub
+  input Modelica.Units.SI.ThermalConductivity kTub
     "Thermal conductivity of the tube";
-  input Modelica.SIunits.ThermalConductivity kMed
+  input Modelica.Units.SI.ThermalConductivity kMed
     "Thermal conductivity of the fluid";
-  input Modelica.SIunits.DynamicViscosity muMed
+  input Modelica.Units.SI.DynamicViscosity muMed
     "Dynamic viscosity of the fluid";
-  input Modelica.SIunits.SpecificHeatCapacity cpMed
+  input Modelica.Units.SI.SpecificHeatCapacity cpMed
     "Specific heat capacity of the fluid";
-  input Modelica.SIunits.MassFlowRate m_flow_nominal "Nominal mass flow rate";
+  input Modelica.Units.SI.MassFlowRate m_flow_nominal "Nominal mass flow rate";
 
   input Boolean printDebug=false
     "Print resistances values in log for debug purposes.";
 
-  // Outputs
+// Outputs
   output Real x "Capacity location";
 
 protected
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/InternalResistancesOneUTube.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/InternalResistancesOneUTube.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/InternalResistancesOneUTube.mo"	2022-03-10 09:57:39.680144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/InternalResistancesOneUTube.mo"	2022-03-10 09:58:17.304149107 +0000
@@ -4,8 +4,8 @@
   extends
     IBPSA.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses.PartialInternalResistances;
 
-  parameter Modelica.SIunits.ThermalResistance Rgg_val "Thermal resistance between the two grout zones";
-  parameter Modelica.SIunits.HeatCapacity Co_fil=borFieDat.filDat.dFil*borFieDat.filDat.cFil*hSeg*Modelica.Constants.pi
+  parameter Modelica.Units.SI.ThermalResistance Rgg_val "Thermal resistance between the two grout zones";
+  parameter Modelica.Units.SI.HeatCapacity Co_fil=borFieDat.filDat.dFil*borFieDat.filDat.cFil*hSeg*Modelica.Constants.pi
     *(borFieDat.conDat.rBor^2 - 2*borFieDat.conDat.rTub^2)
     "Heat capacity of the whole filling material";
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/InternalResistancesTwoUTube.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/InternalResistancesTwoUTube.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/InternalResistancesTwoUTube.mo"	2022-03-10 09:57:39.680144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/InternalResistancesTwoUTube.mo"	2022-03-10 09:58:17.200149093 +0000
@@ -4,11 +4,11 @@
   extends
     IBPSA.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses.PartialInternalResistances;
 
-  parameter Modelica.SIunits.ThermalResistance Rgg1_val
+  parameter Modelica.Units.SI.ThermalResistance Rgg1_val
     "Thermal resistance between two neightbouring grout capacities, as defined by Bauer et al (2010)";
-  parameter Modelica.SIunits.ThermalResistance Rgg2_val
+  parameter Modelica.Units.SI.ThermalResistance Rgg2_val
     "Thermal resistance between two  grout capacities opposite to each other, as defined by Bauer et al (2010)";
-  parameter Modelica.SIunits.HeatCapacity Co_fil=borFieDat.filDat.dFil*borFieDat.filDat.cFil*hSeg*Modelica.Constants.pi
+  parameter Modelica.Units.SI.HeatCapacity Co_fil=borFieDat.filDat.dFil*borFieDat.filDat.cFil*hSeg*Modelica.Constants.pi
     *(borFieDat.conDat.rBor^2 - 4*borFieDat.conDat.rTub^2)
     "Heat capacity of the whole filling material";
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/PartialBorehole.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/PartialBorehole.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/PartialBorehole.mo"	2022-03-10 09:57:39.680144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/PartialBorehole.mo"	2022-03-10 09:58:17.160149088 +0000
@@ -15,20 +15,20 @@
 
   parameter Integer nSeg(min=1) = 10
     "Number of segments to use in vertical discretization of the boreholes";
-  parameter Modelica.SIunits.Temperature TGro_start[nSeg]
+  parameter Modelica.Units.SI.Temperature TGro_start[nSeg]
     "Start value of grout temperature"
     annotation (Dialog(tab="Initialization"));
 
-  parameter Modelica.SIunits.Temperature TFlu_start[nSeg] = TGro_start
+  parameter Modelica.Units.SI.Temperature TFlu_start[nSeg] = TGro_start
     "Start value of fluid temperature"
     annotation (Dialog(tab="Initialization"));
 
-  // Assumptions
+// Assumptions
   parameter Modelica.Fluid.Types.Dynamics energyDynamics=Modelica.Fluid.Types.Dynamics.DynamicFreeInitial
     "Type of energy balance: dynamic (3 initialization options) or steady state"
     annotation(Evaluate=true, Dialog(tab = "Dynamics", group="Equations"));
 
-  // Initialization
+// Initialization
   parameter Medium.AbsolutePressure p_start = Medium.p_default
     "Start value of pressure"
     annotation(Dialog(tab = "Initialization"));
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/PartialInternalHEX.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/PartialInternalHEX.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/PartialInternalHEX.mo"	2022-03-10 09:57:39.680144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/PartialInternalHEX.mo"	2022-03-10 09:58:17.144149085 +0000
@@ -13,31 +13,31 @@
   parameter Boolean dynFil=true
     "Set to false to remove the dynamics of the filling material"
     annotation (Dialog(tab="Dynamics"));
-  parameter Modelica.SIunits.Length hSeg
+  parameter Modelica.Units.SI.Length hSeg
     "Length of the internal heat exchanger";
-  parameter Modelica.SIunits.Volume VTubSeg = hSeg*Modelica.Constants.pi*(borFieDat.conDat.rTub-borFieDat.conDat.eTub)^2
+  parameter Modelica.Units.SI.Volume VTubSeg = hSeg*Modelica.Constants.pi*(borFieDat.conDat.rTub-borFieDat.conDat.eTub)^2
     "Fluid volume in each tube";
-  parameter Modelica.SIunits.Temperature TFlu_start
+  parameter Modelica.Units.SI.Temperature TFlu_start
     "Start value of fluid temperature"
     annotation (Dialog(tab="Initialization"));
-  parameter Modelica.SIunits.Temperature TGro_start
+  parameter Modelica.Units.SI.Temperature TGro_start
     "Start value of grout temperature"
     annotation (Dialog(tab="Initialization"));
   Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_a port_wall
     "Thermal connection for borehole wall"
     annotation (Placement(transformation(extent={{-10,90},{10,110}})));
 protected
-  parameter Modelica.SIunits.SpecificHeatCapacity cpMed=
+  parameter Modelica.Units.SI.SpecificHeatCapacity cpMed=
       Medium.specificHeatCapacityCp(Medium.setState_pTX(
       Medium.p_default,
       Medium.T_default,
       Medium.X_default)) "Specific heat capacity of the fluid";
-  parameter Modelica.SIunits.ThermalConductivity kMed=
+  parameter Modelica.Units.SI.ThermalConductivity kMed=
       Medium.thermalConductivity(Medium.setState_pTX(
       Medium.p_default,
       Medium.T_default,
       Medium.X_default)) "Thermal conductivity of the fluid";
-  parameter Modelica.SIunits.DynamicViscosity muMed=Medium.dynamicViscosity(
+  parameter Modelica.Units.SI.DynamicViscosity muMed=Medium.dynamicViscosity(
       Medium.setState_pTX(
       Medium.p_default,
       Medium.T_default,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/PartialInternalResistances.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/PartialInternalResistances.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/PartialInternalResistances.mo"	2022-03-10 09:57:39.680144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/PartialInternalResistances.mo"	2022-03-10 09:58:17.132149084 +0000
@@ -1,15 +1,15 @@
 within BuildSysPro.IBPSA.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses;
 partial model PartialInternalResistances
   "Partial model to implement borehole segment internal resistance models"
-  parameter Modelica.SIunits.Length hSeg
+  parameter Modelica.Units.SI.Length hSeg
     "Length of the internal heat exchanger";
-  parameter Modelica.SIunits.Temperature T_start
+  parameter Modelica.Units.SI.Temperature T_start
     "Initial temperature of the filling material";
   parameter Data.Borefield.Template borFieDat "Borefield data"
     annotation (Placement(transformation(extent={{-100,-100},{-80,-80}})));
-  parameter Modelica.SIunits.ThermalResistance Rgb_val
+  parameter Modelica.Units.SI.ThermalResistance Rgb_val
     "Thermal resistance between grout zone and borehole wall";
-  parameter Modelica.SIunits.ThermalResistance RCondGro_val
+  parameter Modelica.Units.SI.ThermalResistance RCondGro_val
     "Thermal resistance between: pipe wall to capacity in grout";
   parameter Modelica.Fluid.Types.Dynamics energyDynamics=Modelica.Fluid.Types.Dynamics.DynamicFreeInitial
     "Type of energy balance: dynamic (3 initialization options) or steady state"
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/Examples/BaseClasses/PartialBorehole.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/Examples/BaseClasses/PartialBorehole.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/Examples/BaseClasses/PartialBorehole.mo"	2022-03-10 09:57:39.680144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/Examples/BaseClasses/PartialBorehole.mo"	2022-03-10 09:58:17.108149082 +0000
@@ -5,7 +5,7 @@
 
   parameter Integer nSeg(min=1) = 10
     "Number of segments to use in vertical discretization of the boreholes";
-  parameter Modelica.SIunits.Temperature T_start = 273.15 + 22
+  parameter Modelica.Units.SI.Temperature T_start = 273.15 + 22
     "Initial soil temperature";
 
   parameter
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/Examples/BoreholeDynamics.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/Examples/BoreholeDynamics.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/Examples/BoreholeDynamics.mo"	2022-03-10 09:57:39.680144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/Examples/BoreholeDynamics.mo"	2022-03-10 09:58:17.092149079 +0000
@@ -5,7 +5,7 @@
 
   parameter Integer nSeg(min=1) = 10
     "Number of segments to use in vertical discretization of the boreholes";
-  parameter Modelica.SIunits.Temperature T_start = 273.15 + 22
+  parameter Modelica.Units.SI.Temperature T_start = 273.15 + 22
     "Initial soil temperature";
 
   IBPSA.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.OneUTube
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/TwoUTube.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/TwoUTube.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/TwoUTube.mo"	2022-03-10 09:57:39.680144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/TwoUTube.mo"	2022-03-10 09:58:17.016149069 +0000
@@ -64,62 +64,40 @@
     final TGro_start=TGro_start) "Discretized borehole segments"
     annotation (Placement(transformation(extent={{-10,-30},{10,10}})));
 
-equation
-  // Couple borehole port_a and port_b to first borehole segment.
-  connect(port_a, intHex[1].port_a1) annotation (Line(
-      points={{-100,5.55112e-016},{-52,5.55112e-016},{-52,6},{-10,6}},
-      color={0,127,255},
-      smooth=Smooth.None));
+equation
+// Couple borehole port_a and port_b to first borehole segment.
+  connect(port_a, intHex[1].port_a1) annotation(
+    Line(points = {{-100, 5.55112e-016}, {-52, 5.55112e-016}, {-52, 6}, {-10, 6}}, color = {0, 127, 255}, smooth = Smooth.None));
   connect(port_b, intHex[1].port_b4) annotation (Line(
       points={{100,5.55112e-016},{28,5.55112e-016},{28,-40},{-32,-40},{-32,-27},
           {-10,-27}},
       color={0,127,255},
-      smooth=Smooth.None));
-  if borFieDat.conDat.borCon == Types.BoreholeConfiguration.DoubleUTubeParallel then
-    // 2U-tube in parallel: couple both U-tube to each other.
-    connect(port_a, intHex[1].port_a3) annotation (Line(
-        points={{-100,5.55112e-016},{-52,5.55112e-016},{-52,-16.4},{-10,-16.4}},
-        color={0,127,255},
-        smooth=Smooth.None));
-    connect(port_b, intHex[1].port_b2) annotation (Line(
-        points={{100,5.55112e-016},{28,5.55112e-016},{28,-40},{-32,-40},{-32,-4},
-            {-10,-4}},
-        color={0,127,255},
-        smooth=Smooth.None));
-  elseif borFieDat.conDat.borCon == Types.BoreholeConfiguration.DoubleUTubeSeries then
-    // 2U-tube in serie: couple both U-tube to each other.
-    connect(intHex[1].port_b2, intHex[1].port_a3) annotation (Line(
-        points={{-10,-4},{-24,-4},{-24,-16},{-18,-16},{-18,-16.4},{-10,-16.4}},
-        color={0,127,255},
-        smooth=Smooth.None));
-  end if;
-
-  // Couple each layer to the next one
-  for i in 1:nSeg - 1 loop
-    connect(intHex[i].port_b1, intHex[i + 1].port_a1) annotation (Line(
-        points={{10,6},{10,10},{-10,10},{-10,6}},
-        color={0,127,255},
-        smooth=Smooth.None));
-    connect(intHex[i].port_a2, intHex[i + 1].port_b2) annotation (Line(
-        points={{10,-4},{10,0},{-10,0},{-10,-4}},
-        color={0,127,255},
-        smooth=Smooth.None));
-    connect(intHex[i].port_b3, intHex[i + 1].port_a3) annotation (Line(
-        points={{10,-16.2},{10,-12},{-10,-12},{-10,-16.4}},
-        color={0,127,255},
-        smooth=Smooth.None));
-    connect(intHex[i].port_a4, intHex[i + 1].port_b4) annotation (Line(
-        points={{10,-26},{10,-22},{-10,-22},{-10,-27}},
-        color={0,127,255},
-        smooth=Smooth.None));
-  end for;
-
-  // Close U-tube at bottom layer
-  connect(intHex[nSeg].port_b1, intHex[nSeg].port_a2)
-    annotation (Line(
-      points={{10,6},{16,6},{16,-4},{10,-4}},
-      color={0,127,255},
-      smooth=Smooth.None));
+      smooth=Smooth.None));
+  if borFieDat.conDat.borCon == Types.BoreholeConfiguration.DoubleUTubeParallel then
+// 2U-tube in parallel: couple both U-tube to each other.
+    connect(port_a, intHex[1].port_a3) annotation(
+      Line(points = {{-100, 5.55112e-016}, {-52, 5.55112e-016}, {-52, -16.4}, {-10, -16.4}}, color = {0, 127, 255}, smooth = Smooth.None));
+    connect(port_b, intHex[1].port_b2) annotation(
+      Line(points = {{100, 5.55112e-016}, {28, 5.55112e-016}, {28, -40}, {-32, -40}, {-32, -4}, {-10, -4}}, color = {0, 127, 255}, smooth = Smooth.None));
+  elseif borFieDat.conDat.borCon == Types.BoreholeConfiguration.DoubleUTubeSeries then
+// 2U-tube in serie: couple both U-tube to each other.
+    connect(intHex[1].port_b2, intHex[1].port_a3) annotation(
+      Line(points = {{-10, -4}, {-24, -4}, {-24, -16}, {-18, -16}, {-18, -16.4}, {-10, -16.4}}, color = {0, 127, 255}, smooth = Smooth.None));
+  end if;
+// Couple each layer to the next one
+  for i in 1:nSeg - 1 loop
+    connect(intHex[i].port_b1, intHex[i + 1].port_a1) annotation(
+      Line(points = {{10, 6}, {10, 10}, {-10, 10}, {-10, 6}}, color = {0, 127, 255}, smooth = Smooth.None));
+    connect(intHex[i].port_a2, intHex[i + 1].port_b2) annotation(
+      Line(points = {{10, -4}, {10, 0}, {-10, 0}, {-10, -4}}, color = {0, 127, 255}, smooth = Smooth.None));
+    connect(intHex[i].port_b3, intHex[i + 1].port_a3) annotation(
+      Line(points = {{10, -16.2}, {10, -12}, {-10, -12}, {-10, -16.4}}, color = {0, 127, 255}, smooth = Smooth.None));
+    connect(intHex[i].port_a4, intHex[i + 1].port_b4) annotation(
+      Line(points = {{10, -26}, {10, -22}, {-10, -22}, {-10, -27}}, color = {0, 127, 255}, smooth = Smooth.None));
+  end for;
+// Close U-tube at bottom layer
+  connect(intHex[nSeg].port_b1, intHex[nSeg].port_a2) annotation(
+    Line(points = {{10, 6}, {16, 6}, {16, -4}, {10, -4}}, color = {0, 127, 255}, smooth = Smooth.None));
   connect(intHex[nSeg].port_b3, intHex[nSeg].port_a4)
     annotation (Line(
       points={{10,-16.2},{14,-16.2},{14,-16},{18,-16},{18,-26},{10,-26}},
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/Cylindrical.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/Cylindrical.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/Cylindrical.mo"	2022-03-10 09:57:39.680144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/Cylindrical.mo"	2022-03-10 09:58:16.972149064 +0000
@@ -4,14 +4,14 @@
 
   parameter IBPSA.Fluid.Geothermal.Borefields.Data.Soil.Template soiDat
     annotation (Placement(transformation(extent={{-100,-100},{-80,-80}})));
-  parameter Modelica.SIunits.Height h "Height of the cylinder";
-  parameter Modelica.SIunits.Radius r_a "Internal radius";
-  parameter Modelica.SIunits.Radius r_b "External radius";
+  parameter Modelica.Units.SI.Height h "Height of the cylinder";
+  parameter Modelica.Units.SI.Radius r_a "Internal radius";
+  parameter Modelica.Units.SI.Radius r_b "External radius";
   parameter Integer nSta(min=1) = 10 "Number of state variables";
-  parameter Modelica.SIunits.Temperature TInt_start
+  parameter Modelica.Units.SI.Temperature TInt_start
     "Initial temperature at port_a, used if steadyStateInitial = false"
     annotation (Dialog(group="Initialization", enable=not steadyStateInitial));
-  parameter Modelica.SIunits.Temperature TExt_start
+  parameter Modelica.Units.SI.Temperature TExt_start
     "Initial temperature at port_b, used if steadyStateInitial = false"
     annotation (Dialog(group="Initialization", enable=not steadyStateInitial));
   parameter Boolean steadyStateInitial=false
@@ -20,7 +20,7 @@
 
   parameter Real gridFac(min=1) = 2 "Grid factor for spacing";
 
-  parameter Modelica.SIunits.Radius r[nSta + 1](each fixed=false)
+  parameter Modelica.Units.SI.Radius r[nSta + 1](each fixed=false)
    "Radius to the boundary of the i-th domain";
 
   Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_a port_a(T(start=TInt_start))
@@ -30,31 +30,31 @@
     "Heat port at surface b" annotation (Placement(transformation(extent={{90,-10},
             {110,10}},rotation=0)));
 
-  Modelica.SIunits.Temperature T[nSta](
+  Modelica.Units.SI.Temperature T[nSta](
     start={TInt_start +
       (TExt_start - TInt_start)/Modelica.Math.log(r_b/r_a)*
       Modelica.Math.log((r_a + (r_b - r_a)/(nSta)*(i - 0.5))/r_a) for i in 1:nSta})
     "Temperature of the states";
 
-  Modelica.SIunits.TemperatureDifference dT "port_a.T - port_b.T";
+  Modelica.Units.SI.TemperatureDifference dT "port_a.T - port_b.T";
 
-  Modelica.SIunits.HeatFlowRate Q_flow[nSta + 1]
+  Modelica.Units.SI.HeatFlowRate Q_flow[nSta + 1]
     "Heat flow rate from state i to i+1";
 
 protected
-  parameter Modelica.SIunits.Radius rC[nSta](each fixed=false)
+  parameter Modelica.Units.SI.Radius rC[nSta](each fixed=false)
     "Radius to the center of the i-th domain";
 
-  final parameter Modelica.SIunits.SpecificHeatCapacity c=soiDat.cSoi
+  final parameter Modelica.Units.SI.SpecificHeatCapacity c=soiDat.cSoi
     "Specific heat capacity";
-  final parameter Modelica.SIunits.ThermalConductivity k=soiDat.kSoi
+  final parameter Modelica.Units.SI.ThermalConductivity k=soiDat.kSoi
     "Thermal conductivity of the material";
-  final parameter Modelica.SIunits.Density d=soiDat.dSoi
+  final parameter Modelica.Units.SI.Density d=soiDat.dSoi
     "Density of the material";
 
-  parameter Modelica.SIunits.ThermalConductance G[nSta + 1](each fixed=false)
+  parameter Modelica.Units.SI.ThermalConductance G[nSta + 1](each fixed=false)
     "Heat conductance between the temperature nodes";
-  parameter Modelica.SIunits.HeatCapacity C[nSta](each fixed=false)
+  parameter Modelica.Units.SI.HeatCapacity C[nSta](each fixed=false)
     "Heat capacity of each state";
 
   parameter Real gridFac_sum(fixed=false);
@@ -73,18 +73,16 @@
 
 initial equation
   assert(r_a < r_b, "Error: Model requires r_a < r_b.");
-  assert(0 < r_a, "Error: Model requires 0 < r_a.");
-
-  // ****************** Comments *********************:
-  // The layer is divided into nSta segments. The radius of each segment increase exponentially with base 'griFac':
-  // r_b - r_a = sum( a * griFac^k - a , k=2..nSta) => from this we find a = (r_b - r_a)/(griFac^(n+1) - griFac)
-  // Using this a, we can now find the r[i]:
-  // r[1] := r_a
-  // r[i] = r[i-1] + a * griFac^i = r[i-1] + griFac^i * (r_b - r_a) / (griFac^(n+1) - griFac)
-  //
-  // This can also be writing as:
-  // r[i]= r[i-1] + ( r_b - r_a)  * (1-griFac)/(1-griFac^(nSta)) * griFac^(i-2);
-
+  assert(0 < r_a, "Error: Model requires 0 < r_a.");
+// ****************** Comments *********************:
+// The layer is divided into nSta segments. The radius of each segment increase exponentially with base 'griFac':
+// r_b - r_a = sum( a * griFac^k - a , k=2..nSta) => from this we find a = (r_b - r_a)/(griFac^(n+1) - griFac)
+// Using this a, we can now find the r[i]:
+// r[1] := r_a
+// r[i] = r[i-1] + a * griFac^i = r[i-1] + griFac^i * (r_b - r_a) / (griFac^(n+1) - griFac)
+//
+// This can also be writing as:
+// r[i]= r[i-1] + ( r_b - r_a)  * (1-griFac)/(1-griFac^(nSta)) * griFac^(i-2);
   r[1] = r_a;
   r[2] = r_a + sqrt(k/c/d*60) "eskilson minimum length";
   r[3] = r_a + 2*sqrt(k/c/d*60);
@@ -94,34 +92,30 @@
     r[i] = r[i - 1] + (r_b - r[4])/gridFac_sum*gridFac^(i - 5);
   end for;
   assert(abs(r[nSta + 1] - r_b) < 1E-3,
-    "Error: Wrong computation of radius. r[nSta+1]=" + String(r[nSta + 1]));
-
-  // Radii at middle of resistance
-  for i in 1:nSta loop
-    rC[i] = (r[i] + r[i + 1])/2;
-  end for;
-
-  // Conductance between nodes (which are in the center of the domain)
-  G[1] = 2*Modelica.Constants.pi*k*h/Modelica.Math.log(rC[1]/r_a);
+    "Error: Wrong computation of radius. r[nSta+1]=" + String(r[nSta + 1]));
+// Radii at middle of resistance
+  for i in 1:nSta loop
+    rC[i] = (r[i] + r[i + 1]) / 2;
+  end for;
+// Conductance between nodes (which are in the center of the domain)
+  G[1] = 2 * Modelica.Constants.pi * k * h / Modelica.Math.log(rC[1] / r_a);
   G[nSta + 1] = 2*Modelica.Constants.pi*k*h/Modelica.Math.log(r_b/rC[nSta]);
   for i in 2:nSta loop
     G[i] = 2*Modelica.Constants.pi*k*h/Modelica.Math.log(rC[i]/rC[i - 1]);
-  end for;
-
-  // Heat capacity of each segment
-  for i in 1:nSta loop
-    C[i] = (d*Modelica.Constants.pi*c*h*((r[i + 1])^2 - (r[i])^2));
-  end for;
-  // The initialization is only done for materials that store energy.
-  if not soiDat.steadyState then
-    if steadyStateInitial then
-      der(T) = zeros(nSta);
-    else
-      for i in 1:nSta loop
-        T[i] = TInt_start + (TExt_start - TInt_start)/Modelica.Math.log(r_b/r_a)
-          *Modelica.Math.log(rC[i]/r_a);
-      end for;
-    end if;
+  end for;
+// Heat capacity of each segment
+  for i in 1:nSta loop
+    C[i] = d * Modelica.Constants.pi * c * h * (r[i + 1] ^ 2 - r[i] ^ 2);
+  end for;
+// The initialization is only done for materials that store energy.
+  if not soiDat.steadyState then
+    if steadyStateInitial then
+      der(T) = zeros(nSta);
+    else
+      for i in 1:nSta loop
+        T[i] = TInt_start + (TExt_start - TInt_start) / Modelica.Math.log(r_b / r_a) * Modelica.Math.log(rC[i] / r_a);
+      end for;
+    end if;
   end if;
 equation
   dT = port_a.T - port_b.T;
@@ -131,7 +125,7 @@
   Q_flow[nSta + 1] = G[nSta + 1]*(T[nSta] - port_b.T);
   for i in 2:nSta loop
     Q_flow[i] = G[i]*(T[i - 1] - T[i]);
-    // Q_flow[i] represents the heat flowing between two nodes
+// Q_flow[i] represents the heat flowing between two nodes
   end for;
   if soiDat.steadyState then
     for i in 2:nSta + 1 loop
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/GroundTemperatureResponse.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/GroundTemperatureResponse.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/GroundTemperatureResponse.mo"	2022-03-10 09:57:39.680144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/GroundTemperatureResponse.mo"	2022-03-10 09:58:16.868149052 +0000
@@ -1,6 +1,6 @@
 within BuildSysPro.IBPSA.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer;
 model GroundTemperatureResponse "Model calculating discrete load aggregation"
-  parameter Modelica.SIunits.Time tLoaAgg(final min = Modelica.Constants.eps)=3600
+  parameter Modelica.Units.SI.Time tLoaAgg(final min = Modelica.Constants.eps)=3600
     "Time resolution of load aggregation";
   parameter Integer nCel(min=1)=5 "Number of cells per aggregation level";
   parameter Boolean forceGFunCalc = false
@@ -43,7 +43,7 @@
       nTimSho=nTimSho,
       nTimLon=nTimLon,
       ttsMax=ttsMax) "String with encrypted g-function arguments";
-  parameter Modelica.SIunits.Time timFin=
+  parameter Modelica.Units.SI.Time timFin=
     (borFieDat.conDat.hBor^2/(9*borFieDat.soiDat.aSoi))*ttsMax
     "Final time for g-function calculation";
   parameter Integer i(min=1)=
@@ -55,28 +55,28 @@
       "Number of aggregation cells";
   final parameter Real[nTimTot,2] timSer(each fixed=false)
     "g-function input from matrix, with the second column as temperature Tstep";
-  final parameter Modelica.SIunits.Time t_start(fixed=false) "Simulation start time";
-  final parameter Modelica.SIunits.Time[i] nu(each fixed=false)
+  final parameter Modelica.Units.SI.Time t_start(fixed=false) "Simulation start time";
+  final parameter Modelica.Units.SI.Time[i] nu(each fixed=false)
     "Time vector for load aggregation";
   final parameter Real[i] kappa(each fixed=false)
     "Weight factor for each aggregation cell";
   final parameter Real[i] rCel(each fixed=false) "Cell widths";
 
-  discrete Modelica.SIunits.HeatFlowRate[i] QAgg_flow
+  discrete Modelica.Units.SI.HeatFlowRate[i] QAgg_flow
     "Vector of aggregated loads";
-  discrete Modelica.SIunits.HeatFlowRate[i] QAggShi_flow
+  discrete Modelica.Units.SI.HeatFlowRate[i] QAggShi_flow
     "Shifted vector of aggregated loads";
   discrete Integer curCel "Current occupied cell";
 
-  discrete Modelica.SIunits.TemperatureDifference delTBor0
+  discrete Modelica.Units.SI.TemperatureDifference delTBor0
     "Previous time step's temperature difference current borehole wall temperature minus initial borehole temperature";
   discrete Real derDelTBor0(unit="K/s")
     "Derivative of wall temperature change from previous time steps";
   final parameter Real dTStepdt(fixed=false)
     "Time derivative of g/(2*pi*H*Nb*ks) within most recent cell";
 
-  Modelica.SIunits.Heat U "Accumulated heat flow from all boreholes";
-  discrete Modelica.SIunits.Heat U_old "Accumulated heat flow from all boreholes at last aggregation step";
+  Modelica.Units.SI.Heat U "Accumulated heat flow from all boreholes";
+  discrete Modelica.Units.SI.Heat U_old "Accumulated heat flow from all boreholes at last aggregation step";
 
 initial equation
   QAgg_flow = zeros(i);
@@ -128,30 +128,17 @@
   der(delTBor) = dTStepdt*QBor_flow + derDelTBor0;
   der(U) = QBor_flow;
 
-  when sample(t_start, tLoaAgg) then
-    // Assign average load since last aggregation step to the first cell of the
-    // aggregation vector
-    U_old = U;
-
-    // Store (U - pre(U_old))/tLoaAgg in QAgg_flow[1], and pre(QAggShi_flow) in the other elements
-    QAgg_flow = cat(1, {(U - pre(U_old))/tLoaAgg}, pre(QAggShi_flow[2:end]));
-    // Shift loads in aggregation cells
-    (curCel,QAggShi_flow) =
-      IBPSA.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.LoadAggregation.shiftAggregationCells(
-                  i=i,
-                  QAgg_flow=QAgg_flow,
-                  rCel=rCel,
-                  nu=nu,
-                  curTim=(time - t_start));
-
-    // Determine the temperature change at the next aggregation step (assuming
-    // no loads until then)
-    delTBor0 =
-      IBPSA.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.LoadAggregation.temporalSuperposition(
-                  i=i,
-                  QAgg_flow=QAggShi_flow,
-                  kappa=kappa,
-                  curCel=curCel);
+  when sample(t_start, tLoaAgg) then
+// Assign average load since last aggregation step to the first cell of the
+// aggregation vector
+    U_old = U;
+// Store (U - pre(U_old))/tLoaAgg in QAgg_flow[1], and pre(QAggShi_flow) in the other elements
+    QAgg_flow = cat(1, {(U - pre(U_old)) / tLoaAgg}, pre(QAggShi_flow[2:end]));
+// Shift loads in aggregation cells
+    (curCel, QAggShi_flow) = IBPSA.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.LoadAggregation.shiftAggregationCells(i = i, QAgg_flow = QAgg_flow, rCel = rCel, nu = nu, curTim = time - t_start);
+// Determine the temperature change at the next aggregation step (assuming
+// no loads until then)
+    delTBor0 = IBPSA.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.LoadAggregation.temporalSuperposition(i = i, QAgg_flow = QAggShi_flow, kappa = kappa, curCel = curCel);
 
     derDelTBor0 = (delTBor0-delTBor)/tLoaAgg;
   end when;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/AggregationCellTimes.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/AggregationCellTimes.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/AggregationCellTimes.mo"	2022-03-10 09:57:39.680144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/AggregationCellTimes.mo"	2022-03-10 09:58:16.816149044 +0000
@@ -4,13 +4,13 @@
   extends Modelica.Icons.Example;
 
   parameter Integer i = 6 "Number of aggregation cells";
-  parameter Modelica.SIunits.Time tLoaAgg=10 "Time resolution of load aggregation";
-  final parameter Modelica.SIunits.Time[i] nu(each fixed=false)
-    "Time vector for load aggregation";
-  final parameter Modelica.SIunits.Time[i] rCel(each fixed=false) "Cell widths";
 
-  Modelica.SIunits.Time nu_error,rCel_error "Error on chosen values";
+  parameter Modelica.Units.SI.Time tLoaAgg=10 "Time resolution of load aggregation";
+  final parameter Modelica.Units.SI.Time[i] nu(each fixed=false)
+    "Time vector for load aggregation";
+  final parameter Modelica.Units.SI.Time[i] rCel(each fixed=false) "Cell widths";
 
+  Modelica.Units.SI.Time nu_error,rCel_error "Error on chosen values";
 initial equation
   (nu,rCel) =
     IBPSA.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.LoadAggregation.aggregationCellTimes(
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/AggregationWeightingFactors.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/AggregationWeightingFactors.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/AggregationWeightingFactors.mo"	2022-03-10 09:57:39.680144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/AggregationWeightingFactors.mo"	2022-03-10 09:58:16.804149042 +0000
@@ -11,7 +11,7 @@
     6.27297603019976, 2.43435015306157e-05;
     9.21672932384307, 3.00295537091117e-05]
     "Complete time matrix with TStep";
-  Modelica.SIunits.ThermalResistance[10] kappa
+  Modelica.Units.SI.ThermalResistance[10] kappa
     "Weight factor for each aggregation cell";
 
 equation
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/ShiftAggregationCells.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/ShiftAggregationCells.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/ShiftAggregationCells.mo"	2022-03-10 09:57:39.680144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/ShiftAggregationCells.mo"	2022-03-10 09:58:16.780149040 +0000
@@ -3,7 +3,7 @@
   extends Modelica.Icons.Example;
 
   discrete Integer curCel "Current occupied cell";
-  discrete Modelica.SIunits.HeatFlowRate[5] QAggShi_flow
+  discrete Modelica.Units.SI.HeatFlowRate[5] QAggShi_flow
     "Shifted vector of aggregated loads";
 
 initial equation
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/TemperatureResponseMatrix.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/TemperatureResponseMatrix.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/TemperatureResponseMatrix.mo"	2022-03-10 09:57:39.680144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/TemperatureResponseMatrix.mo"	2022-03-10 09:58:16.768149039 +0000
@@ -3,7 +3,8 @@
   "This validation case test the calculation, writing and reading of the temperature step response"
   extends Modelica.Icons.Example;
 
-  parameter Modelica.SIunits.Time timSer[26+50,2]=
+
+  parameter Modelica.Units.SI.Time timSer[26+50,2]=
     IBPSA.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.LoadAggregation.temperatureResponseMatrix(
       nBor=1,
       cooBor={{0,0}},
@@ -19,8 +20,7 @@
       ttsMax=exp(5),
       sha="TemperatureResponseMatrix_validation",
       forceGFunCalc=true) "Resulting temperature response matrix";
-  Modelica.SIunits.ThermalResistance TStep "Temperature step response";
-
+  Modelica.Units.SI.ThermalResistance TStep "Temperature step response";
 equation
   TStep = Modelica.Math.Vectors.interpolate(timSer[:,1],timSer[:,2],time);
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/TemporalSuperposition.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/TemporalSuperposition.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/TemporalSuperposition.mo"	2022-03-10 09:57:39.680144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/Validation/TemporalSuperposition.mo"	2022-03-10 09:58:16.760149037 +0000
@@ -2,13 +2,13 @@
 model TemporalSuperposition "This validation case applies temporal superposition with truncated vectors"
   extends Modelica.Icons.Example;
 
-  parameter Modelica.SIunits.TemperatureDifference supPos = IBPSA.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.LoadAggregation.temporalSuperposition(
+
+  parameter Modelica.Units.SI.TemperatureDifference supPos = IBPSA.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.LoadAggregation.temporalSuperposition(
       i=6,
       QAgg_flow={2,1e6,3,1e6,1e6},
       kappa={0.4,0,0.2,1,0},
       curCel=3) "Temporal superposition";
-  Modelica.SIunits.TemperatureDifference supPosErr;
-
+  Modelica.Units.SI.TemperatureDifference supPosErr;
 equation
   supPosErr = abs((2*0.4+3*0.2)-supPos);
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/aggregationCellTimes.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/aggregationCellTimes.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/aggregationCellTimes.mo"	2022-03-10 09:57:39.680144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/aggregationCellTimes.mo"	2022-03-10 09:58:16.748149036 +0000
@@ -6,10 +6,10 @@
   input Integer i "Size of time vector";
   input Real lvlBas "Base for growth between each level, e.g. 2";
   input Integer nCel "Number of cells of same size per level";
-  input Modelica.SIunits.Time tLoaAgg(final min=Modelica.Constants.small) "Time resolution of load aggregation";
-  input Modelica.SIunits.Time timFin "Total simulation max length";
+  input Modelica.Units.SI.Time tLoaAgg(final min=Modelica.Constants.small) "Time resolution of load aggregation";
+  input Modelica.Units.SI.Time timFin "Total simulation max length";
 
-  output Modelica.SIunits.Time nu[i] "Time vector nu of size i";
+  output Modelica.Units.SI.Time nu[i] "Time vector nu of size i";
   output Real rCel[i](each unit="1") "Cell width vector of size i";
 
 protected
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/aggregationWeightingFactors.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/aggregationWeightingFactors.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/aggregationWeightingFactors.mo"	2022-03-10 09:57:39.680144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/aggregationWeightingFactors.mo"	2022-03-10 09:58:16.728149033 +0000
@@ -1,82 +1,54 @@
-within BuildSysPro.IBPSA.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.LoadAggregation;
-function aggregationWeightingFactors
-  "Calculates the kappa vector for load aggregation"
-  extends Modelica.Icons.Function;
-
-  input Integer i "Size of aggregation vector";
-  input Integer nTimTot "Size of g-function time table";
-  input Modelica.SIunits.ThermalResistance TStep[nTimTot,2] "Time matrix with TStep";
-  input Modelica.SIunits.Time nu[i] "Aggregation time vector nu";
-
-  output Modelica.SIunits.ThermalResistance kappa[i] "Weighting factors vector";
-
-protected
-  Modelica.SIunits.ThermalResistance prevT "Interpolated value of TStep at previous cell";
-  Modelica.SIunits.ThermalResistance curT "Interpolated value of TStep at current cell";
-  Integer curInt "Integer to select data interval";
-  Real[size(TStep[:,1], 1)] d(unit="K/J") "Derivatives at the support points";
-
-algorithm
-  d := IBPSA.Utilities.Math.Functions.splineDerivatives(
-                  x=TStep[:, 1],
-                  y=TStep[:, 2],
-                  ensureMonotonicity=false);
-
-  for j in 1:i loop
-    if j==1 then
-      prevT := 0;
-    else
-      //Spline interpolation at nu[j-1]
-      for k in 1:size(TStep[:,1], 1) - 1 loop
-        if nu[j-1] > TStep[k,1] then
-          curInt := k;
-        end if;
-      end for;
-
-      prevT :=
-        IBPSA.Utilities.Math.Functions.cubicHermiteLinearExtrapolation(
-                      x=nu[j - 1],
-                      x1=TStep[curInt, 1],
-                      x2=TStep[curInt + 1, 1],
-                      y1=TStep[curInt, 2],
-                      y2=TStep[curInt + 1, 2],
-                      y1d=d[curInt],
-                      y2d=d[curInt + 1]);
-    end if;
-
-    //Spline interpolation at nu[j]
-    for k in 1:size(TStep[:,1], 1) - 1 loop
-      if nu[j] > TStep[k,1] then
-        curInt := k;
-      end if;
-    end for;
-
-    curT :=
-      IBPSA.Utilities.Math.Functions.cubicHermiteLinearExtrapolation(
-                    x=nu[j],
-                    x1=TStep[curInt, 1],
-                    x2=TStep[curInt + 1, 1],
-                    y1=TStep[curInt, 2],
-                    y2=TStep[curInt + 1, 2],
-                    y1d=d[curInt],
-                    y2d=d[curInt + 1]);
-
-    kappa[j] := curT-prevT;
-  end for;
-
-  annotation (Documentation(info="
+within BuildSysPro.IBPSA.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.LoadAggregation;
+
+function aggregationWeightingFactors "Calculates the kappa vector for load aggregation"
+  extends Modelica.Icons.Function;
+  input Integer i "Size of aggregation vector";
+  input Integer nTimTot "Size of g-function time table";
+  input Modelica.Units.SI.ThermalResistance TStep[nTimTot, 2] "Time matrix with TStep";
+  input Modelica.Units.SI.Time nu[i] "Aggregation time vector nu";
+  output Modelica.Units.SI.ThermalResistance kappa[i] "Weighting factors vector";
+protected
+  Modelica.Units.SI.ThermalResistance prevT "Interpolated value of TStep at previous cell";
+  Modelica.Units.SI.ThermalResistance curT "Interpolated value of TStep at current cell";
+  Integer curInt "Integer to select data interval";
+  Real[size(TStep[:, 1], 1)] d(unit = "K/J") "Derivatives at the support points";
+algorithm
+  d := IBPSA.Utilities.Math.Functions.splineDerivatives(x = TStep[:, 1], y = TStep[:, 2], ensureMonotonicity = false);
+  for j in 1:i loop
+    if j == 1 then
+      prevT := 0;
+    else
+      for k in 1:size(TStep[:, 1], 1) - 1 loop
+        if nu[j - 1] > TStep[k, 1] then
+          curInt := k;
+        end if;
+      end for;
+      prevT := IBPSA.Utilities.Math.Functions.cubicHermiteLinearExtrapolation(x = nu[j - 1], x1 = TStep[curInt, 1], x2 = TStep[curInt + 1, 1], y1 = TStep[curInt, 2], y2 = TStep[curInt + 1, 2], y1d = d[curInt], y2d = d[curInt + 1]);
+    end if;
+    for k in 1:size(TStep[:, 1], 1) - 1 loop
+      if nu[j] > TStep[k, 1] then
+        curInt := k;
+      end if;
+    end for;
+    curT := IBPSA.Utilities.Math.Functions.cubicHermiteLinearExtrapolation(x = nu[j], x1 = TStep[curInt, 1], x2 = TStep[curInt + 1, 1], y1 = TStep[curInt, 2], y2 = TStep[curInt + 1, 2], y1d = d[curInt], y2d = d[curInt + 1]);
+    kappa[j] := curT - prevT;
+  end for;
+//Spline interpolation at nu[j-1]
+//Spline interpolation at nu[j]
+  annotation(
+    Documentation(info = "
 
    
 This function uses spline interpolation to construct the weighting factors
 vector kappa using the aggregation times nu and the
 temperature step reponse (a time-series in the form of a matrix) of the
 borefield as an input.
 
    
-", revisions="
+", revisions = "
 
      
 
    • 
 March 5, 2018, by Alex Laferrière:
      
 First implementation.
 
      • 
 
    
-"));
-end aggregationWeightingFactors;
+"));
+end aggregationWeightingFactors;
\ No newline at end of file
Only in converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation: aggregationWeightingFactors.mo.after
Only in converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation: aggregationWeightingFactors.mo.before
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/countAggregationCells.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/countAggregationCells.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/countAggregationCells.mo"	2022-03-10 09:57:39.680144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/countAggregationCells.mo"	2022-03-10 09:58:16.708149030 +0000
@@ -5,15 +5,15 @@
 
   input Real lvlBas "Base for growth between each level, e.g. 2";
   input Integer nCel(min=1) "Number of cells of same size per level";
-  input Modelica.SIunits.Time timFin "Total simulation max length";
-  input Modelica.SIunits.Time tLoaAgg "Time resolution of load aggregation";
+  input Modelica.Units.SI.Time timFin "Total simulation max length";
+  input Modelica.Units.SI.Time tLoaAgg "Time resolution of load aggregation";
 
   output Integer i(min=1) "Size of aggregation vectors";
 
 protected
-  Modelica.SIunits.Duration width_i "Width of current aggregation cell";
-  Modelica.SIunits.Time nu_i "End time of current aggregation cell";
 
+  Modelica.Units.SI.Duration width_i "Width of current aggregation cell";
+  Modelica.Units.SI.Time nu_i "End time of current aggregation cell";
 algorithm
   assert(timFin > 0, "Total simulation time must be bigger than 0.");
   width_i := 0;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/shiftAggregationCells.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/shiftAggregationCells.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/shiftAggregationCells.mo"	2022-03-10 09:57:39.680144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/shiftAggregationCells.mo"	2022-03-10 09:58:16.696149029 +0000
@@ -4,14 +4,14 @@
   extends Modelica.Icons.Function;
 
   input Integer i "Number of aggregation cells";
-  input Modelica.SIunits.HeatFlowRate QAgg_flow[i] "Vector of aggregated loads";
+  input Modelica.Units.SI.HeatFlowRate QAgg_flow[i] "Vector of aggregated loads";
   input Real rCel[i](each min=Modelica.Constants.small) "Aggregation cell widths";
-  input Modelica.SIunits.Time nu[i] "Cell aggregation times";
-  input Modelica.SIunits.Time curTim "Current simulation time";
+  input Modelica.Units.SI.Time nu[i] "Cell aggregation times";
+  input Modelica.Units.SI.Time curTim "Current simulation time";
 
   output Integer curCel "Current occupied aggregation cell";
-  output Modelica.SIunits.HeatFlowRate QAggShi_flow[i] "Shifted vector of aggregated loads";
 
+  output Modelica.Units.SI.HeatFlowRate QAggShi_flow[i] "Shifted vector of aggregated loads";
 algorithm
   curCel := 1;
   for j in (i-1):-1:1 loop
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/temperatureResponseMatrix.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/temperatureResponseMatrix.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/temperatureResponseMatrix.mo"	2022-03-10 09:57:39.680144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/temperatureResponseMatrix.mo"	2022-03-10 09:58:16.680149028 +0000
@@ -5,12 +5,12 @@
 
   input Integer nBor "Number of boreholes";
   input Real cooBor[nBor, 2] "Borehole coordinates";
-  input Modelica.SIunits.Height hBor "Borehole length";
-  input Modelica.SIunits.Height dBor "Borehole buried depth";
-  input Modelica.SIunits.Radius rBor "Borehole radius";
-  input Modelica.SIunits.ThermalDiffusivity aSoi
+  input Modelica.Units.SI.Height hBor "Borehole length";
+  input Modelica.Units.SI.Height dBor "Borehole buried depth";
+  input Modelica.Units.SI.Radius rBor "Borehole radius";
+  input Modelica.Units.SI.ThermalDiffusivity aSoi
     "Thermal diffusivity of soil";
-  input Modelica.SIunits.ThermalConductivity kSoi
+  input Modelica.Units.SI.ThermalConductivity kSoi
     "Thermal conductivity of soil";
   input Integer nSeg "Number of line source segments per borehole";
   input Integer nTimSho "Number of time steps in short time region";
@@ -21,53 +21,28 @@
   input Boolean forceGFunCalc
     "Set to true to force the thermal response to be calculated at the start";
 
-  output Modelica.SIunits.ThermalResistance TStep[nTimTot, 2] "Temperature step-response time series";
+  output Modelica.Units.SI.ThermalResistance TStep[nTimTot, 2] "Temperature step-response time series";
 
 protected
   String pathSave "Path of the folder used to save the g-function";
-  Modelica.SIunits.Time[nTimTot] tGFun "g-function evaluation times";
+  Modelica.Units.SI.Time[nTimTot] tGFun "g-function evaluation times";
   Real[nTimTot] gFun "g-function vector";
   Boolean writegFun = false "True if g-function was succesfully written to file";
 
 algorithm
-  pathSave := "tmp/temperatureResponseMatrix/" + sha + "TStep.mat";
-
-  if forceGFunCalc or not Modelica.Utilities.Files.exist(pathSave) then
-    (tGFun,gFun) :=
-      IBPSA.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.ThermalResponseFactors.gFunction(
-                    nBor=nBor,
-                    cooBor=cooBor,
-                    hBor=hBor,
-                    dBor=dBor,
-                    rBor=rBor,
-                    aSoi=aSoi,
-                    nSeg=nSeg,
-                    nTimSho=nTimSho,
-                    nTimLon=nTimLon,
-                    ttsMax=ttsMax);
-
-    for i in 1:nTimTot loop
-      TStep[i,1] := tGFun[i];
-      TStep[i,2] := gFun[i]/(2*Modelica.Constants.pi*hBor*nBor*kSoi);
-    end for;
-
-    //creation of a temporary folder in the simulation folder
-    Modelica.Utilities.Files.createDirectory("tmp");
-    Modelica.Utilities.Files.createDirectory("tmp/temperatureResponseMatrix");
-
-    writegFun := Modelica.Utilities.Streams.writeRealMatrix(
-      fileName=pathSave,
-      matrixName="TStep",
-      matrix=TStep,
-      append=false);
-  end if;
-
-  TStep := Modelica.Utilities.Streams.readRealMatrix(
-    fileName=pathSave,
-    matrixName="TStep",
-    nrow=nTimTot,
-    ncol=2);
-
+  pathSave := "tmp/temperatureResponseMatrix/" + sha + "TStep.mat";
+  if forceGFunCalc or not Modelica.Utilities.Files.exist(pathSave) then
+    (tGFun, gFun) := IBPSA.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.ThermalResponseFactors.gFunction(nBor = nBor, cooBor = cooBor, hBor = hBor, dBor = dBor, rBor = rBor, aSoi = aSoi, nSeg = nSeg, nTimSho = nTimSho, nTimLon = nTimLon, ttsMax = ttsMax);
+    for i in 1:nTimTot loop
+      TStep[i, 1] := tGFun[i];
+      TStep[i, 2] := gFun[i] / (2 * Modelica.Constants.pi * hBor * nBor * kSoi);
+    end for;
+    Modelica.Utilities.Files.createDirectory("tmp");
+    Modelica.Utilities.Files.createDirectory("tmp/temperatureResponseMatrix");
+    writegFun := Modelica.Utilities.Streams.writeRealMatrix(fileName = pathSave, matrixName = "TStep", matrix = TStep, append = false);
+  end if;
+//creation of a temporary folder in the simulation folder
+  TStep := Modelica.Utilities.Streams.readRealMatrix(fileName = pathSave, matrixName = "TStep", nrow = nTimTot, ncol = 2);
   annotation (Documentation(info="
 
    
 This function uses the parameters required to calculate the borefield's thermal
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/temporalSuperposition.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/temporalSuperposition.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/temporalSuperposition.mo"	2022-03-10 09:57:39.680144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/temporalSuperposition.mo"	2022-03-10 09:58:16.672149027 +0000
@@ -4,14 +4,14 @@
   extends Modelica.Icons.Function;
 
   input Integer i "Number of aggregation cells";
-  input Modelica.SIunits.HeatFlowRate QAgg_flow[i]
+  input Modelica.Units.SI.HeatFlowRate QAgg_flow[i]
     "Vector of aggregated loads";
-  input Modelica.SIunits.ThermalResistance kappa[i]
+  input Modelica.Units.SI.ThermalResistance kappa[i]
     "Weighting factors for each aggregation cell";
   input Integer curCel "Current occupied aggregation cell";
 
-  output Modelica.SIunits.TemperatureDifference deltaTb "Delta T at wall";
 
+  output Modelica.Units.SI.TemperatureDifference deltaTb "Delta T at wall";
 algorithm
   deltaTb := QAgg_flow[1:curCel]*kappa[1:curCel];
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Examples/CylindricalHeatSource.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Examples/CylindricalHeatSource.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Examples/CylindricalHeatSource.mo"	2022-03-10 09:57:39.680144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Examples/CylindricalHeatSource.mo"	2022-03-10 09:58:16.648149024 +0000
@@ -2,11 +2,11 @@
 model CylindricalHeatSource "Test case for cylindrical heat source"
   extends Modelica.Icons.Example;
 
-  parameter Modelica.SIunits.ThermalDiffusivity aSoi = 1.0e-6 "Ground thermal diffusivity";
-  parameter Modelica.SIunits.Radius rSource = 0.075 "Radius of cylinder source";
-  parameter Modelica.SIunits.Radius[5] r = {rSource, 2*rSource, 5*rSource, 10*rSource, 20*rSource}
+  parameter Modelica.Units.SI.ThermalDiffusivity aSoi = 1.0e-6 "Ground thermal diffusivity";
+  parameter Modelica.Units.SI.Radius rSource = 0.075 "Radius of cylinder source";
+  parameter Modelica.Units.SI.Radius[5] r = {rSource, 2*rSource, 5*rSource, 10*rSource, 20*rSource}
     "Radial position of evaluation of the solution";
-  Modelica.SIunits.Time t "Time";
+  Modelica.Units.SI.Time t "Time";
   Real[5] G "Cylindrical heat source solution";
 
 equation
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Examples/FiniteLineSource.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Examples/FiniteLineSource.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Examples/FiniteLineSource.mo"	2022-03-10 09:57:39.680144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Examples/FiniteLineSource.mo"	2022-03-10 09:58:16.628149021 +0000
@@ -2,17 +2,17 @@
 model FiniteLineSource "Test case for finite line source"
   extends Modelica.Icons.Example;
 
-  parameter Modelica.SIunits.ThermalDiffusivity aSoi = 1.0e-6 "Ground thermal diffusivity";
-  parameter Modelica.SIunits.Distance[2] r = {0.075, 7.0}
+  parameter Modelica.Units.SI.ThermalDiffusivity aSoi = 1.0e-6 "Ground thermal diffusivity";
+  parameter Modelica.Units.SI.Distance[2] r = {0.075, 7.0}
     "Radial position of evaluation of the solution";
-  parameter Modelica.SIunits.Height len1 = 12.5 "Length of emitting source";
-  parameter Modelica.SIunits.Height burDep1 = 29.0
+  parameter Modelica.Units.SI.Height len1 = 12.5 "Length of emitting source";
+  parameter Modelica.Units.SI.Height burDep1 = 29.0
     "Buried depth of emitting source";
-  parameter Modelica.SIunits.Height[7] len2 = {12.5, 8.0, 15.0, 14.0, 6.0, 20.0, 3.0}
+  parameter Modelica.Units.SI.Height[7] len2 = {12.5, 8.0, 15.0, 14.0, 6.0, 20.0, 3.0}
     "Length of receiving line";
-  parameter Modelica.SIunits.Height[7] burDep2 = {29.0, 25.0, 34.0, 2.0, 32.0, 27.0, 44.0}
+  parameter Modelica.Units.SI.Height[7] burDep2 = {29.0, 25.0, 34.0, 2.0, 32.0, 27.0, 44.0}
     "Buried depth of receiving line";
-  Modelica.SIunits.Time t "Time";
+  Modelica.Units.SI.Time t "Time";
   Real[2,7] hRea "Finite line source solution (Real part)";
   Real[2,7] hMir "Finite line source solution (Mirror part)";
   Real[2,7] h "Finite line source solution";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Examples/FiniteLineSource_Integrand.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Examples/FiniteLineSource_Integrand.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Examples/FiniteLineSource_Integrand.mo"	2022-03-10 09:57:39.680144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Examples/FiniteLineSource_Integrand.mo"	2022-03-10 09:58:16.556149011 +0000
@@ -3,11 +3,11 @@
   "Test case for finite line source integrand function"
   extends Modelica.Icons.Example;
 
-  parameter Modelica.SIunits.Distance dis = 0.075 "Radial distance between borehole axes";
-  parameter Modelica.SIunits.Height len1 = 150.0 "Length of emitting borehole";
-  parameter Modelica.SIunits.Height burDep1 = 4.0 "Buried depth of emitting borehole";
-  parameter Modelica.SIunits.Height len2 = 150.0 "Length of receiving borehole";
-  parameter Modelica.SIunits.Height burDep2 = 4.0 "Buried depth of receiving borehole";
+  parameter Modelica.Units.SI.Distance dis = 0.075 "Radial distance between borehole axes";
+  parameter Modelica.Units.SI.Height len1 = 150.0 "Length of emitting borehole";
+  parameter Modelica.Units.SI.Height burDep1 = 4.0 "Buried depth of emitting borehole";
+  parameter Modelica.Units.SI.Height len2 = 150.0 "Length of receiving borehole";
+  parameter Modelica.Units.SI.Height burDep2 = 4.0 "Buried depth of receiving borehole";
   Real u "Integration variable";
   Real y "Finite line source integrand";
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Examples/GFunction_100boreholes.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Examples/GFunction_100boreholes.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Examples/GFunction_100boreholes.mo"	2022-03-10 09:57:39.680144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Examples/GFunction_100boreholes.mo"	2022-03-10 09:58:16.544149009 +0000
@@ -4,12 +4,12 @@
   extends Modelica.Icons.Example;
 
   parameter Integer nBor = 100 "Number of boreholes";
-  parameter Modelica.SIunits.Position cooBor[nBor, 2] = {{7.5*mod(i-1,10), 7.5*floor((i-1)/10)} for i in 1:nBor}
+  parameter Modelica.Units.SI.Position cooBor[nBor, 2] = {{7.5*mod(i-1,10), 7.5*floor((i-1)/10)} for i in 1:nBor}
     "Coordinates of boreholes";
-  parameter Modelica.SIunits.Height hBor = 150 "Borehole length";
-  parameter Modelica.SIunits.Height dBor = 4 "Borehole buried depth";
-  parameter Modelica.SIunits.Radius rBor = 0.075 "Borehole radius";
-  parameter Modelica.SIunits.ThermalDiffusivity aSoi = 1e-6 "Ground thermal diffusivity used in g-function evaluation";
+  parameter Modelica.Units.SI.Height hBor = 150 "Borehole length";
+  parameter Modelica.Units.SI.Height dBor = 4 "Borehole buried depth";
+  parameter Modelica.Units.SI.Radius rBor = 0.075 "Borehole radius";
+  parameter Modelica.Units.SI.ThermalDiffusivity aSoi = 1e-6 "Ground thermal diffusivity used in g-function evaluation";
   parameter Integer nSeg = 12 "Number of line source segments per borehole";
   parameter Integer nTimSho = 26 "Number of time steps in short time region";
   parameter Integer nTimLon = 50 "Number of time steps in long time region";
@@ -18,68 +18,44 @@
   final parameter Integer nTimTot=nTimSho+nTimLon;
   final parameter Real[nTimTot] gFun(fixed=false);
   final parameter Real[nTimTot] lntts(fixed=false);
-  final parameter Modelica.SIunits.Time[nTimTot] tGFun(fixed=false);
+  final parameter Modelica.Units.SI.Time[nTimTot] tGFun(fixed=false);
   final parameter Real[nTimTot] dspline(fixed=false);
 
   Real gFun_int "Interpolated value of g-function";
   Real lntts_int "Non-dimensional logarithmic time for interpolation";
 
   discrete Integer k "Current interpolation interval";
-  discrete Modelica.SIunits.Time t1 "Previous value of time for interpolation";
-  discrete Modelica.SIunits.Time t2 "Next value of time for interpolation";
+  discrete Modelica.Units.SI.Time t1 "Previous value of time for interpolation";
+  discrete Modelica.Units.SI.Time t2 "Next value of time for interpolation";
   discrete Real gFun1 "Previous g-function value for interpolation";
   discrete Real gFun2 "Next g-function value for interpolation";
-  parameter Modelica.SIunits.Time ts = hBor^2/(9*aSoi) "Bore field characteristic time";
+  parameter Modelica.Units.SI.Time ts = hBor^2/(9*aSoi) "Bore field characteristic time";
 
-initial equation
-  // Evaluate g-function for the specified bore field configuration
-  (tGFun,gFun) =
-    IBPSA.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.ThermalResponseFactors.gFunction(
-                    nBor=nBor,
-                    cooBor=cooBor,
-                    hBor=hBor,
-                    dBor=dBor,
-                    rBor=rBor,
-                    aSoi=aSoi,
-                    nSeg=nSeg,
-                    nTimSho=nTimSho,
-                    nTimLon=nTimLon,
-                    ttsMax=ttsMax);
-  lntts = log(tGFun/ts .+ Modelica.Constants.small);
-  // Initialize parameters for interpolation
-  dspline = IBPSA.Utilities.Math.Functions.splineDerivatives(x=
-    tGFun, y=gFun);
+initial equation
+// Evaluate g-function for the specified bore field configuration
+  (tGFun, gFun) = IBPSA.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.ThermalResponseFactors.gFunction(nBor = nBor, cooBor = cooBor, hBor = hBor, dBor = dBor, rBor = rBor, aSoi = aSoi, nSeg = nSeg, nTimSho = nTimSho, nTimLon = nTimLon, ttsMax = ttsMax);
+  lntts = log(tGFun/ts .+ Modelica.Constants.small);
+// Initialize parameters for interpolation
+  dspline = IBPSA.Utilities.Math.Functions.splineDerivatives(x = tGFun, y = gFun);
   k = 1;
   t1 = tGFun[1];
   t2 = tGFun[2];
   gFun1 = gFun[1];
   gFun2 = gFun[2];
 
-equation
-  // Dimensionless logarithmic time
-  lntts_int = log(IBPSA.Utilities.Math.Functions.smoothMax(
-                    time,
-                    1e-6,
-                    2e-6)/ts);
-  // Interpolate g-function
-  gFun_int =
-    IBPSA.Utilities.Math.Functions.cubicHermiteLinearExtrapolation(
-                    x=time,
-                    x1=t1,
-                    x2=t2,
-                    y1=gFun1,
-                    y2=gFun2,
-                    y1d=dspline[pre(k)],
-                    y2d=dspline[pre(k) + 1]);
-  // Update interpolation parameters, when needed
-  when time >= pre(t2) then
-    k = min(pre(k) + 1, nTimTot);
-    t1 = tGFun[k];
-    t2 = tGFun[k+1];
-    gFun1 = gFun[k];
-    gFun2 = gFun[k+1];
+equation
+// Dimensionless logarithmic time
+  lntts_int = log(IBPSA.Utilities.Math.Functions.smoothMax(time, 1e-6, 2e-6) / ts);
+// Interpolate g-function
+  gFun_int = IBPSA.Utilities.Math.Functions.cubicHermiteLinearExtrapolation(x = time, x1 = t1, x2 = t2, y1 = gFun1, y2 = gFun2, y1d = dspline[pre(k)], y2d = dspline[pre(k) + 1]);
+// Update interpolation parameters, when needed
+  when time >= pre(t2) then
+    k = min(pre(k) + 1, nTimTot);
+    t1 = tGFun[k];
+    t2 = tGFun[k + 1];
+    gFun1 = gFun[k];
+    gFun2 = gFun[k + 1];
   end when;
-
    annotation(experiment(Tolerance=1e-6, StopTime=3.7e11),
 __Dymola_Commands(file="modelica://BuildSysPro/Resources/IBPSA/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Examples/GFunction_100boreholes.mos"
         "Simulate and plot"),
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Examples/GFunction_SmallScaleValidation.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Examples/GFunction_SmallScaleValidation.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Examples/GFunction_SmallScaleValidation.mo"	2022-03-10 09:57:39.680144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Examples/GFunction_SmallScaleValidation.mo"	2022-03-10 09:58:16.532149008 +0000
@@ -7,12 +7,12 @@
     IBPSA.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.Validation.BaseClasses.SmallScale_Borefield
     borFieDat "Record of borehole configuration data";
   parameter Integer nBor = borFieDat.conDat.nBor "Number of boreholes";
-  parameter Modelica.SIunits.Position cooBor[nBor, 2] = borFieDat.conDat.cooBor
+  parameter Modelica.Units.SI.Position cooBor[nBor, 2] = borFieDat.conDat.cooBor
     "Coordinates of boreholes";
-  parameter Modelica.SIunits.Height hBor = borFieDat.conDat.hBor "Borehole length";
-  parameter Modelica.SIunits.Height dBor = borFieDat.conDat.dBor "Borehole buried depth";
-  parameter Modelica.SIunits.Radius rBor = borFieDat.conDat.rBor "Borehole radius";
-  parameter Modelica.SIunits.ThermalDiffusivity aSoi = borFieDat.soiDat.kSoi/(borFieDat.soiDat.dSoi*borFieDat.soiDat.cSoi)
+  parameter Modelica.Units.SI.Height hBor = borFieDat.conDat.hBor "Borehole length";
+  parameter Modelica.Units.SI.Height dBor = borFieDat.conDat.dBor "Borehole buried depth";
+  parameter Modelica.Units.SI.Radius rBor = borFieDat.conDat.rBor "Borehole radius";
+  parameter Modelica.Units.SI.ThermalDiffusivity aSoi = borFieDat.soiDat.kSoi/(borFieDat.soiDat.dSoi*borFieDat.soiDat.cSoi)
     "Ground thermal diffusivity used in g-function evaluation";
   parameter Integer nSeg = 12 "Number of line source segments per borehole";
   parameter Integer nTimSho = 26 "Number of time steps in short time region";
@@ -22,68 +22,44 @@
   final parameter Integer nTimTot=nTimSho+nTimLon;
   final parameter Real[nTimTot] gFun(fixed=false);
   final parameter Real[nTimTot] lntts(fixed=false);
-  final parameter Modelica.SIunits.Time[nTimTot] tGFun(fixed=false);
+  final parameter Modelica.Units.SI.Time[nTimTot] tGFun(fixed=false);
   final parameter Real[nTimTot] dspline(fixed=false);
 
   Real gFun_int "Interpolated value of g-function";
   Real lntts_int "Non-dimensional logarithmic time for interpolation";
 
   discrete Integer k "Current interpolation interval";
-  discrete Modelica.SIunits.Time t1 "Previous value of time for interpolation";
-  discrete Modelica.SIunits.Time t2 "Next value of time for interpolation";
+  discrete Modelica.Units.SI.Time t1 "Previous value of time for interpolation";
+  discrete Modelica.Units.SI.Time t2 "Next value of time for interpolation";
   discrete Real gFun1 "Previous g-function value for interpolation";
   discrete Real gFun2 "Next g-function value for interpolation";
-  parameter Modelica.SIunits.Time ts = hBor^2/(9*aSoi) "Bore field characteristic time";
+  parameter Modelica.Units.SI.Time ts = hBor^2/(9*aSoi) "Bore field characteristic time";
 
-initial equation
-  // Evaluate g-function for the specified bore field configuration
-  (tGFun,gFun) =
-    IBPSA.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.ThermalResponseFactors.gFunction(
-                    nBor=nBor,
-                    cooBor=cooBor,
-                    hBor=hBor,
-                    dBor=dBor,
-                    rBor=rBor,
-                    aSoi=aSoi,
-                    nSeg=nSeg,
-                    nTimSho=nTimSho,
-                    nTimLon=nTimLon,
-                    ttsMax=ttsMax);
-  lntts = log(tGFun/ts .+ Modelica.Constants.small);
-  // Initialize parameters for interpolation
-  dspline = IBPSA.Utilities.Math.Functions.splineDerivatives(x=
-    tGFun, y=gFun);
+initial equation
+// Evaluate g-function for the specified bore field configuration
+  (tGFun, gFun) = IBPSA.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.ThermalResponseFactors.gFunction(nBor = nBor, cooBor = cooBor, hBor = hBor, dBor = dBor, rBor = rBor, aSoi = aSoi, nSeg = nSeg, nTimSho = nTimSho, nTimLon = nTimLon, ttsMax = ttsMax);
+  lntts = log(tGFun/ts .+ Modelica.Constants.small);
+// Initialize parameters for interpolation
+  dspline = IBPSA.Utilities.Math.Functions.splineDerivatives(x = tGFun, y = gFun);
   k = 1;
   t1 = tGFun[1];
   t2 = tGFun[2];
   gFun1 = gFun[1];
   gFun2 = gFun[2];
 
-equation
-  // Dimensionless logarithmic time
-  lntts_int = log(IBPSA.Utilities.Math.Functions.smoothMax(
-                    time,
-                    1e-6,
-                    2e-6)/ts);
-  // Interpolate g-function
-  gFun_int =
-    IBPSA.Utilities.Math.Functions.cubicHermiteLinearExtrapolation(
-                    x=time,
-                    x1=t1,
-                    x2=t2,
-                    y1=gFun1,
-                    y2=gFun2,
-                    y1d=dspline[pre(k)],
-                    y2d=dspline[pre(k) + 1]);
-  // Update interpolation parameters, when needed
-  when time >= pre(t2) then
-    k = min(pre(k) + 1, nTimTot);
-    t1 = tGFun[k];
-    t2 = tGFun[k+1];
-    gFun1 = gFun[k];
-    gFun2 = gFun[k+1];
+equation
+// Dimensionless logarithmic time
+  lntts_int = log(IBPSA.Utilities.Math.Functions.smoothMax(time, 1e-6, 2e-6) / ts);
+// Interpolate g-function
+  gFun_int = IBPSA.Utilities.Math.Functions.cubicHermiteLinearExtrapolation(x = time, x1 = t1, x2 = t2, y1 = gFun1, y2 = gFun2, y1d = dspline[pre(k)], y2d = dspline[pre(k) + 1]);
+// Update interpolation parameters, when needed
+  when time >= pre(t2) then
+    k = min(pre(k) + 1, nTimTot);
+    t1 = tGFun[k];
+    t2 = tGFun[k + 1];
+    gFun1 = gFun[k];
+    gFun2 = gFun[k + 1];
   end when;
-
    annotation(experiment(Tolerance=1e-6, StopTime=1.8e+12),
 __Dymola_Commands(file="modelica://BuildSysPro/Resources/IBPSA/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Examples/GFunction_SmallScaleValidation.mos"
         "Simulate and plot"),
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Examples/InfiniteLineSource.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Examples/InfiniteLineSource.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Examples/InfiniteLineSource.mo"	2022-03-10 09:57:39.680144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Examples/InfiniteLineSource.mo"	2022-03-10 09:58:16.516149007 +0000
@@ -2,11 +2,11 @@
 model InfiniteLineSource "Test case for infinite line source"
   extends Modelica.Icons.Example;
 
-  parameter Modelica.SIunits.ThermalDiffusivity aSoi = 1.0e-6 "Ground thermal diffusivity";
-  parameter Modelica.SIunits.Radius rSource = 0.075 "Minimum radius";
-  parameter Modelica.SIunits.Radius[5] r = {rSource, 2*rSource, 5*rSource, 10*rSource, 20*rSource}
+  parameter Modelica.Units.SI.ThermalDiffusivity aSoi = 1.0e-6 "Ground thermal diffusivity";
+  parameter Modelica.Units.SI.Radius rSource = 0.075 "Minimum radius";
+  parameter Modelica.Units.SI.Radius[5] r = {rSource, 2*rSource, 5*rSource, 10*rSource, 20*rSource}
     "Radial position of evaluation of the solution";
-  Modelica.SIunits.Time t "Time";
+  Modelica.Units.SI.Time t "Time";
   Real[5] E "Infinite line source solution";
 
 equation
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Examples/ShaGFunction.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Examples/ShaGFunction.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Examples/ShaGFunction.mo"	2022-03-10 09:57:39.680144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Examples/ShaGFunction.mo"	2022-03-10 09:58:16.512149005 +0000
@@ -3,7 +3,8 @@
   "Verifies the SHA-1 encryption of a single borehole"
   extends Modelica.Icons.Example;
 
-  //Input
+
+//Input
   parameter String strIn=
     IBPSA.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.ThermalResponseFactors.shaGFunction(
     1,
@@ -17,14 +18,13 @@
     50,
     exp(5)) "SHA1-encrypted g-function inputs";
 
-  //Expected output (SHA1-encryption of '1.000e+0000.000e+0000.000e+0001.500e+0024.000e+0007.500e-0021.000e-0061.200e+0012.600e+0015.000e+0011.484e+002')
+//Expected output (SHA1-encryption of '1.000e+0000.000e+0000.000e+0001.500e+0024.000e+0007.500e-0021.000e-0061.200e+0012.600e+0015.000e+0011.484e+002')
   parameter String strEx=
     "5d0475f93c93232dfe2452bb34acabd6b9fd28e5"
     "Expected string output";
 
-  //Comparison result
+//Comparison result
   Boolean cmp "Comparison result";
-
 equation
   cmp = Modelica.Utilities.Strings.isEqual(strIn,strEx,false);
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Examples/TimeGeometric.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Examples/TimeGeometric.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Examples/TimeGeometric.mo"	2022-03-10 09:57:39.680144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/Examples/TimeGeometric.mo"	2022-03-10 09:58:16.504149005 +0000
@@ -3,12 +3,12 @@
   "Test case for geometric expansion of time vector"
   extends Modelica.Icons.Example;
 
-  parameter Modelica.SIunits.Duration dt = 2.0 "Minimum time step";
-  parameter Modelica.SIunits.Time t_max = 20.0 "Maximum value of time";
+  parameter Modelica.Units.SI.Duration dt = 2.0 "Minimum time step";
+  parameter Modelica.Units.SI.Time t_max = 20.0 "Maximum value of time";
   parameter Integer nTim = 5 "Number of time values";
 
-  final parameter Modelica.SIunits.Time[nTim] t(fixed=false) "Time vector";
 
+  final parameter Modelica.Units.SI.Time[nTim] t(fixed=false) "Time vector";
 initial equation
   t =
     IBPSA.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.ThermalResponseFactors.timeGeometric(
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/cylindricalHeatSource.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/cylindricalHeatSource.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/cylindricalHeatSource.mo"	2022-03-10 09:57:39.680144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/cylindricalHeatSource.mo"	2022-03-10 09:58:16.484149003 +0000
@@ -3,10 +3,10 @@
   "Cylindrical heat source solution from Carslaw and Jaeger"
   extends Modelica.Icons.Function;
 
-  input Modelica.SIunits.Time t "Time";
-  input Modelica.SIunits.ThermalDiffusivity aSoi "Ground thermal diffusivity";
-  input Modelica.SIunits.Distance dis "Radial distance between borehole axes";
-  input Modelica.SIunits.Radius rBor "Radius of emitting borehole";
+  input Modelica.Units.SI.Time t "Time";
+  input Modelica.Units.SI.ThermalDiffusivity aSoi "Ground thermal diffusivity";
+  input Modelica.Units.SI.Distance dis "Radial distance between borehole axes";
+  input Modelica.Units.SI.Radius rBor "Radius of emitting borehole";
 
   output Real G "Thermal response factor of borehole 1 on borehole 2";
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/finiteLineSource.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/finiteLineSource.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/finiteLineSource.mo"	2022-03-10 09:57:39.680144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/finiteLineSource.mo"	2022-03-10 09:58:16.460148999 +0000
@@ -1,87 +1,55 @@
-within BuildSysPro.IBPSA.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.ThermalResponseFactors;
-function finiteLineSource
-  "Finite line source solution of Claesson and Javed"
-  extends Modelica.Icons.Function;
-
-  input Modelica.SIunits.Time t "Time";
-  input Modelica.SIunits.ThermalDiffusivity aSoi "Ground thermal diffusivity";
-  input Modelica.SIunits.Distance dis "Radial distance between borehole axes";
-  input Modelica.SIunits.Height len1 "Length of emitting borehole";
-  input Modelica.SIunits.Height burDep1 "Buried depth of emitting borehole";
-  input Modelica.SIunits.Height len2 "Length of receiving borehole";
-  input Modelica.SIunits.Height burDep2 "Buried depth of receiving borehole";
-  input Boolean includeRealSource = true "True if contribution of real source is included";
-  input Boolean includeMirrorSource = true "True if contribution of mirror source is included";
-
-  output Real h_21 "Thermal response factor of borehole 1 on borehole 2";
-
-protected
-  Real lowBou(unit="m-1") "Lower bound of integration";
-  // Upper bound is infinite
-  Real uppBou(unit="m-1") = 100.0 "Upper bound of integration";
-  Modelica.SIunits.Distance disMin
-    "Minimum distance between sources and receiving line";
-  Modelica.SIunits.Time timTre "Time treshold for evaluation of the solution";
-
-algorithm
-
-  h_21 := 0;
-  if t > 0 and (includeRealSource or includeMirrorSource) then
-    // Find the minimum distance between the line source and the line where the
-    // finite line source solution is evaluated.
-    if includeRealSource then
-      if (burDep2 + len2) < burDep1 then
-        disMin := sqrt(dis^2 + (burDep1 - burDep2 - len2)^2);
-      elseif burDep2 > (burDep1 + len1) then
-        disMin := sqrt(dis^2 + (burDep1 - burDep2 + len1)^2);
-      else
-        disMin := dis;
-      end if;
-    else
-      disMin := sqrt(dis^2 + (burDep1 + burDep2)^2);
-    end if;
-    // The traveled distance of the temperature front is assumed to be:
-    // d = 5*sqrt(aSoi*t).
-    // The solution is only evaluated at times when the traveled distance is
-    // greater than the minimum distance.
-    timTre := disMin^2/(25*aSoi);
-
-    if t >= timTre then
-      lowBou := 1.0/sqrt(4*aSoi*t);
-      h_21 := Modelica.Math.Nonlinear.quadratureLobatto(
-                      function
-          IBPSA.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.ThermalResponseFactors.finiteLineSource_Integrand(
-                        dis=dis,
-                        len1=len1,
-                        burDep1=burDep1,
-                        len2=len2,
-                        burDep2=burDep2,
-                        includeRealSource=includeRealSource,
-                        includeMirrorSource=includeMirrorSource),
-                      lowBou,
-                      uppBou,
-                      1.0e-6);
-    else
-      // Linearize the solution at times below the time treshold.
-      lowBou := 1.0/sqrt(4*aSoi*timTre);
-      h_21 := t/timTre*Modelica.Math.Nonlinear.quadratureLobatto(
-                      function
-          IBPSA.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.ThermalResponseFactors.finiteLineSource_Integrand(
-                        dis=dis,
-                        len1=len1,
-                        burDep1=burDep1,
-                        len2=len2,
-                        burDep2=burDep2,
-                        includeRealSource=includeRealSource,
-                        includeMirrorSource=includeMirrorSource),
-                      lowBou,
-                      uppBou,
-                      1.0e-6);
-    end if;
-  end if;
-
-annotation (
-Documentation(info="
+within BuildSysPro.IBPSA.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.ThermalResponseFactors;
+
+function finiteLineSource "Finite line source solution of Claesson and Javed"
+  extends Modelica.Icons.Function;
+  input Modelica.Units.SI.Time t "Time";
+  input Modelica.Units.SI.ThermalDiffusivity aSoi "Ground thermal diffusivity";
+  input Modelica.Units.SI.Distance dis "Radial distance between borehole axes";
+  input Modelica.Units.SI.Height len1 "Length of emitting borehole";
+  input Modelica.Units.SI.Height burDep1 "Buried depth of emitting borehole";
+  input Modelica.Units.SI.Height len2 "Length of receiving borehole";
+  input Modelica.Units.SI.Height burDep2 "Buried depth of receiving borehole";
+  input Boolean includeRealSource = true "True if contribution of real source is included";
+  input Boolean includeMirrorSource = true "True if contribution of mirror source is included";
+  output Real h_21 "Thermal response factor of borehole 1 on borehole 2";
+protected
+  Real lowBou(unit = "m-1") "Lower bound of integration";
+  // Upper bound is infinite
+  Real uppBou(unit = "m-1") = 100.0 "Upper bound of integration";
+  Modelica.Units.SI.Distance disMin "Minimum distance between sources and receiving line";
+  Modelica.Units.SI.Time timTre "Time treshold for evaluation of the solution";
+algorithm
+  h_21 := 0;
+  if t > 0 and (includeRealSource or includeMirrorSource) then
+    if includeRealSource then
+      if burDep2 + len2 < burDep1 then
+        disMin := sqrt(dis ^ 2 + (burDep1 - burDep2 - len2) ^ 2);
+      elseif burDep2 > burDep1 + len1 then
+        disMin := sqrt(dis ^ 2 + (burDep1 - burDep2 + len1) ^ 2);
+      else
+        disMin := dis;
+      end if;
+    else
+      disMin := sqrt(dis ^ 2 + (burDep1 + burDep2) ^ 2);
+    end if;
+    timTre := disMin ^ 2 / (25 * aSoi);
+    if t >= timTre then
+      lowBou := 1.0 / sqrt(4 * aSoi * t);
+      h_21 := Modelica.Math.Nonlinear.quadratureLobatto(function IBPSA.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.ThermalResponseFactors.finiteLineSource_Integrand(dis = dis, len1 = len1, burDep1 = burDep1, len2 = len2, burDep2 = burDep2, includeRealSource = includeRealSource, includeMirrorSource = includeMirrorSource), lowBou, uppBou, 1.0e-6);
+    else
+      lowBou := 1.0 / sqrt(4 * aSoi * timTre);
+      h_21 := t / timTre * Modelica.Math.Nonlinear.quadratureLobatto(function IBPSA.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.ThermalResponseFactors.finiteLineSource_Integrand(dis = dis, len1 = len1, burDep1 = burDep1, len2 = len2, burDep2 = burDep2, includeRealSource = includeRealSource, includeMirrorSource = includeMirrorSource), lowBou, uppBou, 1.0e-6);
+    end if;
+  end if;
+// Find the minimum distance between the line source and the line where the
+// finite line source solution is evaluated.
+// The traveled distance of the temperature front is assumed to be:
+// d = 5*sqrt(aSoi*t).
+// The solution is only evaluated at times when the traveled distance is
+// greater than the minimum distance.
+// Linearize the solution at times below the time treshold.
+  annotation(
+    Documentation(info = "
 
    
 This function evaluates the finite line source solution. This solution
 gives the relation between the constant heat transfer rate (per unit length)
@@ -115,12 +83,12 @@
 The integral is solved numerically, with the integrand defined in
 IBPSA.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.ThermalResponseFactors.finiteLineSource_Integrand.
 
    
-", revisions="
+", revisions = "
 
      
 
    • 
 March 22, 2018 by Massimo Cimmino:
      
 First implementation.
 
      • 
 
    
-"));
-end finiteLineSource;
+"));
+end finiteLineSource;
\ No newline at end of file
Only in converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors: finiteLineSource.mo.after
Only in converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors: finiteLineSource.mo.before
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/finiteLineSource_Integrand.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/finiteLineSource_Integrand.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/finiteLineSource_Integrand.mo"	2022-03-10 09:57:39.680144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/finiteLineSource_Integrand.mo"	2022-03-10 09:58:16.424148994 +0000
@@ -4,11 +4,11 @@
   extends Modelica.Icons.Function;
 
   input Real u(unit="1/m") "Integration variable";
-  input Modelica.SIunits.Distance dis "Radial distance between borehole axes";
-  input Modelica.SIunits.Height len1 "Length of emitting borehole";
-  input Modelica.SIunits.Height burDep1 "Buried depth of emitting borehole";
-  input Modelica.SIunits.Height len2 "Length of receiving borehole";
-  input Modelica.SIunits.Height burDep2 "Buried depth of receiving borehole";
+  input Modelica.Units.SI.Distance dis "Radial distance between borehole axes";
+  input Modelica.Units.SI.Height len1 "Length of emitting borehole";
+  input Modelica.Units.SI.Height burDep1 "Buried depth of emitting borehole";
+  input Modelica.Units.SI.Height len2 "Length of receiving borehole";
+  input Modelica.Units.SI.Height burDep2 "Buried depth of receiving borehole";
   input Boolean includeRealSource = true "true if contribution of real source is included";
   input Boolean includeMirrorSource = true "true if contribution of mirror source is included";
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/gFunction.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/gFunction.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/gFunction.mo"	2022-03-10 09:57:39.680144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/gFunction.mo"	2022-03-10 09:58:16.412148993 +0000
@@ -3,34 +3,34 @@
   extends Modelica.Icons.Function;
 
   input Integer nBor "Number of boreholes";
-  input Modelica.SIunits.Position cooBor[nBor, 2] "Coordinates of boreholes";
-  input Modelica.SIunits.Height hBor "Borehole length";
-  input Modelica.SIunits.Height dBor "Borehole buried depth";
-  input Modelica.SIunits.Radius rBor "Borehole radius";
-  input Modelica.SIunits.ThermalDiffusivity aSoi "Ground thermal diffusivity used in g-function evaluation";
+  input Modelica.Units.SI.Position cooBor[nBor, 2] "Coordinates of boreholes";
+  input Modelica.Units.SI.Height hBor "Borehole length";
+  input Modelica.Units.SI.Height dBor "Borehole buried depth";
+  input Modelica.Units.SI.Radius rBor "Borehole radius";
+  input Modelica.Units.SI.ThermalDiffusivity aSoi "Ground thermal diffusivity used in g-function evaluation";
   input Integer nSeg "Number of line source segments per borehole";
   input Integer nTimSho "Number of time steps in short time region";
   input Integer nTimLon "Number of time steps in long time region";
   input Real ttsMax "Maximum adimensional time for gfunc calculation";
   input Real relTol = 0.02 "Relative tolerance on distance between boreholes";
 
-  output Modelica.SIunits.Time tGFun[nTimSho+nTimLon] "Time of g-function evaluation";
+  output Modelica.Units.SI.Time tGFun[nTimSho+nTimLon] "Time of g-function evaluation";
   output Real g[nTimSho+nTimLon] "g-function";
 
 protected
-  Modelica.SIunits.Time ts = hBor^2/(9*aSoi) "Characteristic time";
-  Modelica.SIunits.Time tSho_min = 1 "Minimum time for short time calculations";
-  Modelica.SIunits.Time tSho_max = 3600 "Maximum time for short time calculations";
-  Modelica.SIunits.Time tLon_min = tSho_max "Minimum time for long time calculations";
-  Modelica.SIunits.Time tLon_max = ts*ttsMax "Maximum time for long time calculations";
-  Modelica.SIunits.Time tSho[nTimSho] "Time vector for short time calculations";
-  Modelica.SIunits.Time tLon[nTimLon] "Time vector for long time calculations";
-  Modelica.SIunits.Distance dis "Separation distance between boreholes";
-  Modelica.SIunits.Distance dis_mn "Separation distance for comparison";
-  Modelica.SIunits.Radius rLin=0.0005*hBor "Radius for evaluation of same-borehole line source solutions";
+  Modelica.Units.SI.Time ts = hBor^2/(9*aSoi) "Characteristic time";
+  Modelica.Units.SI.Time tSho_min = 1 "Minimum time for short time calculations";
+  Modelica.Units.SI.Time tSho_max = 3600 "Maximum time for short time calculations";
+  Modelica.Units.SI.Time tLon_min = tSho_max "Minimum time for long time calculations";
+  Modelica.Units.SI.Time tLon_max = ts*ttsMax "Maximum time for long time calculations";
+  Modelica.Units.SI.Time tSho[nTimSho] "Time vector for short time calculations";
+  Modelica.Units.SI.Time tLon[nTimLon] "Time vector for long time calculations";
+  Modelica.Units.SI.Distance dis "Separation distance between boreholes";
+  Modelica.Units.SI.Distance dis_mn "Separation distance for comparison";
+  Modelica.Units.SI.Radius rLin=0.0005*hBor "Radius for evaluation of same-borehole line source solutions";
   Real hSegRea[nSeg] "Real part of the FLS solution";
   Real hSegMir[2*nSeg-1] "Mirror part of the FLS solution";
-  Modelica.SIunits.Height dSeg "Buried depth of borehole segment";
+  Modelica.Units.SI.Height dSeg "Buried depth of borehole segment";
   Integer Done[nBor, nBor] "Matrix for tracking of FLS evaluations";
   Real A[nSeg*nBor+1, nSeg*nBor+1] "Coefficient matrix for system of equations";
   Real B[nSeg*nBor+1] "Coefficient vector for system of equations";
@@ -39,156 +39,105 @@
   Real ILS "Infinite line source solution";
   Real CHS "Cylindrical heat source solution";
 
-algorithm
-  // Generate geometrically expanding time vectors
-  tSho :=
-    IBPSA.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.ThermalResponseFactors.timeGeometric(
-                  tSho_min,
-                  tSho_max,
-                  nTimSho);
+algorithm
+// Generate geometrically expanding time vectors
+  tSho := IBPSA.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.ThermalResponseFactors.timeGeometric(tSho_min, tSho_max, nTimSho);
   tLon :=
     IBPSA.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.ThermalResponseFactors.timeGeometric(
                   tLon_min,
                   tLon_max,
-                  nTimLon);
-  // Concatenate the short- and long-term parts
-  tGFun := cat(1, {0}, tSho[1:nTimSho - 1], tLon);
-
-  // -----------------------
-  // Short time calculations
-  // -----------------------
-  g[1] := 0.;
-  for k in 1:nTimSho loop
-    // Finite line source solution
-    FLS :=
-      IBPSA.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.ThermalResponseFactors.finiteLineSource(
-                    tSho[k],
-                    aSoi,
-                    rLin,
-                    hBor,
-                    dBor,
-                    hBor,
-                    dBor);
-    // Infinite line source solution
-    ILS := 0.5*
-      IBPSA.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.ThermalResponseFactors.infiniteLineSource(
-                    tSho[k],
-                    aSoi,
-                    rLin);
-    // Cylindrical heat source solution
-    CHS := 2*Modelica.Constants.pi*
-      IBPSA.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.ThermalResponseFactors.cylindricalHeatSource(
-                    tSho[k],
-                    aSoi,
-                    rBor,
-                    rBor);
-    // Correct finite line source solution for cylindrical geometry
-    g[k+1] := FLS + (CHS - ILS);
-  end for;
-
-  // ----------------------
-  // Long time calculations
-  // ----------------------
-  // Initialize coefficient matrix A
-  for m in 1:nBor loop
-    for u in 1:nSeg loop
-      // Tb coefficient in spatial superposition equations
-      A[(m-1)*nSeg+u,nBor*nSeg+1] := -1;
-      // Q coefficient in heat balance equation
-      A[nBor*nSeg+1,(m-1)*nSeg+u] := 1;
-    end for;
-  end for;
-  // Initialize coefficient vector B
-  // The total heat extraction rate is constant
-  B[nBor*nSeg+1] := nBor*nSeg;
-
-  // Evaluate thermal response matrix at all times
-  for k in 1:nTimLon-1 loop
-    for i in 1:nBor loop
-      for j in i:nBor loop
-        // Distance between boreholes
-        if i == j then
-          // If same borehole, distance is the radius
-          dis := rLin;
-        else
-          dis := sqrt((cooBor[i,1] - cooBor[j,1])^2 + (cooBor[i,2] - cooBor[j,2])^2);
-        end if;
-        // Only evaluate the thermal response factors if not already evaluated
-        if Done[i,j] < k then
-          // Evaluate Real and Mirror parts of FLS solution
-          // Real part
-          for m in 1:nSeg loop
-            hSegRea[m] :=
-              IBPSA.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.ThermalResponseFactors.finiteLineSource(
-                            tLon[k + 1],
-                            aSoi,
-                            dis,
-                            hBor/nSeg,
-                            dBor,
-                            hBor/nSeg,
-                            dBor + (m - 1)*hBor/nSeg,
-                            includeMirrorSource=false);
-          end for;
-        // Mirror part
-          for m in 1:(2*nSeg-1) loop
-            hSegMir[m] :=
-              IBPSA.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.ThermalResponseFactors.finiteLineSource(
-                            tLon[k + 1],
-                            aSoi,
-                            dis,
-                            hBor/nSeg,
-                            dBor,
-                            hBor/nSeg,
-                            dBor + (m - 1)*hBor/nSeg,
-                            includeRealSource=false);
-          end for;
-        // Apply to all pairs that have the same separation distance
-          for m in 1:nBor loop
-            for n in m:nBor loop
-              if m == n then
-                dis_mn := rLin;
-              else
-                dis_mn := sqrt((cooBor[m,1] - cooBor[n,1])^2 + (cooBor[m,2] - cooBor[n,2])^2);
-              end if;
-              if abs(dis_mn - dis) < relTol*dis then
-                // Add thermal response factor to coefficient matrix A
-                for u in 1:nSeg loop
-                  for v in 1:nSeg loop
-                    A[(m-1)*nSeg+u,(n-1)*nSeg+v] := hSegRea[abs(u-v)+1] + hSegMir[u+v-1];
-                    A[(n-1)*nSeg+v,(m-1)*nSeg+u] := hSegRea[abs(u-v)+1] + hSegMir[u+v-1];
-                  end for;
-                end for;
-                // Mark current pair as evaluated
-                Done[m,n] := k;
-                Done[n,m] := k;
-              end if;
-            end for;
-          end for;
-        end if;
-      end for;
-    end for;
-    // Solve the system of equations
-    X := Modelica.Math.Matrices.solve(A,B);
-    // The g-function is equal to the borehole wall temperature
-    g[nTimSho+k+1] := X[nBor*nSeg+1];
-  end for;
-  // Correct finite line source solution for cylindrical geometry
-  for k in 2:nTimLon loop
-    // Infinite line source
-    ILS := 0.5*
-      IBPSA.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.ThermalResponseFactors.infiniteLineSource(
-                    tLon[k],
-                    aSoi,
-                    rLin);
-    // Cylindrical heat source
-    CHS := 2*Modelica.Constants.pi*
-      IBPSA.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.ThermalResponseFactors.cylindricalHeatSource(
-                    tLon[k],
-                    aSoi,
-                    rBor,
-                    rBor);
-    g[nTimSho+k] := g[nTimSho+k] + (CHS - ILS);
+                  nTimLon);
+// Concatenate the short- and long-term parts
+  tGFun := cat(1, {0}, tSho[1:nTimSho - 1], tLon);
+// -----------------------
+// Short time calculations
+// -----------------------
+  g[1] := 0.;
+  for k in 1:nTimSho loop
+    FLS := IBPSA.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.ThermalResponseFactors.finiteLineSource(tSho[k], aSoi, rLin, hBor, dBor, hBor, dBor);
+    ILS := 0.5 * IBPSA.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.ThermalResponseFactors.infiniteLineSource(tSho[k], aSoi, rLin);
+    CHS := 2 * Modelica.Constants.pi * IBPSA.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.ThermalResponseFactors.cylindricalHeatSource(tSho[k], aSoi, rBor, rBor);
+    g[k + 1] := FLS + CHS - ILS;
+  end for;
+// Finite line source solution
+// Infinite line source solution
+// Cylindrical heat source solution
+// Correct finite line source solution for cylindrical geometry
+// ----------------------
+// Long time calculations
+// ----------------------
+// Initialize coefficient matrix A
+  for m in 1:nBor loop
+    for u in 1:nSeg loop
+      A[(m - 1) * nSeg + u, nBor * nSeg + 1] := -1;
+      A[nBor * nSeg + 1, (m - 1) * nSeg + u] := 1;
+    end for;
+  end for;
+// Tb coefficient in spatial superposition equations
+// Q coefficient in heat balance equation
+// Initialize coefficient vector B
+// The total heat extraction rate is constant
+  B[nBor * nSeg + 1] := nBor * nSeg;
+// Evaluate thermal response matrix at all times
+  for k in 1:nTimLon - 1 loop
+    for i in 1:nBor loop
+      for j in i:nBor loop
+        if i == j then
+          dis := rLin;
+        else
+          dis := sqrt((cooBor[i, 1] - cooBor[j, 1]) ^ 2 + (cooBor[i, 2] - cooBor[j, 2]) ^ 2);
+        end if;
+        if Done[i, j] < k then
+          for m in 1:nSeg loop
+            hSegRea[m] := IBPSA.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.ThermalResponseFactors.finiteLineSource(tLon[k + 1], aSoi, dis, hBor / nSeg, dBor, hBor / nSeg, dBor + (m - 1) * hBor / nSeg, includeMirrorSource = false);
+          end for;
+          for m in 1:2 * nSeg - 1 loop
+            hSegMir[m] := IBPSA.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.ThermalResponseFactors.finiteLineSource(tLon[k + 1], aSoi, dis, hBor / nSeg, dBor, hBor / nSeg, dBor + (m - 1) * hBor / nSeg, includeRealSource = false);
+          end for;
+          for m in 1:nBor loop
+            for n in m:nBor loop
+              if m == n then
+                dis_mn := rLin;
+              else
+                dis_mn := sqrt((cooBor[m, 1] - cooBor[n, 1]) ^ 2 + (cooBor[m, 2] - cooBor[n, 2]) ^ 2);
+              end if;
+              if abs(dis_mn - dis) < relTol * dis then
+                for u in 1:nSeg loop
+                  for v in 1:nSeg loop
+                    A[(m - 1) * nSeg + u, (n - 1) * nSeg + v] := hSegRea[abs(u - v) + 1] + hSegMir[u + v - 1];
+                    A[(n - 1) * nSeg + v, (m - 1) * nSeg + u] := hSegRea[abs(u - v) + 1] + hSegMir[u + v - 1];
+                  end for;
+                end for;
+                Done[m, n] := k;
+                Done[n, m] := k;
+              end if;
+            end for;
+          end for;
+        end if;
+      end for;
+    end for;
+    X := Modelica.Math.Matrices.solve(A, B);
+    g[nTimSho + k + 1] := X[nBor * nSeg + 1];
+  end for;
+// Distance between boreholes
+// If same borehole, distance is the radius
+// Only evaluate the thermal response factors if not already evaluated
+// Evaluate Real and Mirror parts of FLS solution
+// Real part
+// Mirror part
+// Apply to all pairs that have the same separation distance
+// Add thermal response factor to coefficient matrix A
+// Mark current pair as evaluated
+// Solve the system of equations
+// The g-function is equal to the borehole wall temperature
+// Correct finite line source solution for cylindrical geometry
+  for k in 2:nTimLon loop
+    ILS := 0.5 * IBPSA.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.ThermalResponseFactors.infiniteLineSource(tLon[k], aSoi, rLin);
+    CHS := 2 * Modelica.Constants.pi * IBPSA.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.ThermalResponseFactors.cylindricalHeatSource(tLon[k], aSoi, rBor, rBor);
+    g[nTimSho + k] := g[nTimSho + k] + CHS - ILS;
   end for;
+// Infinite line source
+// Cylindrical heat source
 
 annotation (
 Documentation(info="
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/shaGFunction.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/shaGFunction.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/shaGFunction.mo"	2022-03-10 09:57:39.680144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/shaGFunction.mo"	2022-03-10 09:58:16.360148986 +0000
@@ -3,11 +3,11 @@
   "Returns a SHA1 encryption of the formatted arguments for the g-function generation"
   extends Modelica.Icons.Function;
   input Integer nBor "Number of boreholes";
-  input Modelica.SIunits.Position cooBor[nBor, 2] "Coordinates of boreholes";
-  input Modelica.SIunits.Height hBor "Borehole length";
-  input Modelica.SIunits.Height dBor "Borehole buried depth";
-  input Modelica.SIunits.Radius rBor "Borehole radius";
-  input Modelica.SIunits.ThermalDiffusivity aSoi "Ground thermal diffusivity used in g-function evaluation";
+  input Modelica.Units.SI.Position cooBor[nBor, 2] "Coordinates of boreholes";
+  input Modelica.Units.SI.Height hBor "Borehole length";
+  input Modelica.Units.SI.Height dBor "Borehole buried depth";
+  input Modelica.Units.SI.Radius rBor "Borehole radius";
+  input Modelica.Units.SI.ThermalDiffusivity aSoi "Ground thermal diffusivity used in g-function evaluation";
   input Integer nSeg "Number of line source segments per borehole";
   input Integer nTimSho "Number of time steps in short time region";
   input Integer nTimLon "Number of time steps in long time region";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/timeGeometric.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/timeGeometric.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/timeGeometric.mo"	2022-03-10 09:57:39.680144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/timeGeometric.mo"	2022-03-10 09:58:16.348148985 +0000
@@ -1,42 +1,37 @@
-within BuildSysPro.IBPSA.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.ThermalResponseFactors;
-function timeGeometric "Geometric expansion of time steps"
-  extends Modelica.Icons.Function;
-
-  input Modelica.SIunits.Duration dt "Minimum time step";
-  input Modelica.SIunits.Time t_max "Maximum value of time";
-  input Integer nTim "Number of time values";
-
-  output Real t[nTim] "Time vector";
-
-protected
-  Real r(min=1.) "Expansion rate of time values";
-  Real dr "Error on expansion rate evaluation";
-
-algorithm
-  if t_max > nTim*dt then
-    // Determine expansion rate (r)
-    dr := 1e99;
-    r := 2;
-    while abs(dr) > 1e-10 loop
-      dr := (1+t_max/dt*(r-1))^(1/nTim) - r;
-      r := r + dr;
-    end while;
-    // Assign time values
-    for i in 1:nTim-1 loop
-      t[i] := dt*(1-r^i)/(1-r);
-    end for;
-      t[nTim] := t_max;
-
-  else
-    // Number of time values too large for chosen parameters:
-    // Use a constant time step
-    for i in 1:nTim loop
-      t[i] := i*dt;
-    end for;
-
-  end if;
-annotation (
-Documentation(info="
+within BuildSysPro.IBPSA.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.ThermalResponseFactors;
+
+function timeGeometric "Geometric expansion of time steps"
+  extends Modelica.Icons.Function;
+  input Modelica.Units.SI.Duration dt "Minimum time step";
+  input Modelica.Units.SI.Time t_max "Maximum value of time";
+  input Integer nTim "Number of time values";
+  output Real t[nTim] "Time vector";
+protected
+  Real r(min = 1.) "Expansion rate of time values";
+  Real dr "Error on expansion rate evaluation";
+algorithm
+  if t_max > nTim * dt then
+    dr := 1e99;
+    r := 2;
+    while abs(dr) > 1e-10 loop
+      dr := (1 + t_max / dt * (r - 1)) ^ (1 / nTim) - r;
+      r := r + dr;
+    end while;
+    for i in 1:nTim - 1 loop
+      t[i] := dt * (1 - r ^ i) / (1 - r);
+    end for;
+    t[nTim] := t_max;
+  else
+    for i in 1:nTim loop
+      t[i] := i * dt;
+    end for;
+  end if;
+// Determine expansion rate (r)
+// Assign time values
+// Number of time values too large for chosen parameters:
+// Use a constant time step
+  annotation(
+    Documentation(info = "
 
    
 This function attemps to build a vector of length nTim with a geometric
 expansion of the time variable between dt and t_max.
@@ -56,12 +51,12 @@
 
    
 t = [dt, 2*dt, ... , n*dt, ... , nTim*dt]
 
    
-", revisions="
+", revisions = "
 
      
 
    • 
 June 28, 2018 by Massimo Cimmino:
      
 First implementation.
 
      • 
 
    
-"));
-end timeGeometric;
+"));
+end timeGeometric;
\ No newline at end of file
Only in converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors: timeGeometric.mo.after
Only in converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors: timeGeometric.mo.before
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/Validation/Analytic_20Years.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/Validation/Analytic_20Years.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/Validation/Analytic_20Years.mo"	2022-03-10 09:57:39.680144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/Validation/Analytic_20Years.mo"	2022-03-10 09:58:16.320148982 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.IBPSA.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.Validation;
+within BuildSysPro.IBPSA.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.Validation;
 model Analytic_20Years
   "Long term validation of ground temperature response model"
   extends Modelica.Icons.Example;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/Validation/Cylindrical.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/Validation/Cylindrical.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/Validation/Cylindrical.mo"	2022-03-10 09:57:39.680144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/Validation/Cylindrical.mo"	2022-03-10 09:58:16.192148966 +0000
@@ -3,7 +3,7 @@
   "Comparison of the Cylindrical with the GroundTemperatureResponse"
   extends Modelica.Icons.Example;
 
-  parameter Modelica.SIunits.Temperature T_start = 295.15
+  parameter Modelica.Units.SI.Temperature T_start = 295.15
     "Initial soil temperature";
   parameter
     IBPSA.Fluid.Geothermal.Borefields.Data.Borefield.Template borFieDat=
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/Validation/FiniteDifference_1Week.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/Validation/FiniteDifference_1Week.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/Validation/FiniteDifference_1Week.mo"	2022-03-10 09:57:39.680144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/Validation/FiniteDifference_1Week.mo"	2022-03-10 09:58:16.184148964 +0000
@@ -3,7 +3,7 @@
   "Short term validation of ground temperature response model"
   extends Modelica.Icons.Example;
 
-  parameter Modelica.SIunits.Temperature T_start = 283.15
+  parameter Modelica.Units.SI.Temperature T_start = 283.15
     "Initial soil temperature";
   IBPSA.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.Cylindrical
     soi(
@@ -48,7 +48,7 @@
         transformation(extent={{-90,-88},{-70,-68}})));
 
   Modelica.Blocks.Sources.Sine sine(
-    freqHz=1/(24*3600),
+    f =1/(24*3600),
     startTime=21600,
     amplitude=1e8) "Heat flow signal"
     annotation (Placement(transformation(extent={{-92,-10},{-72,10}})));
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/PartialBorefield.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/PartialBorefield.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/PartialBorefield.mo"	2022-03-10 09:57:39.680144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/PartialBorefield.mo"	2022-03-10 09:58:16.156148961 +0000
@@ -16,18 +16,18 @@
   constant Real mSenFac(min=1)=1
     "Factor for scaling the sensible thermal mass of the volume";
 
-  // Assumptions
+// Assumptions
   parameter Modelica.Fluid.Types.Dynamics energyDynamics=Modelica.Fluid.Types.Dynamics.DynamicFreeInitial
     "Type of energy balance: dynamic (3 initialization options) or steady state"
     annotation(Evaluate=true, Dialog(tab = "Dynamics", group="Equations"));
 
-  // Initialization
+// Initialization
   parameter Medium.AbsolutePressure p_start = Medium.p_default
     "Start value of pressure"
     annotation(Dialog(tab = "Initialization"));
 
   // Simulation parameters
-  parameter Modelica.SIunits.Time tLoaAgg=300 "Time resolution of load aggregation";
+  parameter Modelica.Units.SI.Time tLoaAgg=300 "Time resolution of load aggregation";
   parameter Integer nCel(min=1)=5 "Number of cells per aggregation level";
   parameter Integer nSeg(min=1)=10
     "Number of segments to use in vertical discretization of the boreholes";
@@ -35,36 +35,36 @@
     "Set to true to force the thermal response to be calculated at the start instead of checking whether this has been pre-computed"
     annotation (Dialog(tab="Advanced"));
 
-  // General parameters of borefield
+// General parameters of borefield
   parameter IBPSA.Fluid.Geothermal.Borefields.Data.Borefield.Template
     borFieDat "Borefield data" annotation (Placement(transformation(
           extent={{-80,-80},{-60,-60}})));
 
   // Temperature gradient in undisturbed soil
-  parameter Modelica.SIunits.Temperature TExt0_start=283.15
+  parameter Modelica.Units.SI.Temperature TExt0_start=283.15
     "Initial far field temperature"
     annotation (Dialog(tab="Initialization", group="Soil"));
-  parameter Modelica.SIunits.Temperature TExt_start[nSeg]=
+  parameter Modelica.Units.SI.Temperature TExt_start[nSeg]=
     {if z[i] >= z0 then TExt0_start + (z[i] - z0)*dT_dz else TExt0_start for i in 1:nSeg}
     "Temperature of the undisturbed ground"
     annotation (Dialog(tab="Initialization", group="Soil"));
 
-  parameter Modelica.SIunits.Temperature TGro_start[nSeg]=TExt_start
+  parameter Modelica.Units.SI.Temperature TGro_start[nSeg]=TExt_start
     "Start value of grout temperature"
     annotation (Dialog(tab="Initialization", group="Filling material"));
 
-  parameter Modelica.SIunits.Temperature TFlu_start[nSeg]=TGro_start
+  parameter Modelica.Units.SI.Temperature TFlu_start[nSeg]=TGro_start
     "Start value of fluid temperature"
     annotation (Dialog(tab="Initialization"));
 
-  parameter Modelica.SIunits.Height z0=10
+  parameter Modelica.Units.SI.Height z0=10
     "Depth below which the temperature gradient starts"
     annotation (Dialog(tab="Initialization", group="Temperature profile"));
   parameter Real dT_dz(final unit="K/m", min=0) = 0.01
     "Vertical temperature gradient of the undisturbed soil for h below z0"
     annotation (Dialog(tab="Initialization", group="Temperature profile"));
 
-  // Dynamics of filling material
+// Dynamics of filling material
   parameter Boolean dynFil=true
     "Set to false to remove the dynamics of the filling material."
     annotation (Dialog(tab="Dynamics"));
@@ -115,7 +115,7 @@
     "Gain to multiply the heat extracted by one borehole by the number of boreholes"
     annotation (Placement(transformation(extent={{-20,70},{0,90}})));
 protected
-  parameter Modelica.SIunits.Height z[nSeg]={borFieDat.conDat.hBor/nSeg*(i - 0.5) for i in 1:nSeg}
+  parameter Modelica.Units.SI.Height z[nSeg]={borFieDat.conDat.hBor/nSeg*(i - 0.5) for i in 1:nSeg}
     "Distance from the surface to the considered segment";
 
   Modelica.Blocks.Sources.Constant TSoiUnd[nSeg](
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/Data/Configuration/Template.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/Data/Configuration/Template.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/Data/Configuration/Template.mo"	2022-03-10 09:57:39.680144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/Data/Configuration/Template.mo"	2022-03-10 09:58:16.056148948 +0000
@@ -12,50 +12,50 @@
   parameter Real Rb(unit="(m.K)/W") = 0.0
     "Borehole thermal resistance Rb. Only to fill in if known"
     annotation(Dialog(enable=use_Rb));
-  parameter Modelica.SIunits.MassFlowRate mBor_flow_nominal
+  parameter Modelica.Units.SI.MassFlowRate mBor_flow_nominal
     "Nominal mass flow rate per borehole"
     annotation (Dialog(group="Nominal condition"));
-  parameter Modelica.SIunits.MassFlowRate mBorFie_flow_nominal = mBor_flow_nominal*nBor
+  parameter Modelica.Units.SI.MassFlowRate mBorFie_flow_nominal = mBor_flow_nominal*nBor
     "Nominal mass flow of borefield"
     annotation (Dialog(group="Nominal condition"));
-  parameter Modelica.SIunits.Pressure dp_nominal(displayUnit="Pa")
+  parameter Modelica.Units.SI.Pressure dp_nominal(displayUnit="Pa")
     "Pressure losses for the entire borefield"
     annotation (Dialog(group="Nominal condition"));
 
   //------------------------- Geometrical parameters ---------------------------
-  parameter Modelica.SIunits.Height hBor "Total height of the borehole"
+  parameter Modelica.Units.SI.Height hBor "Total height of the borehole"
     annotation (Dialog(group="Borehole"));
-  parameter Modelica.SIunits.Radius rBor "Radius of the borehole"
+  parameter Modelica.Units.SI.Radius rBor "Radius of the borehole"
     annotation (Dialog(group="Borehole"));
-  parameter Modelica.SIunits.Height dBor "Borehole buried depth"
+  parameter Modelica.Units.SI.Height dBor "Borehole buried depth"
     annotation (Dialog(group="Borehole"));
   parameter Integer nBor = size(cooBor, 1) "Total number of boreholes"
     annotation (Dialog(group="Borehole"));
 
-  parameter Modelica.SIunits.Length[:,2] cooBor
+
+  parameter Modelica.Units.SI.Length[:,2] cooBor
     "Cartesian coordinates of the boreholes in meters"
     annotation (Dialog(group="Borehole"));
 
   // -- Tube
-  parameter Modelica.SIunits.Radius rTub "Outer radius of the tubes"
+  parameter Modelica.Units.SI.Radius rTub "Outer radius of the tubes"
     annotation (Dialog(group="Tubes"));
-  parameter Modelica.SIunits.ThermalConductivity kTub "Thermal conductivity of the tube"
+  parameter Modelica.Units.SI.ThermalConductivity kTub "Thermal conductivity of the tube"
     annotation (Dialog(group="Tubes"));
 
-  parameter Modelica.SIunits.Length eTub "Thickness of a tube"
+  parameter Modelica.Units.SI.Length eTub "Thickness of a tube"
     annotation (Dialog(group="Tubes"));
 
-  parameter Modelica.SIunits.Length xC
+  parameter Modelica.Units.SI.Length xC
     "Shank spacing, defined as the distance between the center of a pipe and the center of the borehole"
     annotation (Dialog(group="Tubes"));
 
   //------------------------- Advanced parameters ------------------------------
 
   /*--------Flow: */
-  parameter Modelica.SIunits.MassFlowRate mBor_flow_small(min=0) = 1E-4*abs(mBor_flow_nominal)
+  parameter Modelica.Units.SI.MassFlowRate mBor_flow_small(min=0) = 1E-4*abs(mBor_flow_nominal)
     "Small mass flow rate for regularization of zero flow"
     annotation (Dialog(tab="Advanced"));
-
   annotation (
   defaultComponentPrefixes="parameter",
   defaultComponentName="conDat",
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/Data/Filling/Template.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/Data/Filling/Template.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/Data/Filling/Template.mo"	2022-03-10 09:57:39.680144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/Data/Filling/Template.mo"	2022-03-10 09:58:16.000148941 +0000
@@ -2,16 +2,16 @@
 record Template
   "Template for filling data records"
   extends Modelica.Icons.Record;
-  parameter Modelica.SIunits.ThermalConductivity kFil
+  parameter Modelica.Units.SI.ThermalConductivity kFil
     "Thermal conductivity of the borehole filling material";
-  parameter Modelica.SIunits.SpecificHeatCapacity cFil
+  parameter Modelica.Units.SI.SpecificHeatCapacity cFil
     "Specific heat capacity of the borehole filling material";
-  parameter Modelica.SIunits.Density dFil(displayUnit="kg/m3")
+  parameter Modelica.Units.SI.Density dFil(displayUnit="kg/m3")
     "Density of the borehole filling material";
   parameter Boolean steadyState = (cFil < Modelica.Constants.eps or dFil < Modelica.Constants.eps)
     "Flag, if true, then material is computed using steady-state heat conduction"
     annotation(Evaluate=true);
-  final parameter Modelica.SIunits.ThermalDiffusivity aFil = kFil/(dFil*cFil)
+  final parameter Modelica.Units.SI.ThermalDiffusivity aFil = kFil/(dFil*cFil)
     "Heat diffusion coefficient of the borehole filling material";
   annotation (
   defaultComponentPrefixes="parameter",
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/Data/Soil/Template.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/Data/Soil/Template.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/Data/Soil/Template.mo"	2022-03-10 09:57:39.680144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/Data/Soil/Template.mo"	2022-03-10 09:58:15.920148932 +0000
@@ -2,16 +2,16 @@
 record Template
   "Template for soil data records"
   extends Modelica.Icons.Record;
-  parameter Modelica.SIunits.ThermalConductivity kSoi
+  parameter Modelica.Units.SI.ThermalConductivity kSoi
     "Thermal conductivity of the soil material";
-  parameter Modelica.SIunits.SpecificHeatCapacity cSoi
+  parameter Modelica.Units.SI.SpecificHeatCapacity cSoi
     "Specific heat capacity of the soil material";
-  parameter Modelica.SIunits.Density dSoi(displayUnit="kg/m3")
+  parameter Modelica.Units.SI.Density dSoi(displayUnit="kg/m3")
     "Density of the soil material";
   parameter Boolean steadyState = (cSoi < Modelica.Constants.eps or dSoi < Modelica.Constants.eps)
     "Flag, if true, then material is computed using steady-state heat conduction"
     annotation(Evaluate=true);
-  final parameter Modelica.SIunits.ThermalDiffusivity aSoi=kSoi/(dSoi*cSoi)
+  final parameter Modelica.Units.SI.ThermalDiffusivity aSoi=kSoi/(dSoi*cSoi)
     "Heat diffusion coefficient of the soil material";
   annotation (
   defaultComponentPrefixes="parameter",
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/Examples/Borefields.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/Examples/Borefields.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/Examples/Borefields.mo"	2022-03-10 09:57:39.680144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/Examples/Borefields.mo"	2022-03-10 09:58:15.900148928 +0000
@@ -5,10 +5,10 @@
 
   package Medium = IBPSA.Media.Water;
 
-  parameter Modelica.SIunits.Time tLoaAgg=300
+  parameter Modelica.Units.SI.Time tLoaAgg=300
     "Time resolution of load aggregation";
 
-  parameter Modelica.SIunits.Temperature TGro = 283.15
+  parameter Modelica.Units.SI.Temperature TGro = 283.15
     "Ground temperature";
   IBPSA.Fluid.Geothermal.Borefields.TwoUTubes borFie2UTubPar(
     redeclare package Medium = Medium,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/Examples/RectangularBorefield.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/Examples/RectangularBorefield.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/Examples/RectangularBorefield.mo"	2022-03-10 09:57:39.680144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/Examples/RectangularBorefield.mo"	2022-03-10 09:58:15.868148924 +0000
@@ -4,25 +4,25 @@
 
   package Medium = IBPSA.Media.Water "Medium model";
 
-  parameter Modelica.SIunits.Time tLoaAgg=300
+  parameter Modelica.Units.SI.Time tLoaAgg=300
     "Time resolution of load aggregation";
 
-  parameter Modelica.SIunits.Temperature TGro = 283.15
+  parameter Modelica.Units.SI.Temperature TGro = 283.15
     "Ground temperature";
-  parameter Modelica.SIunits.Velocity v_nominal = 1 "Nominal velocity";
-  parameter Modelica.SIunits.MassFlowRate m_flow_nominal = nBorHol*v_nominal*rTub^2*3.14*1000
+  parameter Modelica.Units.SI.Velocity v_nominal = 1 "Nominal velocity";
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = nBorHol*v_nominal*rTub^2*3.14*1000
     "Nominal mass flow rate";
-  parameter Modelica.SIunits.Pressure dpBorFie_nominal = (hBor+(xBorFie+yBorFie)/2)*2
+  parameter Modelica.Units.SI.Pressure dpBorFie_nominal = (hBor+(xBorFie+yBorFie)/2)*2
     "Pressure losses for the entire borefield";
-  parameter Modelica.SIunits.Pressure dpHex_nominal = 10000 "Pressure drop heat exchanger";
-  parameter Modelica.SIunits.Pressure dp_nominal = dpBorFie_nominal + dpHex_nominal
+  parameter Modelica.Units.SI.Pressure dpHex_nominal = 10000 "Pressure drop heat exchanger";
+  parameter Modelica.Units.SI.Pressure dp_nominal = dpBorFie_nominal + dpHex_nominal
     "Total pressure drop";
 
-  parameter Modelica.SIunits.Height hBor = 100 "Total height of the borehole";
-  parameter Modelica.SIunits.Radius rTub = 0.02 "Outer radius of the tubes";
-  parameter Modelica.SIunits.Length xBorFie = 10 "Borefield length";
-  parameter Modelica.SIunits.Length yBorFie = 30 "Borefield width";
-  parameter Modelica.SIunits.Length dBorHol = 5 "Distance between two boreholes";
+  parameter Modelica.Units.SI.Height hBor = 100 "Total height of the borehole";
+  parameter Modelica.Units.SI.Radius rTub = 0.02 "Outer radius of the tubes";
+  parameter Modelica.Units.SI.Length xBorFie = 10 "Borefield length";
+  parameter Modelica.Units.SI.Length yBorFie = 30 "Borefield width";
+  parameter Modelica.Units.SI.Length dBorHol = 5 "Distance between two boreholes";
 
   final parameter Integer nXBorHol = integer((xBorFie+dBorHol)/dBorHol) "Number of boreholes in x-direction";
   final parameter Integer nYBorHol = integer((yBorFie+dBorHol)/dBorHol) "Number of boreholes in y-direction";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/Validation/Sandbox.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/Validation/Sandbox.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/Validation/Sandbox.mo"	2022-03-10 09:57:39.680144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Geothermal/Borefields/Validation/Sandbox.mo"	2022-03-10 09:58:15.764148912 +0000
@@ -3,16 +3,15 @@
   extends Modelica.Icons.Example;
   package Medium = IBPSA.Media.Water;
 
-  parameter Modelica.SIunits.Temperature T_start = 273.15 + 22.09
+  parameter Modelica.Units.SI.Temperature T_start = 273.15 + 22.09
     "Initial temperature of the sandbox";
 
-  // mSenFac is set to its numerical value because it is a constant in the borehole model.
-  // mSenFac = 1 +
-  //  (1.8e6*Modelica.Constants.pi*(borFieDat.conDat.rTub^2
-  //        -(borFieDat.conDat.rTub-borFieDat.conDat.eTub)^2)
-  //        +2.4e6*2*Modelica.Constants.pi*borFieDat.conDat.rBor*0.002/2)
-  //        /(4.2e6*Modelica.Constants.pi*(borFieDat.conDat.rTub-borFieDat.conDat.eTub)^2)
-
+// mSenFac is set to its numerical value because it is a constant in the borehole model.
+  // mSenFac = 1 +
+  //  (1.8e6*Modelica.Constants.pi*(borFieDat.conDat.rTub^2
+  //        -(borFieDat.conDat.rTub-borFieDat.conDat.eTub)^2)
+  //        +2.4e6*2*Modelica.Constants.pi*borFieDat.conDat.rBor*0.002/2)
+  //        /(4.2e6*Modelica.Constants.pi*(borFieDat.conDat.rTub-borFieDat.conDat.eTub)^2)
   constant Real mSenFac = 1.59186
   "Scaling factor for the borehole capacitances, modified to account for the thermal mass of the pipes and the borehole casing";
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/ActiveBeams/BaseClasses/Convector.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/ActiveBeams/BaseClasses/Convector.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/ActiveBeams/BaseClasses/Convector.mo"	2022-03-10 09:57:39.680144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/ActiveBeams/BaseClasses/Convector.mo"	2022-03-10 09:58:15.672148899 +0000
@@ -12,15 +12,15 @@
 
   parameter Integer nBeams(min=1) "Number of beams in parallel";
 
-  parameter Modelica.SIunits.Time tau = 30
+  parameter Modelica.Units.SI.Time tau = 30
     "Time constant at nominal flow (if energyDynamics <> SteadyState)"
      annotation (Dialog(tab = "Dynamics", group="Nominal condition"));
 
-  // Advanced
+// Advanced
   parameter Boolean homotopyInitialization = true "= true, use homotopy method"
     annotation(Evaluate=true, Dialog(tab="Advanced"));
 
-  // Dynamics
+// Dynamics
   parameter Modelica.Fluid.Types.Dynamics energyDynamics=Modelica.Fluid.Types.Dynamics.DynamicFreeInitial
     "Type of energy balance: dynamic (3 initialization options) or steady state"
     annotation(Evaluate=true, Dialog(tab = "Dynamics", group="Equations"));
@@ -28,7 +28,7 @@
     "Type of mass balance: dynamic (3 initialization options) or steady state"
     annotation(Evaluate=true, Dialog(tab = "Dynamics", group="Equations"));
 
-  // Initialization
+// Initialization
   parameter Medium.AbsolutePressure p_start = Medium.p_default
     "Start value of pressure"
     annotation(Dialog(tab = "Initialization"));
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/ActiveBeams/BaseClasses/DerivativesCubicSpline.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/ActiveBeams/BaseClasses/DerivativesCubicSpline.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/ActiveBeams/BaseClasses/DerivativesCubicSpline.mo"	2022-03-10 09:57:39.680144338 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/ActiveBeams/BaseClasses/DerivativesCubicSpline.mo"	2022-03-10 09:58:15.644148896 +0000
@@ -14,8 +14,7 @@
   Integer i "Counter to pick the interpolation interval";
 
 initial algorithm
-  // Get the derivative values at the support points
-
+// Get the derivative values at the support points
   dMonotone := IBPSA.Utilities.Math.Functions.splineDerivatives(
               x=xd,
               y=yd,
@@ -28,7 +27,7 @@
       i := j;
     end if;
   end for;
-  // Extrapolate or interpolate the data
+// Extrapolate or interpolate the data
   y := IBPSA.Utilities.Math.Functions.cubicHermiteLinearExtrapolation(
               x=u,
               x1=xd[i],
@@ -36,7 +35,8 @@
               y1=yd[i],
               y2=yd[i + 1],
               y1d=dMonotone[i],
-              y2d=dMonotone[i + 1]);
+              y2d=dMonotone[i + 1]);
+
 annotation (
   defaultComponentName="cubSpl",
   Documentation(info="
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/ActiveBeams/BaseClasses/Examples/DerivateCubicSpline.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/ActiveBeams/BaseClasses/Examples/DerivateCubicSpline.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/ActiveBeams/BaseClasses/Examples/DerivateCubicSpline.mo"	2022-03-10 09:57:39.684144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/ActiveBeams/BaseClasses/Examples/DerivateCubicSpline.mo"	2022-03-10 09:58:15.608148891 +0000
@@ -2,7 +2,7 @@
 model DerivateCubicSpline
   extends Modelica.Icons.Example;
 
-  Modelica.Blocks.Sources.Clock clock "Clock"
+  Modelica.Blocks.Sources.ContinuousClock clock "Clock"
     annotation (Placement(transformation(extent={{-60,-10},{-40,10}})));
   IBPSA.Fluid.HeatExchangers.ActiveBeams.BaseClasses.DerivativesCubicSpline
     cubSpl "Derivatives of cubic spline" annotation (Placement(
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/ActiveBeams/Cooling.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/ActiveBeams/Cooling.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/ActiveBeams/Cooling.mo"	2022-03-10 09:57:39.684144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/ActiveBeams/Cooling.mo"	2022-03-10 09:58:15.568148887 +0000
@@ -25,11 +25,11 @@
     "= true to allow flow reversal in air circuit, false restricts to design direction (port_a -> port_b)"
     annotation(Dialog(tab="Assumptions"), Evaluate=true);
 
-  parameter Modelica.SIunits.Time tau = 30
+  parameter Modelica.Units.SI.Time tau = 30
     "Time constant at nominal flow (if energyDynamics <> SteadyState)"
      annotation (Dialog(tab = "Dynamics", group="Nominal condition"));
 
-  // Flow resistance
+// Flow resistance
   parameter Boolean from_dpWat = false
     "= true, use m_flow = f(dp) else dp = f(m_flow)"
     annotation (Evaluate=true, Dialog(enable = perCoo.dpAir_nominal > 0,
@@ -40,11 +40,11 @@
   parameter Real deltaMWat = 0.1
     "Fraction of nominal flow rate where flow transitions to laminar"
     annotation(Dialog(tab="Flow resistance"));
-  // Advanced
+  // Advanced
   parameter Boolean homotopyInitialization = true "= true, use homotopy method"
     annotation(Evaluate=true, Dialog(tab="Advanced"));
 
-  // Dynamics
+// Dynamics
   parameter Modelica.Fluid.Types.Dynamics energyDynamics=Modelica.Fluid.Types.Dynamics.DynamicFreeInitial
     "Type of energy balance: dynamic (3 initialization options) or steady state"
     annotation(Evaluate=true, Dialog(tab = "Dynamics", group="Equations"));
@@ -52,7 +52,7 @@
     "Type of mass balance: dynamic (3 initialization options) or steady state"
     annotation(Evaluate=true, Dialog(tab = "Dynamics", group="Equations"));
 
-  // Initialization
+// Initialization
   parameter MediumWat.AbsolutePressure pWatCoo_start = MediumWat.p_default
     "Start value of pressure"
     annotation(Dialog(tab = "Initialization", group = "Cooling"));
@@ -67,12 +67,12 @@
     "Small mass flow rate for regularization of zero flow"
     annotation(Dialog(tab = "Advanced"));
 
-  // Diagnostics
+// Diagnostics
   parameter Boolean show_T = false
     "= true, if actual temperature at port is computed"
     annotation(Dialog(tab="Advanced",group="Diagnostics"));
 
-  // Ports
+// Ports
   Modelica.Fluid.Interfaces.FluidPort_a watCoo_a(
     redeclare final package Medium = MediumWat,
     m_flow(min=if allowFlowReversalWat then -Modelica.Constants.inf else 0),
@@ -133,10 +133,10 @@
         origin={0,-36})));
 
   // Pressure drop
-  Modelica.SIunits.PressureDifference dpWatCoo(displayUnit="Pa") = watCoo_a.p - watCoo_b.p
+  Modelica.Units.SI.PressureDifference dpWatCoo(displayUnit="Pa") = watCoo_a.p - watCoo_b.p
     "Pressure difference watCoo_a minus watCoo_b";
 
-  Modelica.SIunits.PressureDifference dpAir(displayUnit="Pa") = air_a.p - air_b.p
+  Modelica.Units.SI.PressureDifference dpAir(displayUnit="Pa") = air_a.p - air_b.p
     "Pressure difference air_a minus air_b";
 
   FixedResistances.PressureDrop res(
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/ActiveBeams/CoolingAndHeating.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/ActiveBeams/CoolingAndHeating.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/ActiveBeams/CoolingAndHeating.mo"	2022-03-10 09:57:39.684144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/ActiveBeams/CoolingAndHeating.mo"	2022-03-10 09:58:15.532148881 +0000
@@ -8,7 +8,7 @@
       choicesAllMatching=true,
       Placement(transformation(extent={{62,-98},{78,-82}})));
 
-  // Initialization
+// Initialization
   parameter MediumWat.AbsolutePressure pWatHea_start = pWatCoo_start
     "Start value of pressure"
     annotation(Dialog(tab = "Initialization", group = "Heating"));
@@ -42,7 +42,7 @@
                           noEvent(actualStream(watHea_b.Xi_outflow))) if
           show_T "Medium properties in port watHea_b";
 
-  Modelica.SIunits.PressureDifference dpWatHea(displayUnit="Pa") = watHea_a.p - watHea_b.p
+  Modelica.Units.SI.PressureDifference dpWatHea(displayUnit="Pa") = watHea_a.p - watHea_b.p
     "Pressure difference between watHea_a and watHea_b";
 
 protected
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/ActiveBeams/Data/Generic.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/ActiveBeams/Data/Generic.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/ActiveBeams/Data/Generic.mo"	2022-03-10 09:57:39.684144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/ActiveBeams/Data/Generic.mo"	2022-03-10 09:58:15.468148873 +0000
@@ -14,28 +14,28 @@
     f={0,0.5,1})
     "Performance data for normalized temperature difference room minus water inlet";
 
-  parameter Modelica.SIunits.MassFlowRate mAir_flow_nominal
+
+  parameter Modelica.Units.SI.MassFlowRate mAir_flow_nominal
     "Nominal air mass flow rate per beam"
     annotation (Dialog(group="Nominal condition"));
 
-  parameter Modelica.SIunits.MassFlowRate mWat_flow_nominal
+  parameter Modelica.Units.SI.MassFlowRate mWat_flow_nominal
     "Nominal water mass flow rate per beam"
     annotation (Dialog(group="Nominal condition"));
-  parameter Modelica.SIunits.PressureDifference dpWat_nominal(displayUnit="Pa")
+  parameter Modelica.Units.SI.PressureDifference dpWat_nominal(displayUnit="Pa")
     "Water-side nominal pressure drop per beam"
     annotation (Dialog(group="Nominal condition"));
 
-  parameter Modelica.SIunits.PressureDifference dpAir_nominal(displayUnit="Pa")
+  parameter Modelica.Units.SI.PressureDifference dpAir_nominal(displayUnit="Pa")
     "Air-side nominal pressure drop"
     annotation (Dialog(group="Nominal condition"));
 
-  parameter Modelica.SIunits.TemperatureDifference dT_nominal
+  parameter Modelica.Units.SI.TemperatureDifference dT_nominal
     "Nominal temperature difference water inlet minus room air"
     annotation (Dialog(group="Nominal condition"));
-  parameter Modelica.SIunits.HeatFlowRate Q_flow_nominal
+  parameter Modelica.Units.SI.HeatFlowRate Q_flow_nominal
     "Nominal capacity per beam"
     annotation (Dialog(group="Nominal condition"));
-
   annotation (defaultComponentName="per",
 Documentation(revisions="
 
      
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/ActiveBeams/Examples/CoolingAndHeating.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/ActiveBeams/Examples/CoolingAndHeating.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/ActiveBeams/Examples/CoolingAndHeating.mo"	2022-03-10 09:57:39.684144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/ActiveBeams/Examples/CoolingAndHeating.mo"	2022-03-10 09:58:15.436148869 +0000
@@ -61,7 +61,7 @@
         MediumW, nPorts=1) "Sink hot water"
     annotation (Placement(transformation(extent={{100,50},{80,70}})));
   Modelica.Blocks.Sources.Sine sine(
-    freqHz=1/86400,
+    f =1/86400,
     amplitude=1,
     phase=-1.5707963267949) "Source for thermal loads"
     annotation (Placement(transformation(extent={{-110,-70},{-90,-50}})));
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/ActiveBeams/Examples/CoolingOnly.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/ActiveBeams/Examples/CoolingOnly.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/ActiveBeams/Examples/CoolingOnly.mo"	2022-03-10 09:57:39.684144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/ActiveBeams/Examples/CoolingOnly.mo"	2022-03-10 09:58:15.360148860 +0000
@@ -51,7 +51,7 @@
     "Room air temperature sensor"
     annotation (Placement(transformation(extent={{-20,-40},{-40,-20}})));
   Modelica.Blocks.Sources.Sine sine(
-    freqHz=1/86400,
+    f =1/86400,
     amplitude=1,
     phase=-1.5707963267949) "Source for thermal loads"
     annotation (Placement(transformation(extent={{-110,-70},{-90,-50}})));
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/ActiveBeams/Examples/HeatingOnly.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/ActiveBeams/Examples/HeatingOnly.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/ActiveBeams/Examples/HeatingOnly.mo"	2022-03-10 09:57:39.684144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/ActiveBeams/Examples/HeatingOnly.mo"	2022-03-10 09:58:15.336148857 +0000
@@ -60,7 +60,7 @@
         MediumW, nPorts=1) "Sink for hot water"
     annotation (Placement(transformation(extent={{100,50},{80,70}})));
   Modelica.Blocks.Sources.Sine sine(
-    freqHz=1/86400,
+    f =1/86400,
     amplitude=1,
     phase=-1.5707963267949) "Source for thermal loads"
     annotation (Placement(transformation(extent={{-110,-70},{-90,-50}})));
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/BaseClasses/Examples/HACoilInside.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/BaseClasses/Examples/HACoilInside.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/BaseClasses/Examples/HACoilInside.mo"	2022-03-10 09:57:39.684144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/BaseClasses/Examples/HACoilInside.mo"	2022-03-10 09:58:15.256148846 +0000
@@ -3,13 +3,13 @@
   extends Modelica.Icons.Example;
 
   Modelica.Blocks.Sources.Sine sine(
-    freqHz=0.1,
+    f =0.1,
     amplitude=0.063,
     offset=0.063) "Mass flow rate"
     annotation (Placement(transformation(extent={{-80,-10},{-60,10}})));
   Modelica.Blocks.Sources.Sine sine1(
     amplitude=10,
-    freqHz=0.1,
+f    =0.1,
     offset=273.15 + 50) "Temperature"
     annotation (Placement(transformation(extent={{-80,20},{-60,40}})));
   IBPSA.Fluid.HeatExchangers.BaseClasses.HACoilInside hASin(
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/BaseClasses/HACoilInside.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/BaseClasses/HACoilInside.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/BaseClasses/HACoilInside.mo"	2022-03-10 09:57:39.684144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/BaseClasses/HACoilInside.mo"	2022-03-10 09:58:15.236148844 +0000
@@ -2,7 +2,7 @@
 model HACoilInside "Calculates the hA value for water inside a coil"
   extends Modelica.Blocks.Icons.Block;
 
-  parameter Modelica.SIunits.MassFlowRate m_flow_nominal "Water mass flow rate"
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal "Water mass flow rate"
     annotation(Dialog(tab="General", group="Nominal condition"));
 
   Modelica.Blocks.Interfaces.RealInput m_flow(unit="kg/s") "Mass flow rate"
@@ -14,13 +14,13 @@
     "Inside convective heat transfer" annotation (Placement(transformation(
           extent={{100,-10},{120,10}})));
 
-  parameter Modelica.SIunits.ThermalConductance hA_nominal(min=0)
+  parameter Modelica.Units.SI.ThermalConductance hA_nominal(min=0)
     "Convective heat transfer coefficient"
           annotation(Dialog(tab="General", group="Nominal condition"));
   parameter Real n(min=0, max=1)=0.85
     "Water-side exponent for convective heat transfer coefficient, h proportional to m_flow^n";
-  parameter Modelica.SIunits.Temperature T_nominal=
-          Modelica.SIunits.Conversions.from_degC(20)
+  parameter Modelica.Units.SI.Temperature T_nominal=
+          Modelica.Units.Conversions.from_degC(20)
     "Nominal water temperature"
           annotation(Dialog(tab="General", group="Nominal condition"));
   parameter Boolean flowDependent=true
@@ -39,7 +39,7 @@
 
 initial equation
   s =  if temperatureDependent then
-            0.014/(1+0.014*Modelica.SIunits.Conversions.to_degC(T_nominal)) else
+            0.014/(1 + 0.014 * Modelica.Units.Conversions.to_degC(T_nominal)) else
               1;
 equation
   fm = if flowDependent then m_flow / m_flow_nominal else 1;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/BaseClasses/HANaturalCylinder.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/BaseClasses/HANaturalCylinder.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/BaseClasses/HANaturalCylinder.mo"	2022-03-10 09:57:39.684144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/BaseClasses/HANaturalCylinder.mo"	2022-03-10 09:58:15.212148841 +0000
@@ -5,16 +5,16 @@
   replaceable package Medium =
       Modelica.Media.Interfaces.PartialMedium
     "Medium inside the tank";
-  parameter Modelica.SIunits.Diameter ChaLen
+  parameter Modelica.Units.SI.Diameter ChaLen
     "Characteristic length of the cylinder";
 
-  parameter Modelica.SIunits.ThermalConductance hA_nominal(min=0)
+  parameter Modelica.Units.SI.ThermalConductance hA_nominal(min=0)
     "Convective heat transfer coefficient"
    annotation(Dialog(tab="General", group="Nominal condition"));
-  parameter Modelica.SIunits.Temperature TFlu_nominal
+  parameter Modelica.Units.SI.Temperature TFlu_nominal
     "Fluid temperature at hA_nominal"
     annotation(Dialog(tab="General", group="Nominal condition"));
-  parameter Modelica.SIunits.Temperature TSur_nominal
+  parameter Modelica.Units.SI.Temperature TSur_nominal
     "Surface temperature at hA_nominal"
     annotation(Dialog(tab="General", group="Nominal condition"));
 
@@ -34,12 +34,12 @@
     "isobaricExpansionCoefficient";
   parameter Real nu_nominal(unit = "m2/s", fixed=false)
     "Kinematic viscosity of the medium";
-  parameter Modelica.SIunits.DynamicViscosity mu_nominal(fixed=false)
+  parameter Modelica.Units.SI.DynamicViscosity mu_nominal(fixed=false)
     "Dynamic viscosity of the medium";
-  parameter Modelica.SIunits.Density rho_nominal(fixed=false)
+  parameter Modelica.Units.SI.Density rho_nominal(fixed=false)
     "Density of the medium";
 
-  parameter Modelica.SIunits.ThermalConductivity k_nominal(fixed=false)
+  parameter Modelica.Units.SI.ThermalConductivity k_nominal(fixed=false)
     "Thermal conductivity of the fluid";
 
   parameter Real Ra_nominal(fixed=false) "Rayleigh number";
@@ -48,16 +48,16 @@
 
   parameter Real h_nominal(unit="W/(m2.K)", fixed=false)
     "Convection coefficient";
-  parameter Modelica.SIunits.Area A(fixed=false)
+  parameter Modelica.Units.SI.Area A(fixed=false)
     "Surface area, deduced from hA_nominal, fluid temperatures and characteristic length";
 
-  Modelica.SIunits.ThermalConductivity k "Thermal conductivity of the fluid";
+  Modelica.Units.SI.ThermalConductivity k "Thermal conductivity of the fluid";
   Real Gr "Grashof number";
   Real B(unit="1/K") "isobaricExpansionCoefficient";
   Real nu(unit = "m2/s") "Kinematic viscosity of the medium";
-  Modelica.SIunits.DynamicViscosity mu "Dynamic viscosity of the medium";
-  Modelica.SIunits.Density rho "Density of the medium";
-  constant Modelica.SIunits.Acceleration g= Modelica.Constants.g_n
+  Modelica.Units.SI.DynamicViscosity mu "Dynamic viscosity of the medium";
+  Modelica.Units.SI.Density rho "Density of the medium";
+  constant Modelica.Units.SI.Acceleration g= Modelica.Constants.g_n
     "Acceleration due to gravity";
 
   Medium.ThermodynamicState state
@@ -67,7 +67,7 @@
   Real Nusselt "Nusselt number";
 
 function nusselt
-  input Modelica.SIunits.ThermalConductivity k "Thermal conductivity";
+  input Modelica.Units.SI.ThermalConductivity k "Thermal conductivity";
   input Real Pr "Prandlt number";
   input Real Ra "Rayleigh number";
   output Real Nu(min=0) "Nusselt number";
@@ -81,15 +81,13 @@
               0.1)^(1/6));
   den := ((1+(0.559/Pr)^(9/16))^(8/27));
   Nu := (0.6+num/den)^2;
-  annotation(smoothOrder=1);
-end nusselt;
+  annotation(smoothOrder=1);
 
-initial equation
+end nusselt;
 
-  // Fluid properties
-  mu_nominal =
-    IBPSA.Fluid.HeatExchangers.BaseClasses.dynamicViscosityWater(T=0.5*(
-    TSur_nominal + TFlu_nominal));
+initial equation
+// Fluid properties
+  mu_nominal = IBPSA.Fluid.HeatExchangers.BaseClasses.dynamicViscosityWater(T = 0.5 * (TSur_nominal + TFlu_nominal));
   rho_nominal = Medium.density(
         Medium.setState_pTX(
           p = Medium.p_default,
@@ -106,22 +104,15 @@
 
   Gr_nominal = Modelica.Constants.g_n * B_nominal * (TSur_nominal -
   TFlu_nominal)*ChaLen^3/nu_nominal^2;
-  Ra_nominal = Gr_nominal*Pr_nominal;
-  // Convection coefficient
-  k_nominal = Medium.thermalConductivity(
-    Medium.setState_pTX(
-    p = Medium.p_default,
-    T = 0.5*(TFlu_nominal+TSur_nominal),
-    X = Medium.X_default));
+  Ra_nominal = Gr_nominal*Pr_nominal;
+// Convection coefficient
+  k_nominal = Medium.thermalConductivity(Medium.setState_pTX(p = Medium.p_default, T = 0.5 * (TFlu_nominal + TSur_nominal), X = Medium.X_default));
   Nusselt_nominal = nusselt(k=k_nominal, Pr=Pr_nominal, Ra=Ra_nominal);
   h_nominal = Nusselt_nominal * k_nominal/ChaLen;
   A = hA_nominal / h_nominal;
-equation
-  // Fluid properties
-  state = Medium.setState_pTX(
-             p = Medium.p_default,
-             T = 0.5*(TSur+TFlu),
-             X = Medium.X_default);
+equation
+// Fluid properties
+  state = Medium.setState_pTX(p = Medium.p_default, T = 0.5 * (TSur + TFlu), X = Medium.X_default);
   mu = IBPSA.Fluid.HeatExchangers.BaseClasses.dynamicViscosityWater(T=0.5
     *(TSur + TFlu));
   rho = Medium.density(state);
@@ -134,8 +125,8 @@
   nu = mu/rho;
 
   Gr = Modelica.Constants.g_n * B * (TSur - TFlu)*ChaLen^3/nu^2;
-  Ra = Gr*Pr;
-  // Convection coefficient
+  Ra = Gr*Pr;
+// Convection coefficient
   k = Medium.thermalConductivity(state);
   Nusselt = nusselt(k=k, Pr=Pr, Ra=Ra);
   h = Nusselt * k/ChaLen;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/BaseClasses/Internal.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/BaseClasses/Internal.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/BaseClasses/Internal.mo"	2022-03-10 09:57:39.684144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/BaseClasses/Internal.mo"	2022-03-10 09:58:15.180148837 +0000
@@ -1,6 +1,6 @@
 within BuildSysPro.IBPSA.Fluid.HeatExchangers.BaseClasses;
 package Internal "Solve f(x, data) for x with given f"
-  extends Modelica.Media.Common.OneNonLinearEquation;
+  extends ObsoleteModelica4.Media.Common.OneNonLinearEquation;
 
   redeclare function extends f_nonlinear
   algorithm
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/BaseClasses/PartialEffectiveness.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/BaseClasses/PartialEffectiveness.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/BaseClasses/PartialEffectiveness.mo"	2022-03-10 09:57:39.684144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/BaseClasses/PartialEffectiveness.mo"	2022-03-10 09:58:15.168148835 +0000
@@ -8,22 +8,22 @@
 
   Medium1.Temperature T_in1 "Inlet temperature medium 1";
   Medium2.Temperature T_in2 "Inlet temperature medium 2";
-  Modelica.SIunits.ThermalConductance C1_flow
+  Modelica.Units.SI.ThermalConductance C1_flow
     "Heat capacity flow rate medium 1";
-  Modelica.SIunits.ThermalConductance C2_flow
+  Modelica.Units.SI.ThermalConductance C2_flow
     "Heat capacity flow rate medium 2";
-  Modelica.SIunits.ThermalConductance CMin_flow(min=0)
+  Modelica.Units.SI.ThermalConductance CMin_flow(min=0)
     "Minimum heat capacity flow rate";
-  Modelica.SIunits.HeatFlowRate QMax_flow
+  Modelica.Units.SI.HeatFlowRate QMax_flow
     "Maximum heat flow rate into medium 1";
 protected
   parameter Real delta=1E-3 "Parameter used for smoothing";
 
-  parameter Modelica.SIunits.SpecificHeatCapacity cp1_default(fixed=false)
+  parameter Modelica.Units.SI.SpecificHeatCapacity cp1_default(fixed=false)
     "Specific heat capacity of medium 1 at default medium state";
-  parameter Modelica.SIunits.SpecificHeatCapacity cp2_default(fixed=false)
+  parameter Modelica.Units.SI.SpecificHeatCapacity cp2_default(fixed=false)
     "Specific heat capacity of medium 2 at default medium state";
-  parameter Modelica.SIunits.ThermalConductance CMin_flow_small(fixed=false)
+  parameter Modelica.Units.SI.ThermalConductance CMin_flow_small(fixed=false)
     "Small value for smoothing of minimum heat capacity flow rate";
   Real fra_a1(min=0, max=1)
     "Fraction of incoming state taken from port a2 (used to avoid excessive calls to regStep)";
@@ -65,13 +65,10 @@
   else
     fra_a1 = 1;
     fra_b1 = 0;
-  end if;
-
-  /////////////////////////////////////////////////////////
-  // Definitions for heat transfer effectiveness model
-  T_in1 = if allowFlowReversal1 then
-    fra_a1 * Medium1.temperature(state_a1_inflow) + fra_b1 * Medium1.temperature(state_b1_inflow) else
-    Medium1.temperature(state_a1_inflow);
+  end if;
+/////////////////////////////////////////////////////////
+// Definitions for heat transfer effectiveness model
+  T_in1 = if allowFlowReversal1 then fra_a1 * Medium1.temperature(state_a1_inflow) + fra_b1 * Medium1.temperature(state_b1_inflow) else Medium1.temperature(state_a1_inflow);
   T_in2 = if allowFlowReversal2 then
     fra_a2 * Medium2.temperature(state_a2_inflow) + fra_b2 * Medium2.temperature(state_b2_inflow) else
     Medium2.temperature(state_a2_inflow);
@@ -86,11 +83,9 @@
            fra_a2 * Medium2.specificHeatCapacityCp(state_a2_inflow) +
            fra_b2 * Medium2.specificHeatCapacityCp(state_b2_inflow) else
         Medium2.specificHeatCapacityCp(state_a2_inflow));
-  CMin_flow = min(C1_flow, C2_flow);
-
-  // QMax_flow is maximum heat transfer into medium 1
-  QMax_flow = CMin_flow*(T_in2 - T_in1);
-
+  CMin_flow = min(C1_flow, C2_flow);
+// QMax_flow is maximum heat transfer into medium 1
+  QMax_flow = CMin_flow * (T_in2 - T_in1);
   annotation (
     Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100,
             100}}), graphics={Rectangle(
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/BaseClasses/PartialPrescribedOutlet.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/BaseClasses/PartialPrescribedOutlet.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/BaseClasses/PartialPrescribedOutlet.mo"	2022-03-10 09:57:39.684144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/BaseClasses/PartialPrescribedOutlet.mo"	2022-03-10 09:58:15.148148833 +0000
@@ -5,11 +5,11 @@
   extends IBPSA.Fluid.Interfaces.TwoPortFlowResistanceParameters(final
       computeFlowResistance=(abs(dp_nominal) > Modelica.Constants.eps));
 
-  parameter Modelica.SIunits.MassFlowRate m_flow_nominal
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal
     "Nominal mass flow rate, used for regularization near zero flow"
     annotation(Dialog(group = "Nominal condition"));
 
-  parameter Modelica.SIunits.Time tau(min=0) = 10
+  parameter Modelica.Units.SI.Time tau(min=0) = 10
     "Time constant at nominal flow rate (used if energyDynamics or massDynamics not equal Modelica.Fluid.Types.Dynamics.SteadyState)"
     annotation(Dialog(tab = "Dynamics"));
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/BaseClasses/dynamicViscosityWater.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/BaseClasses/dynamicViscosityWater.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/BaseClasses/dynamicViscosityWater.mo"	2022-03-10 09:57:39.684144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/BaseClasses/dynamicViscosityWater.mo"	2022-03-10 09:58:15.100148828 +0000
@@ -1,13 +1,13 @@
 within BuildSysPro.IBPSA.Fluid.HeatExchangers.BaseClasses;
 function dynamicViscosityWater "Returns the dynamic viscosity for water"
-    input Modelica.SIunits.Temperature T "Thermodynamic state record";
-    output Modelica.SIunits.DynamicViscosity mu "Dynamic viscosity";
+    input Modelica.Units.SI.Temperature T "Thermodynamic state record";
+    output Modelica.Units.SI.DynamicViscosity mu "Dynamic viscosity";
 algorithm
         mu := ((2.86651*10^(-5))*T^4-0.039376307*T^3+20.32805026*T^2-
         4680.303158*T+406389.0375)*10^(-6);
-        //Equation is a fourth order polynomial fit to data from Fundamentals of
-        //Heat and Mass Transfer (Fourth Edition), Frank Incropera & David DeWitt,
-        //John Wiley & Sons, 1996
+//Equation is a fourth order polynomial fit to data from Fundamentals of
+//Heat and Mass Transfer (Fourth Edition), Frank Incropera & David DeWitt,
+//John Wiley & Sons, 1996
 
 annotation(Documentation(info = "
 
      
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/BaseClasses/epsilon_ntuZ.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/BaseClasses/epsilon_ntuZ.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/BaseClasses/epsilon_ntuZ.mo"	2022-03-10 09:57:39.684144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/BaseClasses/epsilon_ntuZ.mo"	2022-03-10 09:58:15.088148826 +0000
@@ -1,62 +1,56 @@
-within BuildSysPro.IBPSA.Fluid.HeatExchangers.BaseClasses;
-function epsilon_ntuZ
-  "Computes heat exchanger effectiveness for given number of transfer units and heat exchanger flow regime"
-  import f = BuildSysPro.IBPSA.Fluid.Types.HeatExchangerFlowRegime;
-  input Real NTU "Number of transfer units";
-  input Real Z(min=0, max=1) "Ratio of capacity flow rate (CMin/CMax)";
-  input Integer flowRegime
-    "Heat exchanger flow regime, see  IBPSA.Fluid.Types.HeatExchangerFlowRegime";
-  output Real eps(min=0, max=1) "Heat exchanger effectiveness";
-protected
-  Real a "Auxiliary variable";
-algorithm
-  if (flowRegime == Integer(f.ParallelFlow)) then // parallel flow
-    a := 0;
-    eps := (1 - Modelica.Math.exp(-NTU*(1 + Z)))/(1 + Z);
-  elseif (flowRegime == Integer(f.CounterFlow)) then// counter flow
-   // a is constraining Z since eps is not defined for Z=1.
-    a := smooth(1, if Z < 0.97 then Z else
-      IBPSA.Utilities.Math.Functions.smoothMin(
-              x1=Z,
-              x2=0.98,
-              deltaX=0.01));
-    eps := (1 - Modelica.Math.exp(-NTU*(1 - a)))/(1 - a*Modelica.Math.exp(-NTU*(
-      1 - a)));
-  elseif (flowRegime == Integer(f.CrossFlowUnmixed)) then
-   a := NTU^(-0.22);
-    eps := 1 - Modelica.Math.exp( ( Modelica.Math.exp( - NTU * Z * a)  - 1)  / (Z * a));
-  elseif (flowRegime == Integer(f.CrossFlowCMinUnmixedCMaxMixed)) then
-    // cross flow, (single pass), CMax mixed, CMin unmixed. (Coil with one row.)
-    a := 0;
-    eps := (1 - Modelica.Math.exp(-Z*(1 - Modelica.Math.exp(-NTU))))/Z;
-  elseif (flowRegime == Integer(f.CrossFlowCMinMixedCMaxUnmixed)) then
-    // cross flow, (single pass), CMin mixed, CMax unmixed.
-    a := 0;
-    eps := 1 - Modelica.Math.exp(-(1 - Modelica.Math.exp(-Z*NTU))/Z);
-  elseif (flowRegime == Integer(f.ConstantTemperaturePhaseChange)) then
-    // one side is experiencing constant temperature phase change
-    // Z is unused
-    a := 0;
-    eps := 1 - Modelica.Math.exp(-NTU);
-  else
-    a := 0;
-    eps := 0;
-    assert(Integer(f.ParallelFlow) <= flowRegime and
-           flowRegime <= Integer(f.ConstantTemperaturePhaseChange),
-           "Flow regime is not implemented.");
-  end if;
-  annotation(preferredView="info",
-             inverse(NTU=IBPSA.Fluid.HeatExchangers.BaseClasses.ntu_epsilonZ(eps=eps, Z=Z, flowRegime=flowRegime)),
-           smoothOrder=1,
-           Documentation(info="
+within BuildSysPro.IBPSA.Fluid.HeatExchangers.BaseClasses;
+
+function epsilon_ntuZ "Computes heat exchanger effectiveness for given number of transfer units and heat exchanger flow regime"
+  import f = BuildSysPro.IBPSA.Fluid.Types.HeatExchangerFlowRegime;
+  input Real NTU "Number of transfer units";
+  input Real Z(min = 0, max = 1) "Ratio of capacity flow rate (CMin/CMax)";
+  input Integer flowRegime "Heat exchanger flow regime, see  IBPSA.Fluid.Types.HeatExchangerFlowRegime";
+  output Real eps(min = 0, max = 1) "Heat exchanger effectiveness";
+protected
+  Real a "Auxiliary variable";
+algorithm
+  if flowRegime == Integer(f.ParallelFlow) then
+    a := 0;
+    eps := (1 - Modelica.Math.exp(-NTU * (1 + Z))) / (1 + Z);
+  elseif flowRegime == Integer(f.CounterFlow) then
+    a := smooth(1, if Z < 0.97 then Z else IBPSA.Utilities.Math.Functions.smoothMin(x1 = Z, x2 = 0.98, deltaX = 0.01));
+    eps := (1 - Modelica.Math.exp(-NTU * (1 - a))) / (1 - a * Modelica.Math.exp(-NTU * (1 - a)));
+  elseif flowRegime == Integer(f.CrossFlowUnmixed) then
+    a := NTU ^ (-0.22);
+    eps := 1 - Modelica.Math.exp((Modelica.Math.exp(-NTU * Z * a) - 1) / (Z * a));
+  elseif flowRegime == Integer(f.CrossFlowCMinUnmixedCMaxMixed) then
+    a := 0;
+    eps := (1 - Modelica.Math.exp(-Z * (1 - Modelica.Math.exp(-NTU)))) / Z;
+  elseif flowRegime == Integer(f.CrossFlowCMinMixedCMaxUnmixed) then
+    a := 0;
+    eps := 1 - Modelica.Math.exp(-(1 - Modelica.Math.exp(-Z * NTU)) / Z);
+  elseif flowRegime == Integer(f.ConstantTemperaturePhaseChange) then
+    a := 0;
+    eps := 1 - Modelica.Math.exp(-NTU);
+  else
+    a := 0;
+    eps := 0;
+    assert(Integer(f.ParallelFlow) <= flowRegime and flowRegime <= Integer(f.ConstantTemperaturePhaseChange), "Flow regime is not implemented.");
+  end if;
+// parallel flow
+// counter flow
+// a is constraining Z since eps is not defined for Z=1.
+// cross flow, (single pass), CMax mixed, CMin unmixed. (Coil with one row.)
+// cross flow, (single pass), CMin mixed, CMax unmixed.
+// one side is experiencing constant temperature phase change
+// Z is unused
+  annotation(
+    preferredView = "info",
+    inverse(NTU = IBPSA.Fluid.HeatExchangers.BaseClasses.ntu_epsilonZ(eps = eps, Z = Z, flowRegime = flowRegime)),
+    smoothOrder = 1,
+    Documentation(info = "
 
      
 This function computes the heat exchanger effectiveness for a given number of transfer units, capacity flow ratio and heat exchanger flow regime.
 The different options for the flow regime are declared in
 
 IBPSA.Fluid.Types.HeatExchangerFlowRegime.
 
      
-",
-revisions="
+", revisions = "
 
        
 
      • 
 September 28, 2016, by Massimo Cimmino:
        
@@ -83,5 +77,5 @@
 First implementation.
 
        • 
 
      
-"));
-end epsilon_ntuZ;
+"));
+end epsilon_ntuZ;
\ No newline at end of file
Only in converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/BaseClasses: epsilon_ntuZ.mo.after
Only in converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/BaseClasses: epsilon_ntuZ.mo.before
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/BaseClasses/isobaricExpansionCoefficientWater.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/BaseClasses/isobaricExpansionCoefficientWater.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/BaseClasses/isobaricExpansionCoefficientWater.mo"	2022-03-10 09:57:39.684144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/BaseClasses/isobaricExpansionCoefficientWater.mo"	2022-03-10 09:58:15.076148824 +0000
@@ -1,14 +1,14 @@
 within BuildSysPro.IBPSA.Fluid.HeatExchangers.BaseClasses;
 function isobaricExpansionCoefficientWater
   "Returns the isobaric expansion coefficient for water"
-    input Modelica.SIunits.Temperature T "Thermodynamic state record";
+    input Modelica.Units.SI.Temperature T "Thermodynamic state record";
     output Real beta( unit="1/K") "Dynamic viscosity";
 algorithm
         beta := (-8.53296*10^(-6)*T^4+0.011562287*T^3-5.88800657*T^2+
         1341.798661*T-115406.5225)*10^(-6);
-        //Equation is a fourth order polynomial fit to data from Fundamentals of
-        //Heat and Mass Transfer (Fourth Edition), Frank Incropera & David DeWitt,
-        //John Wiley & Sons, 1996
+//Equation is a fourth order polynomial fit to data from Fundamentals of
+//Heat and Mass Transfer (Fourth Edition), Frank Incropera & David DeWitt,
+//John Wiley & Sons, 1996
 
 annotation(Documentation(info = "
 
      
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/BaseClasses/ntu_epsilonZ.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/BaseClasses/ntu_epsilonZ.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/BaseClasses/ntu_epsilonZ.mo"	2022-03-10 09:57:39.684144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/BaseClasses/ntu_epsilonZ.mo"	2022-03-10 09:58:15.064148822 +0000
@@ -1,79 +1,57 @@
-within BuildSysPro.IBPSA.Fluid.HeatExchangers.BaseClasses;
-function ntu_epsilonZ
-  "Computes number of transfer units for given heat exchanger effectiveness and heat exchanger flow regime"
-  import f = BuildSysPro.IBPSA.Fluid.Types.HeatExchangerFlowRegime;
-  input Real eps(min=0, max=0.999) "Heat exchanger effectiveness";
-  input Real Z(min=0, max=1) "Ratio of capacity flow rate (CMin/CMax)";
-  input Integer flowRegime
-    "Heat exchanger flow regime";
-  output Real NTU "Number of transfer units";
-
-protected
-  Real a "Auxiliary variable";
-  constant Modelica.Media.Common.OneNonLinearEquation.f_nonlinear_Data dummy
-    "Dummy data for nonlinear function call";
-algorithm
-  if (flowRegime == Integer(f.ParallelFlow)) then // parallel flow
-    a := Z+1;
-    assert(eps < 1/a,
-      "Invalid input data. eps > 1/(1+Z) is physically not possible for parallel flow.
+within BuildSysPro.IBPSA.Fluid.HeatExchangers.BaseClasses;
+
+function ntu_epsilonZ "Computes number of transfer units for given heat exchanger effectiveness and heat exchanger flow regime"
+  import f = BuildSysPro.IBPSA.Fluid.Types.HeatExchangerFlowRegime;
+  input Real eps(min = 0, max = 0.999) "Heat exchanger effectiveness";
+  input Real Z(min = 0, max = 1) "Ratio of capacity flow rate (CMin/CMax)";
+  input Integer flowRegime "Heat exchanger flow regime";
+  output Real NTU "Number of transfer units";
+protected
+  Real a "Auxiliary variable";
+  constant ObsoleteModelica4.Media.Common.OneNonLinearEquation.f_nonlinear_Data dummy "Dummy data for nonlinear function call";
+algorithm
+  if flowRegime == Integer(f.ParallelFlow) then
+    a := Z + 1;
+    assert(eps < 1 / a, "Invalid input data. eps > 1/(1+Z) is physically not possible for parallel flow.
   Received eps = " + String(eps) + "
              Z = " + String(Z) + "
-       1/(Z+1) = " + String(1/a));
-    NTU := -(Modelica.Math.log(1-eps*a))/(a);
-  elseif (flowRegime == Integer(f.CounterFlow)) then// counter flow
-   // a is constraining Z since eps is not defined for Z=1.
-    a := smooth(1, if Z < 0.97 then Z else
-      IBPSA.Utilities.Math.Functions.smoothMin(
-              x1=Z,
-              x2=0.98,
-              deltaX=0.01));
-    NTU := Modelica.Math.log((1-eps)/(1-eps*a)) / (a-1);
-
-  elseif (flowRegime == Integer(f.CrossFlowUnmixed)) then
-    a := 0;
-    // The function Internal.solve evaluates epsilon_ntuZ at NTU=x_min-1e-10 and NTU=x_max+1e-10
-    // when it solves iteratively epsilon_ntuZ for ntu
-    // Therefore, we set x_min=1.5*1e-10 to prevent computing NTU^(-0.22)=(-1e-10)^(-0.22).
-    NTU := IBPSA.Fluid.HeatExchangers.BaseClasses.Internal.solve(
-              y_zero=eps,
-              x_min=1.5*1e-10,
-              x_max=1E6,
-              pressure=Z,
-              f_nonlinear_data=dummy);
-  elseif (flowRegime == Integer(f.CrossFlowCMinUnmixedCMaxMixed)) then
-    // cross flow, (single pass), CMax mixed, CMin unmixed. (Coil with one row.)
-    a := smooth(1, if Z > 0.03 then Z else
-      IBPSA.Utilities.Math.Functions.smoothMin(
-              x1=0.02,
-              x2=Z,
-              deltaX=0.01));
-    NTU := -Modelica.Math.log(1+(Modelica.Math.log(1-eps*a)/a));
-  elseif (flowRegime == Integer(f.CrossFlowCMinMixedCMaxUnmixed)) then
-    // cross flow, (single pass), CMin mixed, CMax unmixed.
-    a := smooth(1, if Z > 0.03 then Z else
-      IBPSA.Utilities.Math.Functions.smoothMin(
-              x1=0.02,
-              x2=Z,
-              deltaX=0.01));
-    NTU := -Modelica.Math.log(1+Z*Modelica.Math.log(1-eps))/Z;
-  elseif (flowRegime == Integer(f.ConstantTemperaturePhaseChange)) then
-    // one side is experiencing constant temperature phase change
-    // Z is unused
-    a := 0;
-    NTU := -Modelica.Math.log((1-eps));
-  else
-    a := 0;
-    NTU := 0;
-    assert(Integer(f.ParallelFlow) <= flowRegime and
-           flowRegime <= Integer(f.ConstantTemperaturePhaseChange),
-           "Flow regime is not implemented.");
-  end if;
-
-  annotation (preferredView="info",
-             inverse(eps=IBPSA.Fluid.HeatExchangers.BaseClasses.epsilon_ntuZ(NTU=NTU, Z=Z, flowRegime=flowRegime)),
-           smoothOrder=1,
-Documentation(info="
+       1/(Z+1) = " + String(1 / a));
+    NTU := -Modelica.Math.log(1 - eps * a) / a;
+  elseif flowRegime == Integer(f.CounterFlow) then
+    a := smooth(1, if Z < 0.97 then Z else IBPSA.Utilities.Math.Functions.smoothMin(x1 = Z, x2 = 0.98, deltaX = 0.01));
+    NTU := Modelica.Math.log((1 - eps) / (1 - eps * a)) / (a - 1);
+  elseif flowRegime == Integer(f.CrossFlowUnmixed) then
+    a := 0;
+    NTU := IBPSA.Fluid.HeatExchangers.BaseClasses.Internal.solve(y_zero = eps, x_min = 1.5 * 1e-10, x_max = 1E6, pressure = Z, f_nonlinear_data = dummy);
+  elseif flowRegime == Integer(f.CrossFlowCMinUnmixedCMaxMixed) then
+    a := smooth(1, if Z > 0.03 then Z else IBPSA.Utilities.Math.Functions.smoothMin(x1 = 0.02, x2 = Z, deltaX = 0.01));
+    NTU := -Modelica.Math.log(1 + Modelica.Math.log(1 - eps * a) / a);
+  elseif flowRegime == Integer(f.CrossFlowCMinMixedCMaxUnmixed) then
+    a := smooth(1, if Z > 0.03 then Z else IBPSA.Utilities.Math.Functions.smoothMin(x1 = 0.02, x2 = Z, deltaX = 0.01));
+    NTU := -Modelica.Math.log(1 + Z * Modelica.Math.log(1 - eps)) / Z;
+  elseif flowRegime == Integer(f.ConstantTemperaturePhaseChange) then
+    a := 0;
+    NTU := -Modelica.Math.log(1 - eps);
+  else
+    a := 0;
+    NTU := 0;
+    assert(Integer(f.ParallelFlow) <= flowRegime and flowRegime <= Integer(f.ConstantTemperaturePhaseChange), "Flow regime is not implemented.");
+  end if;
+// parallel flow
+// counter flow
+// a is constraining Z since eps is not defined for Z=1.
+// The function Internal.solve evaluates epsilon_ntuZ at NTU=x_min-1e-10 and NTU=x_max+1e-10
+// when it solves iteratively epsilon_ntuZ for ntu
+// Therefore, we set x_min=1.5*1e-10 to prevent computing NTU^(-0.22)=(-1e-10)^(-0.22).
+// cross flow, (single pass), CMax mixed, CMin unmixed. (Coil with one row.)
+// cross flow, (single pass), CMin mixed, CMax unmixed.
+// one side is experiencing constant temperature phase change
+// Z is unused
+  annotation(
+    preferredView = "info",
+    inverse(eps = IBPSA.Fluid.HeatExchangers.BaseClasses.epsilon_ntuZ(NTU = NTU, Z = Z, flowRegime = flowRegime)),
+    smoothOrder = 1,
+    Documentation(info = "
 
      
 This function computes the number of transfer units for a given heat exchanger effectiveness,
 capacity flow ratio and heat exchanger flow regime.
@@ -86,8 +64,7 @@
 function requires the numerical solution of an equation in one variable.
 This is handled internally and not exposed to the global solver.
 
      
-",
-revisions="
+", revisions = "
 
        
 
      • 
 September 28, 2016, by Massimo Cimmino:
        
@@ -120,5 +97,5 @@
 First implementation.
 
        • 
 
      
-"));
-end ntu_epsilonZ;
+"));
+end ntu_epsilonZ;
\ No newline at end of file
Only in converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/BaseClasses: ntu_epsilonZ.mo.after
Only in converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/BaseClasses: ntu_epsilonZ.mo.before
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/BaseClasses/prandtlNumberWater.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/BaseClasses/prandtlNumberWater.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/BaseClasses/prandtlNumberWater.mo"	2022-03-10 09:57:39.684144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/BaseClasses/prandtlNumberWater.mo"	2022-03-10 09:58:15.048148820 +0000
@@ -1,13 +1,13 @@
 within BuildSysPro.IBPSA.Fluid.HeatExchangers.BaseClasses;
 function prandtlNumberWater "Returns the Prandtl number for water"
-    input Modelica.SIunits.Temperature T "Thermodynamic state record";
+    input Modelica.Units.SI.Temperature T "Thermodynamic state record";
     output Real Pr "Prandtl number";
 algorithm
         Pr := ((2.55713*10^(-7))*T^4-0.000350293*T^3+0.180259651*T^2-
         41.34104323*T+3571.372195);
-        //Equation is a fourth order polynomial fit to data from Fundamentals
-        //of Heat and Mass Transfer (Fourth Edition), Frank Incropera & David DeWitt,
-        //John Wiley & Sons, 1996
+//Equation is a fourth order polynomial fit to data from Fundamentals
+//of Heat and Mass Transfer (Fourth Edition), Frank Incropera & David DeWitt,
+//John Wiley & Sons, 1996
 
 annotation(Documentation(info = "
 
      
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/ConstantEffectiveness.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/ConstantEffectiveness.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/ConstantEffectiveness.mo"	2022-03-10 09:57:39.684144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/ConstantEffectiveness.mo"	2022-03-10 09:58:15.036148820 +0000
@@ -10,7 +10,7 @@
     mWat1_flow=0,
     mWat2_flow=0);
 
-  parameter Modelica.SIunits.Efficiency eps(max=1) = 0.8
+  parameter Modelica.Units.SI.Efficiency eps(max=1) = 0.8
     "Heat exchanger effectiveness";
 
   annotation (Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/EvaporatorCondenser.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/EvaporatorCondenser.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/EvaporatorCondenser.mo"	2022-03-10 09:57:39.684144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/EvaporatorCondenser.mo"	2022-03-10 09:58:15.024148818 +0000
@@ -5,9 +5,9 @@
             IBPSA.Fluid.MixingVolumes.MixingVolume vol(final
         prescribedHeatFlowRate=false));
 
-  parameter Modelica.SIunits.ThermalConductance UA
+  parameter Modelica.Units.SI.ThermalConductance UA
     "Thermal conductance of heat exchanger";
-  parameter Modelica.SIunits.ThermalConductance UA_small=UA/10
+  parameter Modelica.Units.SI.ThermalConductance UA_small=UA/10
     "Small thermal conductance for regularisation of heat transfer "
     annotation(Dialog(tab = "Advanced"));
 
@@ -22,11 +22,11 @@
     annotation (Placement(transformation(extent={{-5,-55},{5,-65}}),
         iconTransformation(extent={{-5,-55},{5,-65}})));
 
-  Modelica.SIunits.Efficiency NTU = UA /
+  Modelica.Units.SI.Efficiency NTU = UA /
     (IBPSA.Utilities.Math.Functions.smoothMax(abs(port_a.m_flow),m_flow_small,m_flow_small)*cp_default)
    "Number of transfer units of heat exchanger";
 
-  Modelica.SIunits.Efficiency eps=
+  Modelica.Units.SI.Efficiency eps=
     IBPSA.Utilities.Math.Functions.smoothMin(
       IBPSA.Fluid.HeatExchangers.BaseClasses.epsilon_ntuZ(
       NTU,
@@ -45,7 +45,7 @@
     annotation (Placement(transformation(extent={{-88,-80},{-68,-60}})));
 
 protected
-  parameter Modelica.SIunits.SpecificHeatCapacity cp_default=
+  parameter Modelica.Units.SI.SpecificHeatCapacity cp_default=
     Medium.specificHeatCapacityCp(sta_default)
      "Density, used to compute fluid volume";
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/Examples/BaseClasses/Heater.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/Examples/BaseClasses/Heater.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/Examples/BaseClasses/Heater.mo"	2022-03-10 09:57:39.684144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/Examples/BaseClasses/Heater.mo"	2022-03-10 09:58:14.976148811 +0000
@@ -5,11 +5,11 @@
       Modelica.Media.Interfaces.PartialMedium
     "Medium model";
 
-  parameter Modelica.SIunits.Volume V = 6*6*2.7 "Volume";
+  parameter Modelica.Units.SI.Volume V = 6*6*2.7 "Volume";
 
-  parameter Modelica.SIunits.MassFlowRate m_flow_nominal = V*1.2*6/3600
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = V*1.2*6/3600
     "Nominal mass flow rate";
-  parameter Modelica.SIunits.HeatFlowRate Q_flow_nominal = 30*6*6
+  parameter Modelica.Units.SI.HeatFlowRate Q_flow_nominal = 30*6*6
     "Nominal heat loss of the room";
 
   IBPSA.Fluid.MixingVolumes.MixingVolume vol(
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/HeaterCooler_u.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/HeaterCooler_u.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/HeaterCooler_u.mo"	2022-03-10 09:57:39.684144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/HeaterCooler_u.mo"	2022-03-10 09:58:14.908148802 +0000
@@ -4,7 +4,7 @@
             IBPSA.Fluid.MixingVolumes.MixingVolume vol(final
         prescribedHeatFlowRate=true));
 
-  parameter Modelica.SIunits.HeatFlowRate Q_flow_nominal
+  parameter Modelica.Units.SI.HeatFlowRate Q_flow_nominal
     "Heat flow rate at u=1, positive for heating";
   Modelica.Blocks.Interfaces.RealInput u(unit="1") "Control input"
     annotation (Placement(transformation(
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/Heater_T.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/Heater_T.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/Heater_T.mo"	2022-03-10 09:57:39.684144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/Heater_T.mo"	2022-03-10 09:58:14.884148800 +0000
@@ -13,15 +13,15 @@
       final T_start=T_start,
       final X_start=Medium.X_default));
 
-  parameter Modelica.SIunits.HeatFlowRate QMax_flow(min=0) = Modelica.Constants.inf
+  parameter Modelica.Units.SI.HeatFlowRate QMax_flow(min=0) = Modelica.Constants.inf
     "Maximum heat flow rate for heating (positive)"
     annotation (Evaluate=true);
 
-  parameter Modelica.SIunits.Temperature T_start=Medium.T_default
+  parameter Modelica.Units.SI.Temperature T_start=Medium.T_default
     "Start value of temperature"
     annotation(Dialog(tab = "Initialization"));
 
-  // Dynamics
+// Dynamics
   parameter Modelica.Fluid.Types.Dynamics energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState
     "Type of energy balance: dynamic (3 initialization options) or steady state"
     annotation(Evaluate=true, Dialog(tab = "Dynamics", group="Equations"));
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/PrescribedOutlet.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/PrescribedOutlet.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/PrescribedOutlet.mo"	2022-03-10 09:57:39.684144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/PrescribedOutlet.mo"	2022-03-10 09:58:14.856148796 +0000
@@ -14,28 +14,28 @@
       final energyDynamics=energyDynamics,
       final massDynamics=massDynamics));
 
-  parameter Modelica.SIunits.HeatFlowRate QMax_flow(min=0) = Modelica.Constants.inf
+  parameter Modelica.Units.SI.HeatFlowRate QMax_flow(min=0) = Modelica.Constants.inf
     "Maximum heat flow rate for heating (positive)"
     annotation (Evaluate=true, Dialog(enable=use_TSet));
-  parameter Modelica.SIunits.HeatFlowRate QMin_flow(max=0) = -Modelica.Constants.inf
+  parameter Modelica.Units.SI.HeatFlowRate QMin_flow(max=0) = -Modelica.Constants.inf
     "Maximum heat flow rate for cooling (negative)"
     annotation (Evaluate=true, Dialog(enable=use_TSet));
 
-  parameter Modelica.SIunits.MassFlowRate mWatMax_flow(min=0) = Modelica.Constants.inf
+  parameter Modelica.Units.SI.MassFlowRate mWatMax_flow(min=0) = Modelica.Constants.inf
     "Maximum water mass flow rate addition (positive)"
     annotation (Evaluate=true, Dialog(enable=use_X_wSet));
-  parameter Modelica.SIunits.MassFlowRate mWatMin_flow(max=0) = -Modelica.Constants.inf
+  parameter Modelica.Units.SI.MassFlowRate mWatMin_flow(max=0) = -Modelica.Constants.inf
     "Maximum water mass flow rate removal (negative)"
     annotation (Evaluate=true, Dialog(enable=use_X_wSet));
 
-  parameter Modelica.SIunits.Temperature T_start = Medium.T_default
+  parameter Modelica.Units.SI.Temperature T_start = Medium.T_default
     "Start value of temperature"
     annotation(Dialog(tab = "Initialization", enable=use_TSet));
-  parameter Modelica.SIunits.MassFraction X_start[Medium.nX] = Medium.X_default
+  parameter Modelica.Units.SI.MassFraction X_start[Medium.nX] = Medium.X_default
     "Start value of mass fractions m_i/m"
     annotation (Dialog(tab="Initialization", enable=use_X_wSet and Medium.nXi > 0));
 
-  // Dynamics
+// Dynamics
   parameter Modelica.Fluid.Types.Dynamics energyDynamics = Modelica.Fluid.Types.Dynamics.SteadyState
     "Type of energy balance: dynamic (3 initialization options) or steady state"
     annotation(Evaluate=true, Dialog(tab = "Dynamics", group="Equations", enable=use_TSet));
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/Radiators/Examples/RadiatorEN442_2.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/Radiators/Examples/RadiatorEN442_2.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/Radiators/Examples/RadiatorEN442_2.mo"	2022-03-10 09:57:39.684144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/Radiators/Examples/RadiatorEN442_2.mo"	2022-03-10 09:58:14.724148779 +0000
@@ -2,17 +2,17 @@
 model RadiatorEN442_2 "Test model for radiator"
   extends Modelica.Icons.Example;
  package Medium = IBPSA.Media.Water "Medium model";
- parameter Modelica.SIunits.Temperature TRoo = 20+273.15 "Room temperature"
+ parameter Modelica.Units.SI.Temperature TRoo = 20+273.15 "Room temperature"
     annotation (Evaluate=false);
- parameter Modelica.SIunits.Power Q_flow_nominal = 500 "Nominal power";
-  parameter Modelica.SIunits.Temperature T_a_nominal=313.15
+ parameter Modelica.Units.SI.Power Q_flow_nominal = 500 "Nominal power";
+  parameter Modelica.Units.SI.Temperature T_a_nominal=313.15
     "Radiator inlet temperature at nominal condition";
- parameter Modelica.SIunits.Temperature T_b_nominal = 303.15
+ parameter Modelica.Units.SI.Temperature T_b_nominal = 303.15
     "Radiator outlet temperature at nominal condition";
- parameter Modelica.SIunits.MassFlowRate m_flow_nominal=
+ parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=
     Q_flow_nominal/(T_a_nominal-T_b_nominal)/Medium.cp_const
     "Nominal mass flow rate";
- parameter Modelica.SIunits.PressureDifference dp_nominal = 3000
+ parameter Modelica.Units.SI.PressureDifference dp_nominal = 3000
     "Pressure drop at m_flow_nominal";
 
   IBPSA.Fluid.Sources.Boundary_pT sou(
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/Radiators/RadiatorEN442_2.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/Radiators/RadiatorEN442_2.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/Radiators/RadiatorEN442_2.mo"	2022-03-10 09:57:39.684144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/Radiators/RadiatorEN442_2.mo"	2022-03-10 09:58:14.700148776 +0000
@@ -18,27 +18,27 @@
   parameter Real fraRad(min=0, max=1) = 0.35 "Fraction radiant heat transfer";
   // Assumptions
 
-  parameter Modelica.SIunits.Power Q_flow_nominal
+  parameter Modelica.Units.SI.Power Q_flow_nominal
     "Nominal heating power (positive for heating)"
     annotation(Dialog(group="Nominal condition"));
-  parameter Modelica.SIunits.Temperature T_a_nominal
+  parameter Modelica.Units.SI.Temperature T_a_nominal
     "Water inlet temperature at nominal condition"
     annotation(Dialog(group="Nominal condition"));
-  parameter Modelica.SIunits.Temperature T_b_nominal
+  parameter Modelica.Units.SI.Temperature T_b_nominal
     "Water outlet temperature at nominal condition"
     annotation(Dialog(group="Nominal condition"));
-  parameter Modelica.SIunits.Temperature TAir_nominal = 293.15
+  parameter Modelica.Units.SI.Temperature TAir_nominal = 293.15
     "Air temperature at nominal condition"
     annotation(Dialog(group="Nominal condition"));
-  parameter Modelica.SIunits.Temperature TRad_nominal = TAir_nominal
+  parameter Modelica.Units.SI.Temperature TRad_nominal = TAir_nominal
     "Radiative temperature at nominal condition"
     annotation(Dialog(group="Nominal condition"));
 
   parameter Real n = 1.24 "Exponent for heat transfer";
-  parameter Modelica.SIunits.Volume VWat = 5.8E-6*abs(Q_flow_nominal)
+  parameter Modelica.Units.SI.Volume VWat = 5.8E-6*abs(Q_flow_nominal)
     "Water volume of radiator"
     annotation(Dialog(tab = "Dynamics", enable = not (energyDynamics == Modelica.Fluid.Types.Dynamics.SteadyState)));
-  parameter Modelica.SIunits.Mass mDry = 0.0263*abs(Q_flow_nominal)
+  parameter Modelica.Units.SI.Mass mDry = 0.0263*abs(Q_flow_nominal)
     "Dry mass of radiator that will be lumped to water heat capacity"
     annotation(Dialog(tab = "Dynamics", enable = not (energyDynamics == Modelica.Fluid.Types.Dynamics.SteadyState)));
   parameter Boolean homotopyInitialization = true "= true, use homotopy method"
@@ -53,7 +53,7 @@
     "= true, use m_flow = f(dp) else dp = f(m_flow)"
     annotation (Evaluate=true, Dialog(tab="Advanced"));
 
-  parameter Modelica.SIunits.PressureDifference dp_nominal(displayUnit="Pa") = 0
+  parameter Modelica.Units.SI.PressureDifference dp_nominal(displayUnit="Pa") = 0
     "Pressure drop at nominal mass flow rate"
     annotation(Dialog(group = "Nominal condition"));
   parameter Boolean linearized = false
@@ -61,14 +61,14 @@
     annotation(Evaluate=true, Dialog(tab="Advanced"));
 
   // Heat flow rates
-  Modelica.SIunits.HeatFlowRate QCon_flow = heatPortCon.Q_flow
+  Modelica.Units.SI.HeatFlowRate QCon_flow = heatPortCon.Q_flow
     "Heat input into the water due to convective heat transfer with room air";
-  Modelica.SIunits.HeatFlowRate QRad_flow = heatPortRad.Q_flow
+  Modelica.Units.SI.HeatFlowRate QRad_flow = heatPortRad.Q_flow
     "Heat input into the water due to radiative heat transfer with room";
-  Modelica.SIunits.HeatFlowRate Q_flow = QCon_flow + QRad_flow
+  Modelica.Units.SI.HeatFlowRate Q_flow = QCon_flow + QRad_flow
     "Heat input into the water";
 
-  // Heat ports
+// Heat ports
   Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_a heatPortCon
     "Heat port for convective heat transfer with room air temperature"
     annotation (Placement(transformation(extent={{-30,62},{-10,82}})));
@@ -90,27 +90,27 @@
     each final mSenFac=mSenFac) "Volume for fluid stream"
     annotation (Placement(transformation(extent={{-9,0},{11,-20}})));
 protected
-   parameter Modelica.SIunits.SpecificHeatCapacity cp_nominal=
+   parameter Modelica.Units.SI.SpecificHeatCapacity cp_nominal=
       Medium.specificHeatCapacityCp(
         Medium.setState_pTX(Medium.p_default, T_a_nominal, Medium.X_default))
     "Specific heat capacity at nominal conditions";
-   parameter Modelica.SIunits.HeatFlowRate QEle_flow_nominal[nEle](
+   parameter Modelica.Units.SI.HeatFlowRate QEle_flow_nominal[nEle](
       each fixed=false, each start=Q_flow_nominal/nEle)
     "Nominal heating power of each element";
-   parameter Modelica.SIunits.Temperature TWat_nominal[nEle](
+   parameter Modelica.Units.SI.Temperature TWat_nominal[nEle](
       each fixed=false,
       start={T_a_nominal - i/nEle * (T_a_nominal-T_b_nominal) for i in 1:nEle})
     "Water temperature in each element at nominal conditions";
-   parameter Modelica.SIunits.TemperatureDifference[nEle] dTRad_nominal(
+   parameter Modelica.Units.SI.TemperatureDifference[nEle] dTRad_nominal(
     each fixed=false, start={T_a_nominal - i/nEle * (T_a_nominal-T_b_nominal) - TRad_nominal
     for i in 1:nEle})
     "Temperature difference for radiative heat transfer at nominal conditions";
-   parameter Modelica.SIunits.TemperatureDifference[nEle] dTCon_nominal(
+   parameter Modelica.Units.SI.TemperatureDifference[nEle] dTCon_nominal(
     each fixed=false, start={T_a_nominal - i/nEle * (T_a_nominal-T_b_nominal) - TAir_nominal
     for i in 1:nEle})
     "Temperature difference for convective heat transfer at nominal conditions";
 
-   parameter Modelica.SIunits.ThermalConductance UAEle(fixed=false, min=0,
+   parameter Modelica.Units.SI.ThermalConductance UAEle(fixed=false, min=0,
      start=Q_flow_nominal/((T_a_nominal+T_b_nominal)/2-((1-fraRad)*TAir_nominal+fraRad*TRad_nominal))/nEle)
     "UA value at nominal condition for each element";
 
@@ -126,9 +126,9 @@
     "Heat input into radiator from radiative heat transfer"
      annotation (Placement(transformation(extent={{-48,-80},{-28,-60}})));
 
-   Modelica.SIunits.TemperatureDifference dTCon[nEle] = {heatPortCon.T - vol[i].T for i in 1:nEle}
+   Modelica.Units.SI.TemperatureDifference dTCon[nEle] = {heatPortCon.T - vol[i].T for i in 1:nEle}
     "Temperature difference for convective heat transfer";
-   Modelica.SIunits.TemperatureDifference dTRad[nEle] = {heatPortRad.T - vol[i].T for i in 1:nEle}
+   Modelica.Units.SI.TemperatureDifference dTRad[nEle] = {heatPortRad.T - vol[i].T for i in 1:nEle}
     "Temperature difference for radiative heat transfer";
 
   Modelica.Blocks.Sources.RealExpression QCon[nEle](y={if homotopyInitialization
@@ -209,7 +209,7 @@
   Q_flow_nominal = sum(QEle_flow_nominal);
 
   for i in 1:nEle loop
-    // Use difference, TWat_nominal[i] - TRad/Air_nominal, to avoid larger system of equations
+// Use difference, TWat_nominal[i] - TRad/Air_nominal, to avoid larger system of equations
     QEle_flow_nominal[i] = k*UAEle*(fraRad*
       IBPSA.Utilities.Math.Functions.powerLinearized(
               x=k*TWat_nominal[i] - TRad_nominal,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/SensibleCooler_T.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/SensibleCooler_T.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/SensibleCooler_T.mo"	2022-03-10 09:57:39.684144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/SensibleCooler_T.mo"	2022-03-10 09:58:14.632148768 +0000
@@ -14,15 +14,15 @@
       final T_start=T_start,
       final X_start=Medium.X_default));
 
-  parameter Modelica.SIunits.HeatFlowRate QMin_flow(max=0) = -Modelica.Constants.inf
+  parameter Modelica.Units.SI.HeatFlowRate QMin_flow(max=0) = -Modelica.Constants.inf
     "Maximum heat flow rate for cooling (negative)"
     annotation (Evaluate=true);
 
-  parameter Modelica.SIunits.Temperature T_start=Medium.T_default
+  parameter Modelica.Units.SI.Temperature T_start=Medium.T_default
     "Start value of temperature"
     annotation(Dialog(tab = "Initialization"));
 
-  // Dynamics
+// Dynamics
   parameter Modelica.Fluid.Types.Dynamics energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState
     "Type of energy balance: dynamic (3 initialization options) or steady state"
     annotation(Evaluate=true, Dialog(tab = "Dynamics", group="Equations"));
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/Validation/EvaporatorCondenser.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/Validation/EvaporatorCondenser.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/Validation/EvaporatorCondenser.mo"	2022-03-10 09:57:39.684144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/Validation/EvaporatorCondenser.mo"	2022-03-10 09:58:14.588148763 +0000
@@ -4,7 +4,7 @@
 
   package Medium = IBPSA.Media.Water "Medium model";
 
-  parameter Modelica.SIunits.MassFlowRate m_flow_nominal = 0.01
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = 0.01
     "Nominal mass flow rate";
 
   Modelica.Thermal.HeatTransfer.Sources.FixedTemperature ref(T=283.15)
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/Validation/HeaterCooler_u.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/Validation/HeaterCooler_u.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/Validation/HeaterCooler_u.mo"	2022-03-10 09:57:39.684144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/Validation/HeaterCooler_u.mo"	2022-03-10 09:58:14.568148760 +0000
@@ -4,7 +4,7 @@
 
   package Medium = IBPSA.Media.Air;
 
-  parameter Modelica.SIunits.MassFlowRate
+  parameter Modelica.Units.SI.MassFlowRate
     m_flow_nominal=3000/1000/20 "Nominal mass flow rate";
 
   IBPSA.Fluid.Sources.Boundary_pT sin(
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/Validation/PrescribedOutlet.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/Validation/PrescribedOutlet.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/Validation/PrescribedOutlet.mo"	2022-03-10 09:57:39.684144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatExchangers/Validation/PrescribedOutlet.mo"	2022-03-10 09:58:14.544148757 +0000
@@ -3,7 +3,7 @@
   "Model that demonstrates the ideal heater/cooler model for a prescribed outlet temperature, configured as steady-state"
   extends Modelica.Icons.Example;
   package Medium = IBPSA.Media.Water;
-  parameter Modelica.SIunits.MassFlowRate m_flow_nominal=0.1
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=0.1
     "Nominal mass flow rate";
   IBPSA.Fluid.Sources.Boundary_pT sin(
     redeclare package Medium = Medium,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/BaseClasses/PartialWaterToWater.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/BaseClasses/PartialWaterToWater.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/BaseClasses/PartialWaterToWater.mo"	2022-03-10 09:57:39.684144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/BaseClasses/PartialWaterToWater.mo"	2022-03-10 09:58:14.480148749 +0000
@@ -16,23 +16,23 @@
   parameter Real scaling_factor = 1.0
     "Scaling factor for heat pump capacity";
 
-  parameter Modelica.SIunits.ThermalConductance UACon
+  parameter Modelica.Units.SI.ThermalConductance UACon
     "Thermal conductance of condenser";
 
-  parameter Modelica.SIunits.ThermalConductance UAEva
+  parameter Modelica.Units.SI.ThermalConductance UAEva
     "Thermal conductance of evaporator";
 
-  parameter Modelica.SIunits.Time tau1=60
+  parameter Modelica.Units.SI.Time tau1=60
     "Time constant at nominal flow rate (used if energyDynamics1 <> Modelica.Fluid.Types.Dynamics.SteadyState)"
     annotation (Dialog(tab="Dynamics", group="Condenser"));
-  parameter Modelica.SIunits.Time tau2=60
+  parameter Modelica.Units.SI.Time tau2=60
     "Time constant at nominal flow rate (used if energyDynamics2 <> Modelica.Fluid.Types.Dynamics.SteadyState)"
     annotation (Dialog(tab="Dynamics", group="Evaporator"));
 
-  parameter Modelica.SIunits.Temperature T1_start=Medium1.T_default
+  parameter Modelica.Units.SI.Temperature T1_start=Medium1.T_default
     "Initial or guess value of set point"
     annotation (Dialog(tab="Dynamics", group="Condenser"));
-  parameter Modelica.SIunits.Temperature T2_start=Medium2.T_default
+  parameter Modelica.Units.SI.Temperature T2_start=Medium2.T_default
     "Initial or guess value of set point"
     annotation (Dialog(tab="Dynamics", group="Evaporator"));
 
@@ -46,10 +46,10 @@
   parameter Boolean enable_temperature_protection = true
     "Enable temperature protection"
     annotation(Evaluate=true, Dialog(group="Temperature protection"));
-  parameter Modelica.SIunits.Temperature TConMax = ref.TCri-5
+  parameter Modelica.Units.SI.Temperature TConMax = ref.TCri-5
     "Upper bound for condenser temperature"
     annotation(Dialog(enable=enable_temperature_protection, group="Temperature protection"));
-  parameter Modelica.SIunits.Temperature TEvaMin = 275.15
+  parameter Modelica.Units.SI.Temperature TEvaMin = 275.15
     "Lower bound for evaporator temperature"
     annotation(Dialog(enable=enable_temperature_protection, group="Temperature protection"));
   parameter Real dTHys(unit="K",min=0) = 5
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Calibration/BaseClasses/PartialWaterToWater.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Calibration/BaseClasses/PartialWaterToWater.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Calibration/BaseClasses/PartialWaterToWater.mo"	2022-03-10 09:57:39.684144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Calibration/BaseClasses/PartialWaterToWater.mo"	2022-03-10 09:58:14.332148729 +0000
@@ -13,20 +13,20 @@
   replaceable package ref = IBPSA.Media.Refrigerants.R410A
     "Refrigerant model";
 
-  parameter Modelica.SIunits.MassFlowRate m1_flow_nominal
+  parameter Modelica.Units.SI.MassFlowRate m1_flow_nominal
     "Nominal mass flow rate on condenser side";
-  parameter Modelica.SIunits.MassFlowRate m2_flow_nominal
+  parameter Modelica.Units.SI.MassFlowRate m2_flow_nominal
     "Nominal mass flow rate on evaporator side";
 
-  parameter Modelica.SIunits.Pressure dp1_nominal = 1000
+  parameter Modelica.Units.SI.Pressure dp1_nominal = 1000
     "Pressure drop at nominal mass flow rate on condenser side";
-  parameter Modelica.SIunits.Pressure dp2_nominal = 1000
+  parameter Modelica.Units.SI.Pressure dp2_nominal = 1000
     "Pressure drop at nominal mass flow rate on evaporator side";
 
-  parameter Modelica.SIunits.ThermalConductance UACon
+  parameter Modelica.Units.SI.ThermalConductance UACon
     "Thermal conductance of condenser";
 
-  parameter Modelica.SIunits.ThermalConductance UAEva
+  parameter Modelica.Units.SI.ThermalConductance UAEva
     "Thermal conductance of evaporator";
 
   Modelica.Blocks.Sources.CombiTimeTable calDat(
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Calibration/ScrollWaterToWater.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Calibration/ScrollWaterToWater.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Calibration/ScrollWaterToWater.mo"	2022-03-10 09:57:39.684144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Calibration/ScrollWaterToWater.mo"	2022-03-10 09:58:14.304148727 +0000
@@ -27,21 +27,21 @@
   parameter Real volRat(min = 1.0, unit = "1") = 2.0
     "Built-in volume ratio";
 
-  parameter Modelica.SIunits.VolumeFlowRate V_flow_nominal(min = 0) = 0.009
+
+  parameter Modelica.Units.SI.VolumeFlowRate V_flow_nominal(min = 0) = 0.009
     "Refrigerant volume flow rate at suction";
 
-  parameter Modelica.SIunits.MassFlowRate leaCoe(min = 0) = 0.03
+  parameter Modelica.Units.SI.MassFlowRate leaCoe(min = 0) = 0.03
     "Leakage coefficient";
 
-  parameter Modelica.SIunits.Efficiency etaEle = 0.696
+  parameter Modelica.Units.SI.Efficiency etaEle = 0.696
     "Electro-mechanical efficiency of the compressor";
 
-  parameter Modelica.SIunits.Power PLos(min = 0) = 500.0
+  parameter Modelica.Units.SI.Power PLos(min = 0) = 500.0
     "Constant part of the compressor power losses";
 
-  parameter Modelica.SIunits.TemperatureDifference dTSup(min = 0) = 10.0
+  parameter Modelica.Units.SI.TemperatureDifference dTSup(min = 0) = 10.0
     "Superheating at compressor suction";
-
   annotation (Icon(coordinateSystem(preserveAspectRatio=false, extent={{-140,-100},
             {100,100}})),
     Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-140,-100},{100,100}}),
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Carnot_TCon.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Carnot_TCon.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Carnot_TCon.mo"	2022-03-10 09:57:39.684144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Carnot_TCon.mo"	2022-03-10 09:58:14.292148725 +0000
@@ -27,7 +27,7 @@
       final homotopyInitialization=homotopyInitialization,
       final Q_flow_nominal=QEva_flow_nominal));
 
-  parameter Modelica.SIunits.HeatFlowRate QCon_flow_max(
+  parameter Modelica.Units.SI.HeatFlowRate QCon_flow_max(
     min=0) = Modelica.Constants.inf
     "Maximum heat flow rate for heating (positive)";
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Compressors/BaseClasses/PartialCompressor.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Compressors/BaseClasses/PartialCompressor.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Compressors/BaseClasses/PartialCompressor.mo"	2022-03-10 09:57:39.684144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Compressors/BaseClasses/PartialCompressor.mo"	2022-03-10 09:58:14.248148720 +0000
@@ -26,31 +26,31 @@
       annotation (Placement(transformation(extent={{100,50},{120,70}},
           rotation=-90)));
 
-  Modelica.SIunits.SpecificEnthalpy hEva
+  Modelica.Units.SI.SpecificEnthalpy hEva
     "Specific enthalpy of saturated vapor at evaporator temperature";
 
-  Modelica.SIunits.SpecificEnthalpy hCon
+  Modelica.Units.SI.SpecificEnthalpy hCon
     "Specific enthalpy of saturated liquid at condenser temperature";
 
-  Modelica.SIunits.AbsolutePressure pEva(start = 100e3)
+  Modelica.Units.SI.AbsolutePressure pEva(start = 100e3)
     "Pressure of saturated vapor at evaporator temperature";
 
-  Modelica.SIunits.AbsolutePressure pCon(start = 1000e3)
+  Modelica.Units.SI.AbsolutePressure pCon(start = 1000e3)
     "Pressure of saturated liquid at condenser temperature";
 
-  Modelica.SIunits.AbsolutePressure pDis(start = 1000e3)
+  Modelica.Units.SI.AbsolutePressure pDis(start = 1000e3)
     "Discharge pressure of the compressor";
 
-  Modelica.SIunits.AbsolutePressure pSuc(start = 100e3)
+  Modelica.Units.SI.AbsolutePressure pSuc(start = 100e3)
     "Suction pressure of the compressor";
 
-  Modelica.SIunits.Temperature TSuc
+  Modelica.Units.SI.Temperature TSuc
     "Temperature at suction of the compressor";
 
   Boolean isOn(fixed=false)
     "State of the compressor, true if turned on";
 
-  Modelica.SIunits.SpecificVolume vSuc(start = 1e-4, min = 0)
+  Modelica.Units.SI.SpecificVolume vSuc(start = 1e-4, min = 0)
     "Specific volume of the refrigerant at suction of the compressor";
 
 protected
@@ -63,28 +63,21 @@
 equation
   isOn = not pre(isOn) and y > 0.01 or pre(isOn) and y >= 0.005;
 
-  PR = max(pDis/pSuc, 0);
-
-  // The specific volume at suction of the compressor is calculated
-  // from the Martin-Hou equation of state
-  vSuc = ref.specificVolumeVap_pT(pSuc, TSuc);
-
-  // Saturation pressure of refrigerant vapor at condenser temperature
-  pCon = ref.pressureSatVap_T(port_b.T);
-
-  // Specific enthaply of saturated liquid refrigerant at condenser temperature
-  hCon = ref.enthalpySatLiq_T(port_b.T);
-
-  // Saturation pressure of refrigerant vapor at evaporator temperature
-  pEva = ref.pressureSatVap_T(port_a.T);
-
-  // Specific enthaply of saturated refrigerant vapor at evaporator temperature
-  hEva = ref.enthalpySatVap_T(port_a.T);
-
-  // Assert statements to verify that the refrigerant temperatures are within
-  // bounds of the property data in the refrigerant package
-  assert(port_b.T > ref.T_min and port_b.T < ref.TCri,
-    "Condensing temperature must be above the minimum refrigerant temperature
+  PR = max(pDis/pSuc, 0);
+// The specific volume at suction of the compressor is calculated
+// from the Martin-Hou equation of state
+  vSuc = ref.specificVolumeVap_pT(pSuc, TSuc);
+// Saturation pressure of refrigerant vapor at condenser temperature
+  pCon = ref.pressureSatVap_T(port_b.T);
+// Specific enthaply of saturated liquid refrigerant at condenser temperature
+  hCon = ref.enthalpySatLiq_T(port_b.T);
+// Saturation pressure of refrigerant vapor at evaporator temperature
+  pEva = ref.pressureSatVap_T(port_a.T);
+// Specific enthaply of saturated refrigerant vapor at evaporator temperature
+  hEva = ref.enthalpySatVap_T(port_a.T);
+// Assert statements to verify that the refrigerant temperatures are within
+// bounds of the property data in the refrigerant package
+  assert(port_b.T > ref.T_min and port_b.T < ref.TCri, "Condensing temperature must be above the minimum refrigerant temperature
     and below the critical temperature.");
   assert(port_a.T > ref.T_min and port_a.T < ref.TCri,
     "Evaporating temperature must be above the minimum refrigerant temperature
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Compressors/BaseClasses/TemperatureProtection.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Compressors/BaseClasses/TemperatureProtection.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Compressors/BaseClasses/TemperatureProtection.mo"	2022-03-10 09:57:39.684144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Compressors/BaseClasses/TemperatureProtection.mo"	2022-03-10 09:58:14.232148717 +0000
@@ -2,9 +2,9 @@
 model TemperatureProtection
   "Temperature protection for heat pump compressor"
   extends Modelica.Blocks.Icons.Block;
-  parameter Modelica.SIunits.Temperature TConMax
+  parameter Modelica.Units.SI.Temperature TConMax
     "Upper bound for condenser temperature";
-  parameter Modelica.SIunits.Temperature TEvaMin
+  parameter Modelica.Units.SI.Temperature TEvaMin
     "Lower bound for evaporator temperature";
   parameter Real dTHys(
     final unit="K",
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Compressors/BaseClasses/Validation/TemperatureProtection.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Compressors/BaseClasses/Validation/TemperatureProtection.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Compressors/BaseClasses/Validation/TemperatureProtection.mo"	2022-03-10 09:57:39.684144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Compressors/BaseClasses/Validation/TemperatureProtection.mo"	2022-03-10 09:58:14.196148713 +0000
@@ -8,12 +8,12 @@
     "Temperature protection block"
     annotation (Placement(transformation(extent={{-20,0},{0,20}})));
   Modelica.Blocks.Sources.Cosine TEva(
-    freqHz=1,
+    f =1,
     amplitude=10,
     offset=283.15) "Evaporator temperature"
     annotation (Placement(transformation(extent={{-80,-40},{-60,-20}})));
   Modelica.Blocks.Sources.Cosine TCon(
-    freqHz=1.2,
+    f =1.2,
     offset=303.15,
     amplitude=20) "Condenser temperature"
     annotation (Placement(transformation(extent={{-80,40},{-60,60}})));
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Compressors/ReciprocatingCompressor.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Compressors/ReciprocatingCompressor.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Compressors/ReciprocatingCompressor.mo"	2022-03-10 09:57:39.684144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Compressors/ReciprocatingCompressor.mo"	2022-03-10 09:58:14.180148710 +0000
@@ -3,7 +3,7 @@
   "Model for a reciprocating compressor, based on Jin (2002)"
   extends IBPSA.Fluid.HeatPumps.Compressors.BaseClasses.PartialCompressor;
 
-  parameter Modelica.SIunits.VolumeFlowRate pisDis
+  parameter Modelica.Units.SI.VolumeFlowRate pisDis
     "Piston displacement";
 
   parameter Real cleFac(
@@ -11,78 +11,68 @@
     final unit = "1")
     "Clearance factor";
 
-  parameter Modelica.SIunits.Efficiency etaEle
+  parameter Modelica.Units.SI.Efficiency etaEle
     "Electro-mechanical efficiency of the compressor";
 
-  parameter Modelica.SIunits.Power PLos(min = 0)
+  parameter Modelica.Units.SI.Power PLos(min = 0)
     "Constant part of the compressor power losses";
 
-  parameter Modelica.SIunits.AbsolutePressure pDro
+  parameter Modelica.Units.SI.AbsolutePressure pDro
     "Pressure drop at suction and discharge of the compressor";
 
-  parameter Modelica.SIunits.TemperatureDifference dTSup(min = 0)
+  parameter Modelica.Units.SI.TemperatureDifference dTSup(min = 0)
     "Superheating at compressor suction";
 
-  Modelica.SIunits.MassFlowRate m_flow
+  Modelica.Units.SI.MassFlowRate m_flow
     "Refrigerant mass flow rate";
 
-  Modelica.SIunits.Power PThe
+  Modelica.Units.SI.Power PThe
     "Theoretical power consumed by the compressor";
 
-  Modelica.SIunits.Efficiency COP
+  Modelica.Units.SI.Efficiency COP
     "Heating COP of the compressor";
 
 protected
-  Modelica.SIunits.IsentropicExponent k(start = 1.2)
+  Modelica.Units.SI.IsentropicExponent k(start = 1.2)
     "Isentropic exponent of the refrigerant";
 
   Real pisDis_norm
     "Normalized piston displacement at part load conditions";
 
-equation
-  // Limit compressor speed to the full load speed
-  pisDis_norm = IBPSA.Utilities.Math.Functions.smoothLimit(
-            y,
-            0.0,
-            1.0,
-            0.001);
-
-  if isOn then
-    // Suction pressure
-    pSuc = IBPSA.Utilities.Math.Functions.smoothMin(
-              pEva - pDro,
-              pCon - pDro,
-              0.01*ref.pCri);
-    // Discharge pressure
-    pDis = pCon + pDro;
-    // Refrigerant mass flow rate
-    k = ref.isentropicExponentVap_Tv(TSuc, vSuc);
-    m_flow = pisDis_norm*pisDis/vSuc*(1 + cleFac
-       - cleFac*(PR)^(1/k));
-    // Theoretical power of the compressor
-    PThe = k/(k-1) * m_flow*pSuc*vSuc*((PR)^((k-1)/k)-1);
-    // Power consumed by the compressor
-    P = PThe/etaEle + PLos;
-    // Temperature at suction of the compressor
-    TSuc = port_a.T + dTSup;
-    // Energy balance of the compressor
-    port_a.Q_flow = m_flow * (hEva - hCon);
-    port_b.Q_flow = - (port_a.Q_flow + P);
-    -port_b.Q_flow = P * COP;
-  else
-    // Heat pump is turned off
-    k = 1.0;
-    pSuc = pEva;
-    pDis = pCon;
-    m_flow = 0;
-    PThe = 0;
-    P = 0;
-    TSuc = port_a.T;
-    port_a.Q_flow = 0;
-    port_b.Q_flow = 0;
-    COP = 1.0;
+equation
+// Limit compressor speed to the full load speed
+  pisDis_norm = IBPSA.Utilities.Math.Functions.smoothLimit(y, 0.0, 1.0, 0.001);
+  if isOn then
+// Suction pressure
+    pSuc = IBPSA.Utilities.Math.Functions.smoothMin(pEva - pDro, pCon - pDro, 0.01 * ref.pCri);
+// Discharge pressure
+    pDis = pCon + pDro;
+// Refrigerant mass flow rate
+    k = ref.isentropicExponentVap_Tv(TSuc, vSuc);
+    m_flow = pisDis_norm * pisDis / vSuc * (1 + cleFac - cleFac * PR ^ (1 / k));
+// Theoretical power of the compressor
+    PThe = k / (k - 1) * m_flow * pSuc * vSuc * (PR ^ ((k - 1) / k) - 1);
+// Power consumed by the compressor
+    P = PThe / etaEle + PLos;
+// Temperature at suction of the compressor
+    TSuc = port_a.T + dTSup;
+// Energy balance of the compressor
+    port_a.Q_flow = m_flow * (hEva - hCon);
+    port_b.Q_flow = -(port_a.Q_flow + P);
+    -port_b.Q_flow = P * COP;
+  else
+// Heat pump is turned off
+    k = 1.0;
+    pSuc = pEva;
+    pDis = pCon;
+    m_flow = 0;
+    PThe = 0;
+    P = 0;
+    TSuc = port_a.T;
+    port_a.Q_flow = 0;
+    port_b.Q_flow = 0;
+    COP = 1.0;
   end if;
-
   annotation (    defaultComponentName="scrCom",
     Documentation(info="
 
      
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Compressors/ScrollCompressor.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Compressors/ScrollCompressor.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Compressors/ScrollCompressor.mo"	2022-03-10 09:57:39.684144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Compressors/ScrollCompressor.mo"	2022-03-10 09:58:14.172148710 +0000
@@ -8,35 +8,35 @@
     final unit = "1")
     "Built-in volume ratio";
 
-  parameter Modelica.SIunits.VolumeFlowRate V_flow_nominal(min=0)
+  parameter Modelica.Units.SI.VolumeFlowRate V_flow_nominal(min=0)
     "Refrigerant volume flow rate at suction at full load conditions";
 
-  parameter Modelica.SIunits.MassFlowRate leaCoe(
+  parameter Modelica.Units.SI.MassFlowRate leaCoe(
     min = 0)
     "Leakage mass flow rate at a pressure ratio of 1";
 
-  parameter Modelica.SIunits.Efficiency etaEle
+  parameter Modelica.Units.SI.Efficiency etaEle
     "Electro-mechanical efficiency of the compressor";
 
-  parameter Modelica.SIunits.Power PLos(min = 0)
+  parameter Modelica.Units.SI.Power PLos(min = 0)
     "Constant part of the compressor power losses";
 
-  parameter Modelica.SIunits.TemperatureDifference dTSup(min = 0)
+  parameter Modelica.Units.SI.TemperatureDifference dTSup(min = 0)
     "Superheating at compressor suction";
 
-  Modelica.SIunits.MassFlowRate m_flow
+  Modelica.Units.SI.MassFlowRate m_flow
     "Refrigerant mass flow rate";
 
-  Modelica.SIunits.MassFlowRate mLea_flow "Refrigerant leakage mass flow rate";
+  Modelica.Units.SI.MassFlowRate mLea_flow "Refrigerant leakage mass flow rate";
 
-  Modelica.SIunits.Power PThe
+  Modelica.Units.SI.Power PThe
     "Theoretical power consumed by the compressor";
 
-  Modelica.SIunits.Efficiency COP
+  Modelica.Units.SI.Efficiency COP
     "Heating COP of the compressor";
 
 protected
-  Modelica.SIunits.IsentropicExponent k(start = 1.2)
+  Modelica.Units.SI.IsentropicExponent k(start = 1.2)
     "Isentropic exponent of the refrigerant";
 
   Real v_norm
@@ -47,61 +47,46 @@
     "Built-in pressure ratio";
 
 equation
-  PRInt = volRat^k;
-
-  // Limit compressor speed to the full load speed
-  v_norm = IBPSA.Utilities.Math.Functions.smoothLimit(
-            y,
-            0.0,
-            1.0,
-            0.001);
-
-  if isOn then
-    // Suction pressure
-    pSuc = pEva;
-    // Discharge pressure
-    pDis = pCon;
-    // Refrigerant mass flow rate
-    mLea_flow = leaCoe*PR;
-    m_flow = v_norm*IBPSA.Utilities.Math.Functions.smoothMax(
-              V_flow_nominal/vSuc - mLea_flow,
-              1e-5*V_flow_nominal/vSuc,
-              1e-6*V_flow_nominal/vSuc);
-
-    // Theoretical power of the compressor
-    k = ref.isentropicExponentVap_Tv(TSuc, vSuc);
-    // If the external pressure ratio does not match the built-in pressure ratio
-    PThe = v_norm * k/(k - 1.0) * pSuc * V_flow_nominal
-      * (((k - 1.0)/k) * PR/volRat + 1.0/k * PRInt^((k - 1.0)/k) - 1.0);
-    // This equation reduces to the  equation for the built-in pressure ratio
-    // if the external pressure ratio matches the built-in pressure ratio:
-    // PThe = v_norm * k/(k - 1.0) * pSuc*v_flow * ((PRInt)^((k - 1.0)/k) - 1.0)
-
-    // Temperature at suction of the compressor
-    TSuc = port_a.T + dTSup;
-
-    // Power consumed by the compressor
-    P = (PThe/etaEle + PLos);
-
-    // Energy balance of the compressor
-     port_a.Q_flow = m_flow * (hEva - hCon);
-     port_b.Q_flow = - (port_a.Q_flow + P);
-     -port_b.Q_flow = P * COP;
-  else
-    // Heat pump is turned off
-    k = 1.0;
-    pSuc = pEva;
-    pDis = pCon;
-    mLea_flow = 0.0;
-    m_flow = 0.0;
-    PThe = 0.0;
-    P = 0.0;
-    TSuc = port_a.T;
-    port_a.Q_flow = 0.0;
-    port_b.Q_flow = 0.0;
-    COP = 1.0;
+  PRInt = volRat^k;
+// Limit compressor speed to the full load speed
+  v_norm = IBPSA.Utilities.Math.Functions.smoothLimit(y, 0.0, 1.0, 0.001);
+  if isOn then
+// Suction pressure
+    pSuc = pEva;
+// Discharge pressure
+    pDis = pCon;
+// Refrigerant mass flow rate
+    mLea_flow = leaCoe * PR;
+    m_flow = v_norm * IBPSA.Utilities.Math.Functions.smoothMax(V_flow_nominal / vSuc - mLea_flow, 1e-5 * V_flow_nominal / vSuc, 1e-6 * V_flow_nominal / vSuc);
+// Theoretical power of the compressor
+    k = ref.isentropicExponentVap_Tv(TSuc, vSuc);
+// If the external pressure ratio does not match the built-in pressure ratio
+    PThe = v_norm * k / (k - 1.0) * pSuc * V_flow_nominal * ((k - 1.0) / k * PR / volRat + 1.0 / k * PRInt ^ ((k - 1.0) / k) - 1.0);
+// This equation reduces to the  equation for the built-in pressure ratio
+// if the external pressure ratio matches the built-in pressure ratio:
+// PThe = v_norm * k/(k - 1.0) * pSuc*v_flow * ((PRInt)^((k - 1.0)/k) - 1.0)
+// Temperature at suction of the compressor
+    TSuc = port_a.T + dTSup;
+// Power consumed by the compressor
+    P = PThe / etaEle + PLos;
+// Energy balance of the compressor
+    port_a.Q_flow = m_flow * (hEva - hCon);
+    port_b.Q_flow = -(port_a.Q_flow + P);
+    -port_b.Q_flow = P * COP;
+  else
+// Heat pump is turned off
+    k = 1.0;
+    pSuc = pEva;
+    pDis = pCon;
+    mLea_flow = 0.0;
+    m_flow = 0.0;
+    PThe = 0.0;
+    P = 0.0;
+    TSuc = port_a.T;
+    port_a.Q_flow = 0.0;
+    port_b.Q_flow = 0.0;
+    COP = 1.0;
   end if;
-
   annotation (    defaultComponentName="scrCom",
     Documentation(info="
 
      
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Data/BaseClasses/HeatPumps.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Data/BaseClasses/HeatPumps.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Data/BaseClasses/HeatPumps.mo"	2022-03-10 09:57:39.684144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Data/BaseClasses/HeatPumps.mo"	2022-03-10 09:58:14.012148689 +0000
@@ -3,26 +3,26 @@
   "Base record for calibrated heat pump models"
   extends Modelica.Icons.Record;
 
-  parameter Modelica.SIunits.Efficiency etaEle
+
+  parameter Modelica.Units.SI.Efficiency etaEle
     "Electro-mechanical efficiency of the compressor"
     annotation (Dialog(group="Compressor"));
 
-  parameter Modelica.SIunits.Power PLos(min = 0)
+  parameter Modelica.Units.SI.Power PLos(min = 0)
     "Constant part of the compressor power losses"
     annotation (Dialog(group="Compressor"));
 
-  parameter Modelica.SIunits.TemperatureDifference dTSup(min = 0)
+  parameter Modelica.Units.SI.TemperatureDifference dTSup(min = 0)
     "Superheating at compressor suction"
     annotation (Dialog(group="Evaporator"));
 
-  parameter Modelica.SIunits.ThermalConductance UACon
+  parameter Modelica.Units.SI.ThermalConductance UACon
     "Thermal conductance of condenser between water and refrigerant"
     annotation (Dialog(group="Condenser"));
 
-  parameter Modelica.SIunits.ThermalConductance UAEva
+  parameter Modelica.Units.SI.ThermalConductance UAEva
     "Thermal conductance of evaporator between water and refrigerant"
     annotation (Dialog(group="Evaporator"));
-
   annotation (
     defaultComponentName="datHeaPum",
     preferredView="info",
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Data/ReciprocatingWaterToWater/Generic.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Data/ReciprocatingWaterToWater/Generic.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Data/ReciprocatingWaterToWater/Generic.mo"	2022-03-10 09:57:39.684144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Data/ReciprocatingWaterToWater/Generic.mo"	2022-03-10 09:58:14.000148688 +0000
@@ -2,7 +2,7 @@
 record Generic "Record for reciprocating water to water heat pump"
   extends BaseClasses.HeatPumps;
 
-  parameter Modelica.SIunits.VolumeFlowRate pisDis
+  parameter Modelica.Units.SI.VolumeFlowRate pisDis
     "Piston displacement"
     annotation (Dialog(group="Compressor"));
 
@@ -10,10 +10,10 @@
     "Clearance factor"
     annotation (Dialog(group="Compressor"));
 
-  parameter Modelica.SIunits.AbsolutePressure pDro
+
+  parameter Modelica.Units.SI.AbsolutePressure pDro
     "Pressure drop at suction and discharge of the compressor"
     annotation (Dialog(group="Compressor"));
-
   annotation (
     defaultComponentPrefixes = "parameter",
     defaultComponentName="datHeaPum",
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Data/ScrollWaterToWater/Generic.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Data/ScrollWaterToWater/Generic.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Data/ScrollWaterToWater/Generic.mo"	2022-03-10 09:57:39.684144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Data/ScrollWaterToWater/Generic.mo"	2022-03-10 09:58:13.984148685 +0000
@@ -8,14 +8,14 @@
     "Built-in volume ratio"
     annotation (Dialog(group="Compressor"));
 
-  parameter Modelica.SIunits.VolumeFlowRate V_flow_nominal(min=0)
+
+  parameter Modelica.Units.SI.VolumeFlowRate V_flow_nominal(min=0)
     "Refrigerant volume flow rate at suction"
     annotation (Dialog(group="Compressor"));
 
-  parameter Modelica.SIunits.MassFlowRate leaCoe(min = 0)
+  parameter Modelica.Units.SI.MassFlowRate leaCoe(min = 0)
     "Leakage coefficient"
     annotation (Dialog(group="Compressor"));
-
   annotation (
     defaultComponentPrefixes = "parameter",
     defaultComponentName="datHeaPum",
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Examples/Carnot_TCon.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Examples/Carnot_TCon.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Examples/Carnot_TCon.mo"	2022-03-10 09:57:39.684144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Examples/Carnot_TCon.mo"	2022-03-10 09:58:13.652148644 +0000
@@ -5,13 +5,13 @@
  package Medium1 = IBPSA.Media.Water "Medium model";
  package Medium2 = IBPSA.Media.Water "Medium model";
 
-  parameter Modelica.SIunits.TemperatureDifference dTEva_nominal=-5
+  parameter Modelica.Units.SI.TemperatureDifference dTEva_nominal=-5
     "Temperature difference evaporator inlet-outlet";
-  parameter Modelica.SIunits.TemperatureDifference dTCon_nominal=10
+  parameter Modelica.Units.SI.TemperatureDifference dTCon_nominal=10
     "Temperature difference condenser outlet-inlet";
-  parameter Modelica.SIunits.HeatFlowRate QCon_flow_nominal = 100E3
+  parameter Modelica.Units.SI.HeatFlowRate QCon_flow_nominal = 100E3
     "Evaporator heat flow rate";
-  parameter Modelica.SIunits.MassFlowRate m1_flow_nominal=
+  parameter Modelica.Units.SI.MassFlowRate m1_flow_nominal=
     QCon_flow_nominal/dTCon_nominal/4200 "Nominal mass flow rate at condenser";
 
   IBPSA.Fluid.HeatPumps.Carnot_TCon heaPum(
@@ -60,7 +60,7 @@
   Modelica.Blocks.Math.Add QEva_flow(k2=-1) "Evaporator heat flow rate"
     annotation (Placement(transformation(extent={{32,-48},{52,-28}})));
 
-  final parameter Modelica.SIunits.SpecificHeatCapacity cp2_default=
+  final parameter Modelica.Units.SI.SpecificHeatCapacity cp2_default=
     Medium2.specificHeatCapacityCp(Medium2.setState_pTX(
       Medium2.p_default,
       Medium2.T_default,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Examples/Carnot_y.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Examples/Carnot_y.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Examples/Carnot_y.mo"	2022-03-10 09:57:39.684144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Examples/Carnot_y.mo"	2022-03-10 09:58:13.628148641 +0000
@@ -5,16 +5,16 @@
  package Medium2 = IBPSA.Media.Water "Medium model";
   parameter Real COP_nominal = 6 "Nominal COP";
 
-  parameter Modelica.SIunits.Power P_nominal=10E3
+  parameter Modelica.Units.SI.Power P_nominal=10E3
     "Nominal compressor power (at y=1)";
-  parameter Modelica.SIunits.TemperatureDifference dTEva_nominal=-10
+  parameter Modelica.Units.SI.TemperatureDifference dTEva_nominal=-10
     "Temperature difference evaporator outlet-inlet";
-  parameter Modelica.SIunits.TemperatureDifference dTCon_nominal=10
+  parameter Modelica.Units.SI.TemperatureDifference dTCon_nominal=10
     "Temperature difference condenser outlet-inlet";
-  parameter Modelica.SIunits.MassFlowRate m2_flow_nominal=
+  parameter Modelica.Units.SI.MassFlowRate m2_flow_nominal=
      -P_nominal*(COP_nominal-1)/cp2_default/dTEva_nominal
     "Nominal mass flow rate at chilled water side";
-  parameter Modelica.SIunits.MassFlowRate m1_flow_nominal=
+  parameter Modelica.Units.SI.MassFlowRate m1_flow_nominal=
       P_nominal*COP_nominal/cp1_default/dTCon_nominal
     "Nominal mass flow rate at condenser water wide";
   IBPSA.Fluid.HeatPumps.Carnot_y heaPum(
@@ -70,14 +70,14 @@
     startTime=900,
     offset=273.15 + 15) "Evaporator inlet temperature"
     annotation (Placement(transformation(extent={{50,-40},{70,-20}})));
-  final parameter Modelica.SIunits.SpecificHeatCapacity cp1_default=
+  final parameter Modelica.Units.SI.SpecificHeatCapacity cp1_default=
     Medium1.specificHeatCapacityCp(Medium1.setState_pTX(
       Medium1.p_default,
       Medium1.T_default,
       Medium1.X_default))
     "Specific heat capacity of medium 2 at default medium state";
 
-  final parameter Modelica.SIunits.SpecificHeatCapacity cp2_default=
+  final parameter Modelica.Units.SI.SpecificHeatCapacity cp2_default=
     Medium2.specificHeatCapacityCp(Medium2.setState_pTX(
       Medium2.p_default,
       Medium2.T_default,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Examples/ScrollWaterToWater_OneRoomRadiator.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Examples/ScrollWaterToWater_OneRoomRadiator.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Examples/ScrollWaterToWater_OneRoomRadiator.mo"	2022-03-10 09:57:39.684144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Examples/ScrollWaterToWater_OneRoomRadiator.mo"	2022-03-10 09:58:13.612148638 +0000
@@ -7,18 +7,18 @@
   replaceable package MediumW =
       IBPSA.Media.Water "Medium model for water";
 
-  parameter Modelica.SIunits.HeatFlowRate Q_flow_nominal = 20000
+  parameter Modelica.Units.SI.HeatFlowRate Q_flow_nominal = 20000
     "Nominal heat flow rate of radiator";
-  parameter Modelica.SIunits.Temperature TRadSup_nominal = 273.15+50
+  parameter Modelica.Units.SI.Temperature TRadSup_nominal = 273.15+50
     "Radiator nominal supply water temperature";
-  parameter Modelica.SIunits.Temperature TRadRet_nominal = 273.15+45
+  parameter Modelica.Units.SI.Temperature TRadRet_nominal = 273.15+45
     "Radiator nominal return water temperature";
 
-  parameter Modelica.SIunits.MassFlowRate mHeaPum_flow_nominal=
+  parameter Modelica.Units.SI.MassFlowRate mHeaPum_flow_nominal=
     Q_flow_nominal/4200/5
     "Heat pump nominal mass flow rate";
-//------------------------------------------------------------------------------//
 
+//------------------------------------------------------------------------------//
   IBPSA.Fluid.MixingVolumes.MixingVolume vol(
     redeclare package Medium = MediumA,
     energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
@@ -28,10 +28,10 @@
   Modelica.Thermal.HeatTransfer.Components.ThermalConductor theCon(G=20000/40)
     "Thermal conductance with the ambient"
     annotation (Placement(transformation(extent={{20,40},{40,60}})));
-  parameter Modelica.SIunits.Volume V=6*10*3 "Room volume";
-  parameter Modelica.SIunits.MassFlowRate mA_flow_nominal = V*6/3600
+  parameter Modelica.Units.SI.Volume V=6*10*3 "Room volume";
+  parameter Modelica.Units.SI.MassFlowRate mA_flow_nominal = V*6/3600
     "Nominal mass flow rate";
-  parameter Modelica.SIunits.HeatFlowRate QRooInt_flow = 4000
+  parameter Modelica.Units.SI.HeatFlowRate QRooInt_flow = 4000
     "Internal heat gains of the room";
   Modelica.Thermal.HeatTransfer.Sources.PrescribedHeatFlow preHea
     "Prescribed heat flow"
@@ -68,8 +68,7 @@
         extent={{10,-10},{-10,10}},
         origin={-40,30})));
 
-//----------------------------------------------------------------------------//
-
+//----------------------------------------------------------------------------//
   IBPSA.Fluid.Movers.FlowControlled_m_flow pumHeaPum(
     redeclare package Medium = MediumW,
     m_flow_nominal=mHeaPum_flow_nominal,
@@ -83,8 +82,8 @@
         extent={{-10,-10},{10,10}},
         rotation=90,
         origin={-50,-100})));
-//----------------------------------------------------------------------------//
 
+//----------------------------------------------------------------------------//
   IBPSA.Fluid.Sources.FixedBoundary preSou(
     redeclare package Medium = MediumW,
     nPorts=1,
@@ -100,8 +99,7 @@
         rotation=270,
         origin={58,-20})));
 
-//------------------------------------------------------------------------------------//
-
+//------------------------------------------------------------------------------------//
   IBPSA.BoundaryConditions.WeatherData.ReaderTMY3 weaDat(filNam=
         Modelica.Utilities.Files.loadResource("modelica://BuildSysPro/Resources/IBPSA/weatherdata/USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.mos"))
     "Weather data reader" annotation (Placement(transformation(extent={{
@@ -112,8 +110,7 @@
     "Outside temperature"
     annotation (Placement(transformation(extent={{-20,40},{0,60}})));
 
-//--------------------------------------------------------------------------------------//
-
+//--------------------------------------------------------------------------------------//
   ScrollWaterToWater heaPum(
     redeclare package Medium1 = MediumW,
     redeclare package Medium2 = MediumW,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Validation/Carnot_TCon_reverseFlow.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Validation/Carnot_TCon_reverseFlow.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Validation/Carnot_TCon_reverseFlow.mo"	2022-03-10 09:57:39.684144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Validation/Carnot_TCon_reverseFlow.mo"	2022-03-10 09:58:13.420148615 +0000
@@ -5,20 +5,20 @@
  package Medium1 = IBPSA.Media.Water "Medium model";
  package Medium2 = IBPSA.Media.Water "Medium model";
 
-  parameter Modelica.SIunits.TemperatureDifference dTEva_nominal=-10
+  parameter Modelica.Units.SI.TemperatureDifference dTEva_nominal=-10
     "Temperature difference evaporator inlet-outlet";
-  parameter Modelica.SIunits.TemperatureDifference dTCon_nominal=10
+  parameter Modelica.Units.SI.TemperatureDifference dTCon_nominal=10
     "Temperature difference condenser outlet-inlet";
-  parameter Modelica.SIunits.HeatFlowRate QCon_flow_nominal = 100E3
+  parameter Modelica.Units.SI.HeatFlowRate QCon_flow_nominal = 100E3
     "Evaporator heat flow rate";
-  parameter Modelica.SIunits.MassFlowRate m1_flow_nominal=
+  parameter Modelica.Units.SI.MassFlowRate m1_flow_nominal=
     QCon_flow_nominal/dTCon_nominal/4200 "Nominal mass flow rate at condenser";
 
   Modelica.Blocks.Sources.Constant TConLvg(k=273.15 + 40)
     "Control signal for condenser leaving temperature"
     annotation (Placement(transformation(extent={{-50,30},{-30,50}})));
 
-  final parameter Modelica.SIunits.SpecificHeatCapacity cp2_default=
+  final parameter Modelica.Units.SI.SpecificHeatCapacity cp2_default=
     Medium2.specificHeatCapacityCp(Medium2.setState_pTX(
       Medium2.p_default,
       Medium2.T_default,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Validation/ReciprocatingWaterToWater_Dynamic.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Validation/ReciprocatingWaterToWater_Dynamic.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Validation/ReciprocatingWaterToWater_Dynamic.mo"	2022-03-10 09:57:39.684144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Validation/ReciprocatingWaterToWater_Dynamic.mo"	2022-03-10 09:58:13.380148608 +0000
@@ -5,14 +5,14 @@
   package Medium1 = IBPSA.Media.Water "Medium model";
   package Medium2 = IBPSA.Media.Water "Medium model";
 
-  parameter Modelica.SIunits.MassFlowRate m1_flow_nominal = 0.47
+  parameter Modelica.Units.SI.MassFlowRate m1_flow_nominal = 0.47
     "Nominal mass flow rate on the condenser side";
-  parameter Modelica.SIunits.MassFlowRate m2_flow_nominal = 0.47
+  parameter Modelica.Units.SI.MassFlowRate m2_flow_nominal = 0.47
     "Nominal mass flow rate on the evaporator side";
 
-  parameter Modelica.SIunits.MassFlowRate flowSource = 0.79
+  parameter Modelica.Units.SI.MassFlowRate flowSource = 0.79
     "Mass flow rate on the condenser side";
-  parameter Modelica.SIunits.MassFlowRate flowLoad = 0.47
+  parameter Modelica.Units.SI.MassFlowRate flowLoad = 0.47
     "Mass flow rate on the evaporator side";
 
   IBPSA.Fluid.Sources.FixedBoundary sin2(redeclare package Medium =
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Validation/ReciprocatingWaterToWater_ScalingFactor.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Validation/ReciprocatingWaterToWater_ScalingFactor.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Validation/ReciprocatingWaterToWater_ScalingFactor.mo"	2022-03-10 09:57:39.684144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Validation/ReciprocatingWaterToWater_ScalingFactor.mo"	2022-03-10 09:58:13.352148605 +0000
@@ -5,14 +5,14 @@
   package Medium1 = IBPSA.Media.Water "Medium model";
   package Medium2 = IBPSA.Media.Water "Medium model";
 
-  parameter Modelica.SIunits.MassFlowRate m1_flow_nominal = 0.47
+  parameter Modelica.Units.SI.MassFlowRate m1_flow_nominal = 0.47
     "Nominal mass flow rate on the condenser side";
-  parameter Modelica.SIunits.MassFlowRate m2_flow_nominal = 0.47
+  parameter Modelica.Units.SI.MassFlowRate m2_flow_nominal = 0.47
     "Nominal mass flow rate on the evaporator side";
 
-  parameter Modelica.SIunits.MassFlowRate flowSource = 0.79
+  parameter Modelica.Units.SI.MassFlowRate flowSource = 0.79
     "Mass flow rate on the condenser side";
-  parameter Modelica.SIunits.MassFlowRate flowLoad = 0.47
+  parameter Modelica.Units.SI.MassFlowRate flowLoad = 0.47
     "Mass flow rate on the evaporator side";
 
   parameter Real scaling_factor = 2.41
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Validation/ReciprocatingWaterToWater_Static.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Validation/ReciprocatingWaterToWater_Static.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Validation/ReciprocatingWaterToWater_Static.mo"	2022-03-10 09:57:39.684144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Validation/ReciprocatingWaterToWater_Static.mo"	2022-03-10 09:58:13.324148603 +0000
@@ -5,14 +5,14 @@
   package Medium1 = IBPSA.Media.Water "Medium model";
   package Medium2 = IBPSA.Media.Water "Medium model";
 
-  parameter Modelica.SIunits.MassFlowRate m1_flow_nominal = 0.47
+  parameter Modelica.Units.SI.MassFlowRate m1_flow_nominal = 0.47
     "Nominal mass flow rate on the condenser side";
-  parameter Modelica.SIunits.MassFlowRate m2_flow_nominal = 0.47
+  parameter Modelica.Units.SI.MassFlowRate m2_flow_nominal = 0.47
     "Nominal mass flow rate on the evaporator side";
 
-  parameter Modelica.SIunits.MassFlowRate flowSource = 0.79
+  parameter Modelica.Units.SI.MassFlowRate flowSource = 0.79
     "Mass flow rate on the condenser side";
-  parameter Modelica.SIunits.MassFlowRate flowLoad = 0.47
+  parameter Modelica.Units.SI.MassFlowRate flowLoad = 0.47
     "Mass flow rate on the evaporator side";
 
   IBPSA.Fluid.HeatPumps.ReciprocatingWaterToWater heaPum(
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Validation/ReciprocatingWaterToWater_VariableSpeed.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Validation/ReciprocatingWaterToWater_VariableSpeed.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Validation/ReciprocatingWaterToWater_VariableSpeed.mo"	2022-03-10 09:57:39.684144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Validation/ReciprocatingWaterToWater_VariableSpeed.mo"	2022-03-10 09:58:13.296148598 +0000
@@ -5,14 +5,14 @@
   package Medium1 = IBPSA.Media.Water "Medium model";
   package Medium2 = IBPSA.Media.Water "Medium model";
 
-  parameter Modelica.SIunits.MassFlowRate m1_flow_nominal = 0.47
+  parameter Modelica.Units.SI.MassFlowRate m1_flow_nominal = 0.47
     "Nominal mass flow rate on the condenser side";
-  parameter Modelica.SIunits.MassFlowRate m2_flow_nominal = 0.47
+  parameter Modelica.Units.SI.MassFlowRate m2_flow_nominal = 0.47
     "Nominal mass flow rate on the evaporator side";
 
-  parameter Modelica.SIunits.MassFlowRate flowSource = 0.79
+  parameter Modelica.Units.SI.MassFlowRate flowSource = 0.79
     "Mass flow rate on the condenser side";
-  parameter Modelica.SIunits.MassFlowRate flowLoad = 0.47
+  parameter Modelica.Units.SI.MassFlowRate flowLoad = 0.47
     "Mass flow rate on the evaporator side";
 
   IBPSA.Fluid.Sources.FixedBoundary sin2(redeclare package Medium =
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Validation/ScrollWaterToWater_Dynamic.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Validation/ScrollWaterToWater_Dynamic.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Validation/ScrollWaterToWater_Dynamic.mo"	2022-03-10 09:57:39.684144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Validation/ScrollWaterToWater_Dynamic.mo"	2022-03-10 09:58:13.260148593 +0000
@@ -5,14 +5,14 @@
   package Medium1 = IBPSA.Media.Water "Medium model";
   package Medium2 = IBPSA.Media.Water "Medium model";
 
-  parameter Modelica.SIunits.MassFlowRate m1_flow_nominal = 0.47
+  parameter Modelica.Units.SI.MassFlowRate m1_flow_nominal = 0.47
     "Nominal mass flow rate on the condenser side";
-  parameter Modelica.SIunits.MassFlowRate m2_flow_nominal = 0.47
+  parameter Modelica.Units.SI.MassFlowRate m2_flow_nominal = 0.47
     "Nominal mass flow rate on the evaporator side";
 
-  parameter Modelica.SIunits.MassFlowRate flowSource = 0.79
+  parameter Modelica.Units.SI.MassFlowRate flowSource = 0.79
     "Mass flow rate on the condenser side";
-  parameter Modelica.SIunits.MassFlowRate flowLoad = 0.47
+  parameter Modelica.Units.SI.MassFlowRate flowLoad = 0.47
     "Mass flow rate on the evaporator side";
 
   IBPSA.Fluid.Sources.FixedBoundary sin2(redeclare package Medium =
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Validation/ScrollWaterToWater_ScalingFactor.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Validation/ScrollWaterToWater_ScalingFactor.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Validation/ScrollWaterToWater_ScalingFactor.mo"	2022-03-10 09:57:39.684144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Validation/ScrollWaterToWater_ScalingFactor.mo"	2022-03-10 09:58:13.228148589 +0000
@@ -5,14 +5,14 @@
   package Medium1 = IBPSA.Media.Water "Medium model";
   package Medium2 = IBPSA.Media.Water "Medium model";
 
-  parameter Modelica.SIunits.MassFlowRate m1_flow_nominal = 0.47
+  parameter Modelica.Units.SI.MassFlowRate m1_flow_nominal = 0.47
     "Nominal mass flow rate on the condenser side";
-  parameter Modelica.SIunits.MassFlowRate m2_flow_nominal = 0.47
+  parameter Modelica.Units.SI.MassFlowRate m2_flow_nominal = 0.47
     "Nominal mass flow rate on the evaporator side";
 
-  parameter Modelica.SIunits.MassFlowRate flowSource = 0.79
+  parameter Modelica.Units.SI.MassFlowRate flowSource = 0.79
     "Mass flow rate on the condenser side";
-  parameter Modelica.SIunits.MassFlowRate flowLoad = 0.47
+  parameter Modelica.Units.SI.MassFlowRate flowLoad = 0.47
     "Mass flow rate on the evaporator side";
 
   parameter Real scaling_factor = 2.41
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Validation/ScrollWaterToWater_Static.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Validation/ScrollWaterToWater_Static.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Validation/ScrollWaterToWater_Static.mo"	2022-03-10 09:57:39.684144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Validation/ScrollWaterToWater_Static.mo"	2022-03-10 09:58:13.188148584 +0000
@@ -5,14 +5,14 @@
   package Medium1 = IBPSA.Media.Water "Medium model";
   package Medium2 = IBPSA.Media.Water "Medium model";
 
-  parameter Modelica.SIunits.MassFlowRate m1_flow_nominal = 0.47
+  parameter Modelica.Units.SI.MassFlowRate m1_flow_nominal = 0.47
     "Nominal mass flow rate on the condenser side";
-  parameter Modelica.SIunits.MassFlowRate m2_flow_nominal = 0.47
+  parameter Modelica.Units.SI.MassFlowRate m2_flow_nominal = 0.47
     "Nominal mass flow rate on the evaporator side";
 
-  parameter Modelica.SIunits.MassFlowRate flowSource = 0.79
+  parameter Modelica.Units.SI.MassFlowRate flowSource = 0.79
     "Mass flow rate on the condenser side";
-  parameter Modelica.SIunits.MassFlowRate flowLoad = 0.47
+  parameter Modelica.Units.SI.MassFlowRate flowLoad = 0.47
     "Mass flow rate on the evaporator side";
 
   IBPSA.Fluid.Sources.FixedBoundary sin2(redeclare package Medium =
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Validation/ScrollWaterToWater_TemperatureProtection.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Validation/ScrollWaterToWater_TemperatureProtection.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Validation/ScrollWaterToWater_TemperatureProtection.mo"	2022-03-10 09:57:39.684144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Validation/ScrollWaterToWater_TemperatureProtection.mo"	2022-03-10 09:58:13.120148576 +0000
@@ -5,14 +5,14 @@
   package Medium1 = IBPSA.Media.Water "Medium model";
   package Medium2 = IBPSA.Media.Water "Medium model";
 
-  parameter Modelica.SIunits.MassFlowRate m1_flow_nominal = 0.47
+  parameter Modelica.Units.SI.MassFlowRate m1_flow_nominal = 0.47
     "Nominal mass flow rate on the condenser side";
-  parameter Modelica.SIunits.MassFlowRate m2_flow_nominal = 0.47
+  parameter Modelica.Units.SI.MassFlowRate m2_flow_nominal = 0.47
     "Nominal mass flow rate on the evaporator side";
 
-  parameter Modelica.SIunits.MassFlowRate flowSource = 0.79
+  parameter Modelica.Units.SI.MassFlowRate flowSource = 0.79
     "Mass flow rate on the condenser side";
-  parameter Modelica.SIunits.MassFlowRate flowLoad = 0.47
+  parameter Modelica.Units.SI.MassFlowRate flowLoad = 0.47
     "Mass flow rate on the evaporator side";
 
   IBPSA.Fluid.Sources.FixedBoundary sin2(redeclare package Medium =
@@ -70,7 +70,7 @@
     annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
   Modelica.Blocks.Sources.Sine yLoa(
     startTime=250,
-    freqHz=1/600,
+f    =1/600,
     amplitude=30,
     offset=313.15) "Load side fluid temperature"
     annotation (Placement(transformation(extent={{-100,-10},{-80,10}})));
@@ -79,7 +79,7 @@
     startTime=0,
     amplitude=20,
     offset=293.15,
-    freqHz=1/400)
+f    =1/400)
                  "Source side fluid temperature"
     annotation (Placement(transformation(extent={{100,-38},{80,-18}})));
 equation
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Validation/ScrollWaterToWater_VariableSpeed.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Validation/ScrollWaterToWater_VariableSpeed.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Validation/ScrollWaterToWater_VariableSpeed.mo"	2022-03-10 09:57:39.684144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/HeatPumps/Validation/ScrollWaterToWater_VariableSpeed.mo"	2022-03-10 09:58:13.104148575 +0000
@@ -5,14 +5,14 @@
   package Medium1 = IBPSA.Media.Water "Medium model";
   package Medium2 = IBPSA.Media.Water "Medium model";
 
-  parameter Modelica.SIunits.MassFlowRate m1_flow_nominal = 0.47
+  parameter Modelica.Units.SI.MassFlowRate m1_flow_nominal = 0.47
     "Nominal mass flow rate on the condenser side";
-  parameter Modelica.SIunits.MassFlowRate m2_flow_nominal = 0.47
+  parameter Modelica.Units.SI.MassFlowRate m2_flow_nominal = 0.47
     "Nominal mass flow rate on the evaporator side";
 
-  parameter Modelica.SIunits.MassFlowRate flowSource = 0.79
+  parameter Modelica.Units.SI.MassFlowRate flowSource = 0.79
     "Mass flow rate on the condenser side";
-  parameter Modelica.SIunits.MassFlowRate flowLoad = 0.47
+  parameter Modelica.Units.SI.MassFlowRate flowLoad = 0.47
     "Mass flow rate on the evaporator side";
 
   IBPSA.Fluid.Sources.FixedBoundary sin2(redeclare package Medium =
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Humidifiers/Examples/Humidifier_u.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Humidifiers/Examples/Humidifier_u.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Humidifiers/Examples/Humidifier_u.mo"	2022-03-10 09:57:39.684144339 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Humidifiers/Examples/Humidifier_u.mo"	2022-03-10 09:58:13.068148569 +0000
@@ -4,7 +4,7 @@
 
   package Medium = IBPSA.Media.Air;
 
-  parameter Modelica.SIunits.MassFlowRate m_flow_nominal=
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=
      3000/1000/20 "Nominal mass flow rate";
 
   IBPSA.Fluid.Sources.MassFlowSource_T sou(
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Humidifiers/Humidifier_u.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Humidifiers/Humidifier_u.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Humidifiers/Humidifier_u.mo"	2022-03-10 09:57:39.688144341 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Humidifiers/Humidifier_u.mo"	2022-03-10 09:58:13.040148567 +0000
@@ -7,7 +7,7 @@
             IBPSA.Fluid.MixingVolumes.MixingVolumeMoistAir vol(final
         prescribedHeatFlowRate=true));
 
-  parameter Modelica.SIunits.MassFlowRate mWat_flow_nominal
+  parameter Modelica.Units.SI.MassFlowRate mWat_flow_nominal
     "Water mass flow rate at u=1, positive for humidification";
 
   Modelica.Blocks.Interfaces.RealInput u(unit="1") "Control input"
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Humidifiers/SprayAirWasher_X.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Humidifiers/SprayAirWasher_X.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Humidifiers/SprayAirWasher_X.mo"	2022-03-10 09:57:39.688144341 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Humidifiers/SprayAirWasher_X.mo"	2022-03-10 09:58:13.016148564 +0000
@@ -14,20 +14,20 @@
       final energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
       final massDynamics=massDynamics));
 
-  parameter Modelica.SIunits.MassFlowRate mWatMax_flow(min=0) = Modelica.Constants.inf
+  parameter Modelica.Units.SI.MassFlowRate mWatMax_flow(min=0) = Modelica.Constants.inf
     "Maximum water mass flow rate addition (positive)"
     annotation (Evaluate=true);
 
-  parameter Modelica.SIunits.MassFraction X_start[Medium.nX] = Medium.X_default
+  parameter Modelica.Units.SI.MassFraction X_start[Medium.nX] = Medium.X_default
     "Start value of mass fractions m_i/m"
     annotation (Dialog(tab="Initialization"));
 
-  // Dynamics
+// Dynamics
   parameter Modelica.Fluid.Types.Dynamics massDynamics = Modelica.Fluid.Types.Dynamics.SteadyState
     "Type of mass balance: dynamic (3 initialization options) or steady state"
     annotation(Evaluate=true, Dialog(tab = "Dynamics", group="Equations"));
 
-  // Set maximum to a high value to avoid users mistakenly entering relative humidity.
+// Set maximum to a high value to avoid users mistakenly entering relative humidity.
   Modelica.Blocks.Interfaces.RealInput X_w(
     unit="1",
     min=0,
@@ -40,10 +40,10 @@
     annotation (Placement(transformation(extent={{100,50},{120,70}})));
 
 protected
-  constant Modelica.SIunits.SpecificEnthalpy hSte = Medium.enthalpyOfLiquid(T=283.15)
+  constant Modelica.Units.SI.SpecificEnthalpy hSte = Medium.enthalpyOfLiquid(T=283.15)
     "Enthalpy of water at 10 degree Celsius";
 
-  Modelica.SIunits.SpecificEnthalpy hLea=
+  Modelica.Units.SI.SpecificEnthalpy hLea=
     inStream(port_a.h_outflow) +
     {hSte} * (port_b.Xi_outflow - inStream(port_a.Xi_outflow))
     "Approximation of leaving enthalpy, based on dh/dx=h_fg";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Humidifiers/SteamHumidifier_X.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Humidifiers/SteamHumidifier_X.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Humidifiers/SteamHumidifier_X.mo"	2022-03-10 09:57:39.688144341 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Humidifiers/SteamHumidifier_X.mo"	2022-03-10 09:58:12.988148559 +0000
@@ -14,20 +14,20 @@
       final energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
       final massDynamics=massDynamics));
 
-  parameter Modelica.SIunits.MassFlowRate mWatMax_flow(min=0) = Modelica.Constants.inf
+  parameter Modelica.Units.SI.MassFlowRate mWatMax_flow(min=0) = Modelica.Constants.inf
     "Maximum water mass flow rate addition (positive)"
     annotation (Evaluate=true);
 
-  parameter Modelica.SIunits.MassFraction X_start[Medium.nX] = Medium.X_default
+  parameter Modelica.Units.SI.MassFraction X_start[Medium.nX] = Medium.X_default
     "Start value of mass fractions m_i/m"
     annotation (Dialog(tab="Initialization"));
 
-  // Dynamics
+// Dynamics
   parameter Modelica.Fluid.Types.Dynamics massDynamics = Modelica.Fluid.Types.Dynamics.SteadyState
     "Type of mass balance: dynamic (3 initialization options) or steady state"
     annotation(Evaluate=true, Dialog(tab = "Dynamics", group="Equations"));
 
-  // Set maximum to a high value to avoid users mistakenly entering relative humidity.
+// Set maximum to a high value to avoid users mistakenly entering relative humidity.
   Modelica.Blocks.Interfaces.RealInput X_w(
     unit="1",
     min=0,
@@ -43,10 +43,10 @@
     "Heat flow rate added to the fluid (if flow is from port_a to port_b)"
     annotation (Placement(transformation(extent={{100,70},{120,90}})));
 protected
-  constant Modelica.SIunits.SpecificEnthalpy hSte = Medium.enthalpyOfCondensingGas(T=373.15)
+  constant Modelica.Units.SI.SpecificEnthalpy hSte = Medium.enthalpyOfCondensingGas(T=373.15)
     "Enthalpy of steam at 100 degree Celsius";
 
-  Modelica.SIunits.SpecificEnthalpy hLea=
+  Modelica.Units.SI.SpecificEnthalpy hLea=
     inStream(port_a.h_outflow) +
     {hSte} * (port_b.Xi_outflow - inStream(port_a.Xi_outflow))
     "Approximation of leaving enthalpy, based on dh/dx=h_fg";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Humidifiers/Validation/SprayAirWasher_X.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Humidifiers/Validation/SprayAirWasher_X.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Humidifiers/Validation/SprayAirWasher_X.mo"	2022-03-10 09:57:39.688144341 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Humidifiers/Validation/SprayAirWasher_X.mo"	2022-03-10 09:58:12.928148552 +0000
@@ -5,10 +5,10 @@
 
   package Medium = IBPSA.Media.Air;
 
-  parameter Modelica.SIunits.MassFlowRate m_flow_nominal = 0.1
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = 0.1
     "Nominal mass flow rate";
 
-  parameter Modelica.SIunits.MassFlowRate mWat_flow_nominal = m_flow_nominal * 0.004
+  parameter Modelica.Units.SI.MassFlowRate mWat_flow_nominal = m_flow_nominal * 0.004
     "Maximum humidification water mass flow rate";
 
   IBPSA.Fluid.Sources.Boundary_pT sin(
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Interfaces/ConservationEquation.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Interfaces/ConservationEquation.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Interfaces/ConservationEquation.mo"	2022-03-10 09:57:39.688144341 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Interfaces/ConservationEquation.mo"	2022-03-10 09:58:12.880148545 +0000
@@ -3,7 +3,7 @@
 
   extends IBPSA.Fluid.Interfaces.LumpedVolumeDeclarations;
 
-  // Constants
+// Constants
   parameter Boolean initialize_p = not Medium.singleState
     "= true to set up initial equations for pressure"
     annotation(HideResult=true, Evaluate=true, Dialog(tab="Advanced"));
@@ -11,7 +11,7 @@
   constant Boolean simplify_mWat_flow = true
     "Set to true to cause port_a.m_flow + port_b.m_flow = 0 even if mWat_flow is non-zero. Used only if Medium.nX > 1";
 
-  // Port definitions
+// Port definitions
   parameter Integer nPorts=0 "Number of ports"
     annotation(Evaluate=true, Dialog(connectorSizing=true, tab="General",group="Ports"));
 
@@ -33,7 +33,7 @@
        use_C_flow "Trace substance mass flow rate added to the medium"
     annotation (Placement(transformation(extent={{-140,-60},{-100,-20}})));
 
-  // Outputs that are needed in models that use this model
+// Outputs that are needed in models that use this model
   Modelica.Blocks.Interfaces.RealOutput hOut(unit="J/kg",
                                              start=hStart)
     "Leaving specific enthalpy of the component"
@@ -74,7 +74,7 @@
     annotation (Placement(transformation(extent={{-40,-10},{40,10}},
       origin={0,-100})));
 
-  // Set nominal attributes where literal values can be used.
+// Set nominal attributes where literal values can be used.
   Medium.BaseProperties medium(
     p(start=p_start),
     h(start=hStart),
@@ -83,7 +83,7 @@
     X(start=X_start),
     d(start=rho_start)) "Medium properties";
 
-  Modelica.SIunits.Energy U(start=fluidVolume*rho_start*
+  Modelica.Units.SI.Energy U(start=fluidVolume*rho_start*
     Medium.specificInternalEnergy(Medium.setState_pTX(
      T=T_start,
      p=p_start,
@@ -91,50 +91,50 @@
     (T_start - Medium.reference_T)*CSen,
     nominal = 1E5) "Internal energy of fluid";
 
-  Modelica.SIunits.Mass m(
+  Modelica.Units.SI.Mass m(
     start=fluidVolume*rho_start,
     stateSelect=if massDynamics == Modelica.Fluid.Types.Dynamics.SteadyState
     then StateSelect.default else StateSelect.prefer)
     "Mass of fluid";
 
-  Modelica.SIunits.Mass[Medium.nXi] mXi(
+  Modelica.Units.SI.Mass[Medium.nXi] mXi(
     start=fluidVolume*rho_start*X_start[1:Medium.nXi])
     "Masses of independent components in the fluid";
-  Modelica.SIunits.Mass[Medium.nC] mC(
+  Modelica.Units.SI.Mass[Medium.nC] mC(
     start=fluidVolume*rho_start*C_start)
     "Masses of trace substances in the fluid";
-  // C need to be added here because unlike for Xi, which has medium.Xi,
-  // there is no variable medium.C
+  // C need to be added here because unlike for Xi, which has medium.Xi,
+  // there is no variable medium.C
   Medium.ExtraProperty C[Medium.nC](nominal=C_nominal)
     "Trace substance mixture content";
 
-  Modelica.SIunits.MassFlowRate mb_flow "Mass flows across boundaries";
-  Modelica.SIunits.MassFlowRate[Medium.nXi] mbXi_flow
+  Modelica.Units.SI.MassFlowRate mb_flow "Mass flows across boundaries";
+  Modelica.Units.SI.MassFlowRate[Medium.nXi] mbXi_flow
     "Substance mass flows across boundaries";
   Medium.ExtraPropertyFlowRate[Medium.nC] mbC_flow
     "Trace substance mass flows across boundaries";
-  Modelica.SIunits.EnthalpyFlowRate Hb_flow
+  Modelica.Units.SI.EnthalpyFlowRate Hb_flow
     "Enthalpy flow across boundaries or energy source/sink";
 
   // Parameters that need to be defined by an extending class
-  parameter Modelica.SIunits.Volume fluidVolume "Volume";
-  final parameter Modelica.SIunits.HeatCapacity CSen=
+  parameter Modelica.Units.SI.Volume fluidVolume "Volume";
+  final parameter Modelica.Units.SI.HeatCapacity CSen=
     (mSenFac - 1)*rho_default*cp_default*fluidVolume
     "Aditional heat capacity for implementing mFactor";
 protected
   Medium.EnthalpyFlowRate ports_H_flow[nPorts];
-  Modelica.SIunits.MassFlowRate ports_mXi_flow[nPorts,Medium.nXi];
+  Modelica.Units.SI.MassFlowRate ports_mXi_flow[nPorts,Medium.nXi];
   Medium.ExtraPropertyFlowRate ports_mC_flow[nPorts,Medium.nC];
-  parameter Modelica.SIunits.SpecificHeatCapacity cp_default=
+  parameter Modelica.Units.SI.SpecificHeatCapacity cp_default=
   Medium.specificHeatCapacityCp(state=state_default)
     "Heat capacity, to compute additional dry mass";
-  parameter Modelica.SIunits.Density rho_start=Medium.density(
+  parameter Modelica.Units.SI.Density rho_start=Medium.density(
    Medium.setState_pTX(
      T=T_start,
      p=p_start,
      X=X_start[1:Medium.nXi])) "Density, used to compute fluid mass";
 
-  // Parameter for avoiding extra overhead calculations when CSen==0
+// Parameter for avoiding extra overhead calculations when CSen==0
   final parameter Boolean computeCSen = CSen > Modelica.Constants.eps
     annotation(Evaluate=true);
   final parameter Medium.ThermodynamicState state_default = Medium.setState_pTX(
@@ -142,55 +142,50 @@
       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 compute fluid mass";
-  // Parameter that is used to construct the vector mXi_flow
+  // Parameter that is used to construct the vector mXi_flow
   final parameter Real s[Medium.nXi] = {if Modelica.Utilities.Strings.isEqual(
                                             string1=Medium.substanceNames[i],
                                             string2="Water",
                                             caseSensitive=false)
                                             then 1 else 0 for i in 1:Medium.nXi}
     "Vector with zero everywhere except where species is";
-  parameter Modelica.SIunits.SpecificEnthalpy hStart=
+  parameter Modelica.Units.SI.SpecificEnthalpy hStart=
     Medium.specificEnthalpy_pTX(p_start, T_start, X_start)
     "Start value for specific enthalpy";
 
-  // Set _simplify_mWat_flow == false for Glycol47; otherwise Dymola 2018FD01
-  // cannot differentiate the equations.
+// Set _simplify_mWat_flow == false for Glycol47; otherwise Dymola 2018FD01
+  // cannot differentiate the equations.
   constant Boolean _simplify_mWat_flow = simplify_mWat_flow and Medium.nX > 1
    "If true, then port_a.m_flow + port_b.m_flow = 0 even if mWat_flow is non-zero, and equations are simplified";
 
-  // Conditional connectors
+// Conditional connectors
   Modelica.Blocks.Interfaces.RealInput mWat_flow_internal(unit="kg/s")
     "Needed to connect to conditional connector";
   Modelica.Blocks.Interfaces.RealInput C_flow_internal[Medium.nC]
     "Needed to connect to conditional connector";
 
-initial equation
-  // Assert that the substance with name 'water' has been found.
-  assert(Medium.nXi == 0 or abs(sum(s)-1) < 1e-5,
-      "If Medium.nXi > 1, then substance 'water' must be present for one component.'"
-         + Medium.mediumName + "'.\n"
-         + "Check medium model.");
-
-  // Make sure that if energyDynamics is SteadyState, then
-  // massDynamics is also SteadyState.
-  // Otherwise, the system of ordinary differential equations may be inconsistent.
-  if energyDynamics == Modelica.Fluid.Types.Dynamics.SteadyState then
+initial equation
+// Assert that the substance with name 'water' has been found.
+  assert(Medium.nXi == 0 or abs(sum(s) - 1) < 1e-5, "If Medium.nXi > 1, then substance 'water' must be present for one component.'" + Medium.mediumName + "'.\n" + "Check medium model.");
+// Make sure that if energyDynamics is SteadyState, then
+// massDynamics is also SteadyState.
+// Otherwise, the system of ordinary differential equations may be inconsistent.
+  if energyDynamics == Modelica.Fluid.Types.Dynamics.SteadyState then
     assert(massDynamics == energyDynamics, "
          If 'massDynamics == Modelica.Fluid.Types.Dynamics.SteadyState', then it is
          required that 'energyDynamics==Modelica.Fluid.Types.Dynamics.SteadyState'.
          Otherwise, the system of equations may not be consistent.
-         You need to select other parameter values.");
-  end if;
-
-  // initialization of balances
-  if energyDynamics == Modelica.Fluid.Types.Dynamics.FixedInitial then
-      medium.T = T_start;
-  else
-    if energyDynamics == Modelica.Fluid.Types.Dynamics.SteadyStateInitial then
-        der(medium.T) = 0;
-    end if;
+         You need to select other parameter values.");
+  end if;
+// initialization of balances
+  if energyDynamics == Modelica.Fluid.Types.Dynamics.FixedInitial then
+    medium.T = T_start;
+  else
+    if energyDynamics == Modelica.Fluid.Types.Dynamics.SteadyStateInitial then
+      der(medium.T) = 0;
+    end if;
   end if;
 
   if massDynamics == Modelica.Fluid.Types.Dynamics.FixedInitial then
@@ -221,8 +216,8 @@
     end if;
   end if;
 
-equation
-  // Conditional connectors
+equation
+// Conditional connectors
   connect(mWat_flow, mWat_flow_internal);
   if not use_mWat_flow then
     mWat_flow_internal = 0;
@@ -231,23 +226,19 @@
   connect(C_flow, C_flow_internal);
   if not use_C_flow then
     C_flow_internal = zeros(Medium.nC);
-  end if;
-
-  // Total quantities
-  if massDynamics == Modelica.Fluid.Types.Dynamics.SteadyState then
-    m = fluidVolume*rho_start;
-  else
-    if _simplify_mWat_flow then
-      // If moisture is neglected in mass balance, assume for computation
-      // of the mass of air that the air is at Medium.X_default.
-      m = fluidVolume*Medium.density(Medium.setState_phX(
-        p = medium.p,
-        h = hOut,
-        X = Medium.X_default));
-    else
-      // Use actual density
-      m = fluidVolume*medium.d;
-    end if;
+  end if;
+// Total quantities
+  if massDynamics == Modelica.Fluid.Types.Dynamics.SteadyState then
+    m = fluidVolume * rho_start;
+  else
+    if _simplify_mWat_flow then
+// If moisture is neglected in mass balance, assume for computation
+// of the mass of air that the air is at Medium.X_default.
+      m = fluidVolume * Medium.density(Medium.setState_phX(p = medium.p, h = hOut, X = Medium.X_default));
+    else
+// Use actual density
+      m = fluidVolume * medium.d;
+    end if;
   end if;
   mXi = m*medium.Xi;
   if computeCSen then
@@ -259,22 +250,18 @@
 
   hOut = medium.h;
   XiOut = medium.Xi;
-  COut = C;
-
-  for i in 1:nPorts loop
-    //The semiLinear function should be used for the equations below
-    //for allowing min/max simplifications.
-    //See https://github.com/ibpsa/modelica-ibpsa/issues/216 for a discussion and motivation
-    ports_H_flow[i]     = semiLinear(ports[i].m_flow, inStream(ports[i].h_outflow), ports[i].h_outflow)
-      "Enthalpy flow";
-    for j in 1:Medium.nXi loop
-      ports_mXi_flow[i,j] = semiLinear(ports[i].m_flow, inStream(ports[i].Xi_outflow[j]), ports[i].Xi_outflow[j])
-        "Component mass flow";
-    end for;
-    for j in 1:Medium.nC loop
-      ports_mC_flow[i,j]  = semiLinear(ports[i].m_flow, inStream(ports[i].C_outflow[j]),  ports[i].C_outflow[j])
-        "Trace substance mass flow";
-    end for;
+  COut = C;
+  for i in 1:nPorts loop
+//The semiLinear function should be used for the equations below
+//for allowing min/max simplifications.
+//See https://github.com/ibpsa/modelica-ibpsa/issues/216 for a discussion and motivation
+    ports_H_flow[i] = semiLinear(ports[i].m_flow, inStream(ports[i].h_outflow), ports[i].h_outflow) "Enthalpy flow";
+    for j in 1:Medium.nXi loop
+      ports_mXi_flow[i, j] = semiLinear(ports[i].m_flow, inStream(ports[i].Xi_outflow[j]), ports[i].Xi_outflow[j]) "Component mass flow";
+    end for;
+    for j in 1:Medium.nC loop
+      ports_mC_flow[i, j] = semiLinear(ports[i].m_flow, inStream(ports[i].C_outflow[j]), ports[i].C_outflow[j]) "Trace substance mass flow";
+    end for;
   end for;
 
   for i in 1:Medium.nXi loop
@@ -286,13 +273,12 @@
   end for;
 
   mb_flow = sum(ports.m_flow);
-  Hb_flow = sum(ports_H_flow);
-
-  // Energy and mass balances
-  if energyDynamics == Modelica.Fluid.Types.Dynamics.SteadyState then
-    0 = Hb_flow + Q_flow;
-  else
-    der(U) = Hb_flow + Q_flow;
+  Hb_flow = sum(ports_H_flow);
+// Energy and mass balances
+  if energyDynamics == Modelica.Fluid.Types.Dynamics.SteadyState then
+    0 = Hb_flow + Q_flow;
+  else
+    der(U) = Hb_flow + Q_flow;
   end if;
 
   if massDynamics == Modelica.Fluid.Types.Dynamics.SteadyState then
@@ -311,14 +297,13 @@
     zeros(Medium.nC)  = mbC_flow + C_flow_internal;
   else
     der(mC)  = mbC_flow + C_flow_internal;
-  end if;
-
-  // Properties of outgoing flows
-  for i in 1:nPorts loop
-      ports[i].p          = medium.p;
-      ports[i].h_outflow  = medium.h;
-      ports[i].Xi_outflow = medium.Xi;
-      ports[i].C_outflow  = C;
+  end if;
+// Properties of outgoing flows
+  for i in 1:nPorts loop
+    ports[i].p = medium.p;
+    ports[i].h_outflow = medium.h;
+    ports[i].Xi_outflow = medium.Xi;
+    ports[i].C_outflow = C;
   end for;
   UOut=U;
   mXiOut=mXi;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Interfaces/EightPort.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Interfaces/EightPort.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Interfaces/EightPort.mo"	2022-03-10 09:57:39.688144341 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Interfaces/EightPort.mo"	2022-03-10 09:58:12.800148536 +0000
@@ -27,35 +27,35 @@
     "= true to allow flow reversal in medium 4, false restricts to design direction (port_a -> port_b)"
     annotation(Dialog(tab="Assumptions"), Evaluate=true);
 
-  parameter Modelica.SIunits.SpecificEnthalpy h_outflow_a1_start = Medium1.h_default
+  parameter Modelica.Units.SI.SpecificEnthalpy h_outflow_a1_start = Medium1.h_default
     "Start value for enthalpy flowing out of port a1"
     annotation (Dialog(tab="Advanced", group="Initialization"));
 
-  parameter Modelica.SIunits.SpecificEnthalpy h_outflow_b1_start = Medium1.h_default
+  parameter Modelica.Units.SI.SpecificEnthalpy h_outflow_b1_start = Medium1.h_default
     "Start value for enthalpy flowing out of port b1"
     annotation (Dialog(tab="Advanced", group="Initialization"));
 
-  parameter Modelica.SIunits.SpecificEnthalpy h_outflow_a2_start = Medium2.h_default
+  parameter Modelica.Units.SI.SpecificEnthalpy h_outflow_a2_start = Medium2.h_default
     "Start value for enthalpy flowing out of port a2"
     annotation (Dialog(tab="Advanced", group="Initialization"));
 
-  parameter Modelica.SIunits.SpecificEnthalpy h_outflow_b2_start = Medium2.h_default
+  parameter Modelica.Units.SI.SpecificEnthalpy h_outflow_b2_start = Medium2.h_default
     "Start value for enthalpy flowing out of port b2"
     annotation (Dialog(tab="Advanced", group="Initialization"));
 
-    parameter Modelica.SIunits.SpecificEnthalpy h_outflow_a3_start = Medium3.h_default
+    parameter Modelica.Units.SI.SpecificEnthalpy h_outflow_a3_start = Medium3.h_default
     "Start value for enthalpy flowing out of port a1"
     annotation (Dialog(tab="Advanced", group="Initialization"));
 
-  parameter Modelica.SIunits.SpecificEnthalpy h_outflow_b3_start = Medium3.h_default
+  parameter Modelica.Units.SI.SpecificEnthalpy h_outflow_b3_start = Medium3.h_default
     "Start value for enthalpy flowing out of port b1"
     annotation (Dialog(tab="Advanced", group="Initialization"));
 
-    parameter Modelica.SIunits.SpecificEnthalpy h_outflow_a4_start = Medium4.h_default
+    parameter Modelica.Units.SI.SpecificEnthalpy h_outflow_a4_start = Medium4.h_default
     "Start value for enthalpy flowing out of port a1"
     annotation (Dialog(tab="Advanced", group="Initialization"));
 
-  parameter Modelica.SIunits.SpecificEnthalpy h_outflow_b4_start = Medium4.h_default
+  parameter Modelica.Units.SI.SpecificEnthalpy h_outflow_b4_start = Medium4.h_default
     "Start value for enthalpy flowing out of port b1"
     annotation (Dialog(tab="Advanced", group="Initialization"));
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Interfaces/EightPortFlowResistanceParameters.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Interfaces/EightPortFlowResistanceParameters.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Interfaces/EightPortFlowResistanceParameters.mo"	2022-03-10 09:57:39.688144341 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Interfaces/EightPortFlowResistanceParameters.mo"	2022-03-10 09:58:12.728148526 +0000
@@ -10,7 +10,7 @@
     "= true, use m_flow = f(dp) else dp = f(m_flow)"
     annotation (Evaluate=true, Dialog(enable = computeFlowResistance1,
                 tab="Flow resistance", group="Medium 1"));
-  parameter Modelica.SIunits.Pressure dp1_nominal(min=0, displayUnit="Pa")
+  parameter Modelica.Units.SI.Pressure dp1_nominal(min=0, displayUnit="Pa")
     "Pressure" annotation(Dialog(group = "Nominal condition"));
   parameter Boolean linearizeFlowResistance1 = false
     "= true, use linear relation between m_flow and dp for any flow rate"
@@ -28,7 +28,7 @@
     "= true, use m_flow = f(dp) else dp = f(m_flow)"
     annotation (Evaluate=true, Dialog(enable = computeFlowResistance2,
                 tab="Flow resistance", group="Medium 2"));
-  parameter Modelica.SIunits.Pressure dp2_nominal(min=0, displayUnit="Pa")
+  parameter Modelica.Units.SI.Pressure dp2_nominal(min=0, displayUnit="Pa")
     "Pressure" annotation(Dialog(group = "Nominal condition"));
   parameter Boolean linearizeFlowResistance2 = false
     "= true, use linear relation between m_flow and dp for any flow rate"
@@ -46,7 +46,7 @@
     "= true, use m_flow = f(dp) else dp = f(m_flow)"
     annotation (Evaluate=true, Dialog(enable = computeFlowResistance3,
                 tab="Flow resistance", group="Medium 3"));
-  parameter Modelica.SIunits.Pressure dp3_nominal(min=0, displayUnit="Pa")
+  parameter Modelica.Units.SI.Pressure dp3_nominal(min=0, displayUnit="Pa")
     "Pressure" annotation(Dialog(group = "Nominal condition"));
   parameter Boolean linearizeFlowResistance3 = false
     "= true, use linear relation between m_flow and dp for any flow rate"
@@ -64,7 +64,7 @@
     "= true, use m_flow = f(dp) else dp = f(m_flow)"
     annotation (Evaluate=true, Dialog(enable = computeFlowResistance4,
                 tab="Flow resistance", group="Medium 4"));
-  parameter Modelica.SIunits.Pressure dp4_nominal(min=0, displayUnit="Pa")
+  parameter Modelica.Units.SI.Pressure dp4_nominal(min=0, displayUnit="Pa")
     "Pressure" annotation(Dialog(group = "Nominal condition"));
   parameter Boolean linearizeFlowResistance4 = false
     "= true, use linear relation between m_flow and dp for any flow rate"
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Interfaces/EightPortHeatMassExchanger.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Interfaces/EightPortHeatMassExchanger.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Interfaces/EightPortHeatMassExchanger.mo"	2022-03-10 09:57:39.688144341 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Interfaces/EightPortHeatMassExchanger.mo"	2022-03-10 09:58:12.708148524 +0000
@@ -17,20 +17,20 @@
     final computeFlowResistance3=true,
     final computeFlowResistance4=true);
 
-  parameter Modelica.SIunits.Time tau1 = 30 "Time constant at nominal flow"
+  parameter Modelica.Units.SI.Time tau1 = 30 "Time constant at nominal flow"
      annotation (Dialog(tab = "Dynamics", group="Nominal condition"));
-  parameter Modelica.SIunits.Time tau2 = 30 "Time constant at nominal flow"
+  parameter Modelica.Units.SI.Time tau2 = 30 "Time constant at nominal flow"
      annotation (Dialog(tab = "Dynamics", group="Nominal condition"));
-  parameter Modelica.SIunits.Time tau3 = 30 "Time constant at nominal flow"
+  parameter Modelica.Units.SI.Time tau3 = 30 "Time constant at nominal flow"
      annotation (Dialog(tab = "Dynamics", group="Nominal condition"));
-  parameter Modelica.SIunits.Time tau4 = 30 "Time constant at nominal flow"
+  parameter Modelica.Units.SI.Time tau4 = 30 "Time constant at nominal flow"
      annotation (Dialog(tab = "Dynamics", group="Nominal condition"));
 
-  // Advanced
+// Advanced
   parameter Boolean homotopyInitialization = true "= true, use homotopy method"
     annotation(Evaluate=true, Dialog(tab="Advanced"));
 
-  // Assumptions
+// Assumptions
   parameter Modelica.Fluid.Types.Dynamics energyDynamics=Modelica.Fluid.Types.Dynamics.DynamicFreeInitial
     "Formulation of energy balance"
     annotation(Evaluate=true, Dialog(tab = "Dynamics", group="Equations"));
@@ -38,7 +38,7 @@
     "Formulation of mass balance"
     annotation(Evaluate=true, Dialog(tab = "Dynamics", group="Equations"));
 
-  // Initialization
+// Initialization
   parameter Medium1.AbsolutePressure p1_start = Medium1.p_default
     "Start value of pressure"
     annotation(Dialog(tab = "Initialization", group = "Medium 1"));
@@ -111,13 +111,13 @@
     "Nominal value of trace substances. (Set to typical order of magnitude.)"
    annotation (Dialog(tab="Initialization", group = "Medium 4", enable=Medium4.nC > 0));
 
- Modelica.SIunits.HeatFlowRate Q1_flow = vol1.heatPort.Q_flow
+ Modelica.Units.SI.HeatFlowRate Q1_flow = vol1.heatPort.Q_flow
     "Heat flow rate into medium 1";
-  Modelica.SIunits.HeatFlowRate Q2_flow = vol2.heatPort.Q_flow
+  Modelica.Units.SI.HeatFlowRate Q2_flow = vol2.heatPort.Q_flow
     "Heat flow rate into medium 2";
-  Modelica.SIunits.HeatFlowRate Q3_flow = vol3.heatPort.Q_flow
+  Modelica.Units.SI.HeatFlowRate Q3_flow = vol3.heatPort.Q_flow
     "Heat flow rate into medium 1";
-  Modelica.SIunits.HeatFlowRate Q4_flow = vol4.heatPort.Q_flow
+  Modelica.Units.SI.HeatFlowRate Q4_flow = vol4.heatPort.Q_flow
     "Heat flow rate into medium 2";
 
   IBPSA.Fluid.MixingVolumes.MixingVolume vol1(
@@ -234,79 +234,68 @@
 protected
   parameter Medium1.ThermodynamicState sta1_nominal=Medium1.setState_pTX(
       T=Medium1.T_default, p=Medium1.p_default, X=Medium1.X_default);
-  parameter Modelica.SIunits.Density rho1_nominal=Medium1.density(sta1_nominal)
+  parameter Modelica.Units.SI.Density rho1_nominal=Medium1.density(sta1_nominal)
     "Density, used to compute fluid volume";
   parameter Medium2.ThermodynamicState sta2_nominal=Medium2.setState_pTX(
       T=Medium2.T_default, p=Medium2.p_default, X=Medium2.X_default);
-  parameter Modelica.SIunits.Density rho2_nominal=Medium2.density(sta2_nominal)
+  parameter Modelica.Units.SI.Density rho2_nominal=Medium2.density(sta2_nominal)
     "Density, used to compute fluid volume";
   parameter Medium1.ThermodynamicState sta3_nominal=Medium3.setState_pTX(
       T=Medium3.T_default, p=Medium3.p_default, X=Medium3.X_default);
-  parameter Modelica.SIunits.Density rho3_nominal=Medium3.density(sta3_nominal)
+  parameter Modelica.Units.SI.Density rho3_nominal=Medium3.density(sta3_nominal)
     "Density, used to compute fluid volume";
   parameter Medium4.ThermodynamicState sta4_nominal=Medium4.setState_pTX(
       T=Medium4.T_default, p=Medium4.p_default, X=Medium4.X_default);
-  parameter Modelica.SIunits.Density rho4_nominal=Medium4.density(sta4_nominal)
+  parameter Modelica.Units.SI.Density rho4_nominal=Medium4.density(sta4_nominal)
     "Density, used to compute fluid volume";
 
   parameter Medium1.ThermodynamicState sta1_start=Medium1.setState_pTX(
       T=T1_start, p=p1_start, X=X1_start);
-  parameter Modelica.SIunits.SpecificEnthalpy h1_outflow_start = Medium1.specificEnthalpy(sta1_start)
+  parameter Modelica.Units.SI.SpecificEnthalpy h1_outflow_start = Medium1.specificEnthalpy(sta1_start)
     "Start value for outflowing enthalpy";
   parameter Medium2.ThermodynamicState sta2_start=Medium2.setState_pTX(
       T=T2_start, p=p2_start, X=X2_start);
-  parameter Modelica.SIunits.SpecificEnthalpy h2_outflow_start = Medium2.specificEnthalpy(sta2_start)
+  parameter Modelica.Units.SI.SpecificEnthalpy h2_outflow_start = Medium2.specificEnthalpy(sta2_start)
     "Start value for outflowing enthalpy";
   parameter Medium3.ThermodynamicState sta3_start=Medium3.setState_pTX(
       T=T3_start, p=p3_start, X=X3_start);
-  parameter Modelica.SIunits.SpecificEnthalpy h3_outflow_start = Medium3.specificEnthalpy(sta3_start)
+  parameter Modelica.Units.SI.SpecificEnthalpy h3_outflow_start = Medium3.specificEnthalpy(sta3_start)
     "Start value for outflowing enthalpy";
   parameter Medium4.ThermodynamicState sta4_start=Medium4.setState_pTX(
       T=T4_start, p=p4_start, X=X4_start);
-  parameter Modelica.SIunits.SpecificEnthalpy h4_outflow_start = Medium4.specificEnthalpy(sta4_start)
+  parameter Modelica.Units.SI.SpecificEnthalpy h4_outflow_start = Medium4.specificEnthalpy(sta4_start)
     "Start value for outflowing enthalpy";
 
-initial algorithm
-  // Check for tau1
-  assert((energyDynamics == Modelica.Fluid.Types.Dynamics.SteadyState) or
-          tau1 > Modelica.Constants.eps,
-"The parameter tau1, or the volume of the model from which tau may be derived, is unreasonably small.
+initial algorithm
+// Check for tau1
+  assert(energyDynamics == Modelica.Fluid.Types.Dynamics.SteadyState or tau1 > Modelica.Constants.eps, "The parameter tau1, or the volume of the model from which tau may be derived, is unreasonably small.
  You need to set energyDynamics == Modelica.Fluid.Types.Dynamics.SteadyState to model steady-state.
  Received tau1 = " + String(tau1) + "\n");
   assert((massDynamics == Modelica.Fluid.Types.Dynamics.SteadyState) or
           tau1 > Modelica.Constants.eps,
 "The parameter tau1, or the volume of the model from which tau may be derived, is unreasonably small.
  You need to set massDynamics == Modelica.Fluid.Types.Dynamics.SteadyState to model steady-state.
- Received tau1 = " + String(tau1) + "\n");
-
- // Check for tau2
-  assert((energyDynamics == Modelica.Fluid.Types.Dynamics.SteadyState) or
-          tau2 > Modelica.Constants.eps,
-"The parameter tau2, or the volume of the model from which tau may be derived, is unreasonably small.
+ Received tau1 = " + String(tau1) + "\n");
+// Check for tau2
+  assert(energyDynamics == Modelica.Fluid.Types.Dynamics.SteadyState or tau2 > Modelica.Constants.eps, "The parameter tau2, or the volume of the model from which tau may be derived, is unreasonably small.
  You need to set energyDynamics == Modelica.Fluid.Types.Dynamics.SteadyState to model steady-state.
  Received tau2 = " + String(tau2) + "\n");
   assert((massDynamics == Modelica.Fluid.Types.Dynamics.SteadyState) or
           tau2 > Modelica.Constants.eps,
 "The parameter tau2, or the volume of the model from which tau may be derived, is unreasonably small.
  You need to set massDynamics == Modelica.Fluid.Types.Dynamics.SteadyState to model steady-state.
- Received tau2 = " + String(tau2) + "\n");
-
-  // Check for tau1
-  assert((energyDynamics == Modelica.Fluid.Types.Dynamics.SteadyState) or
-          tau3 > Modelica.Constants.eps,
-"The parameter tau3, or the volume of the model from which tau may be derived, is unreasonably small.
+ Received tau2 = " + String(tau2) + "\n");
+// Check for tau1
+  assert(energyDynamics == Modelica.Fluid.Types.Dynamics.SteadyState or tau3 > Modelica.Constants.eps, "The parameter tau3, or the volume of the model from which tau may be derived, is unreasonably small.
  You need to set energyDynamics == Modelica.Fluid.Types.Dynamics.SteadyState to model steady-state.
  Received tau3 = " + String(tau3) + "\n");
   assert((massDynamics == Modelica.Fluid.Types.Dynamics.SteadyState) or
           tau3 > Modelica.Constants.eps,
 "The parameter tau3, or the volume of the model from which tau may be derived, is unreasonably small.
  You need to set massDynamics == Modelica.Fluid.Types.Dynamics.SteadyState to model steady-state.
- Received tau3 = " + String(tau3) + "\n");
-
- // Check for tau2
-  assert((energyDynamics == Modelica.Fluid.Types.Dynamics.SteadyState) or
-          tau4 > Modelica.Constants.eps,
-"The parameter tau4, or the volume of the model from which tau may be derived, is unreasonably small.
+ Received tau3 = " + String(tau3) + "\n");
+// Check for tau2
+  assert(energyDynamics == Modelica.Fluid.Types.Dynamics.SteadyState or tau4 > Modelica.Constants.eps, "The parameter tau4, or the volume of the model from which tau may be derived, is unreasonably small.
  You need to set energyDynamics == Modelica.Fluid.Types.Dynamics.SteadyState to model steady-state.
  Received tau4 = " + String(tau4) + "\n");
   assert((massDynamics == Modelica.Fluid.Types.Dynamics.SteadyState) or
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Interfaces/Examples/BaseClasses/PrescribedOutletState.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Interfaces/Examples/BaseClasses/PrescribedOutletState.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Interfaces/Examples/BaseClasses/PrescribedOutletState.mo"	2022-03-10 09:57:39.688144341 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Interfaces/Examples/BaseClasses/PrescribedOutletState.mo"	2022-03-10 09:58:12.612148512 +0000
@@ -4,7 +4,7 @@
   replaceable package Medium = IBPSA.Media.Air constrainedby
     Modelica.Media.Interfaces.PartialMedium                 "Medium model";
 
-  parameter Modelica.SIunits.MassFlowRate m_flow_nominal=0.1
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=0.1
     "Nominal mass flow rate";
 
   IBPSA.Fluid.Sources.Boundary_pT sin(
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Interfaces/Examples/EightPortHeatMassExchanger.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Interfaces/Examples/EightPortHeatMassExchanger.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Interfaces/Examples/EightPortHeatMassExchanger.mo"	2022-03-10 09:57:39.688144341 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Interfaces/Examples/EightPortHeatMassExchanger.mo"	2022-03-10 09:58:12.568148506 +0000
@@ -3,7 +3,7 @@
   "EightPortHeatMassExchanger example model"
   extends Modelica.Icons.Example;
   package Medium = IBPSA.Media.Water;
-  parameter Modelica.SIunits.MassFlowRate m_flow_nominal=1
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=1
     "Nominal mass flow rate";
 
   Sources.Boundary_pT sin(          redeclare package Medium = Medium, nPorts=4)
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Interfaces/Examples/FourPortHeatMassExchanger.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Interfaces/Examples/FourPortHeatMassExchanger.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Interfaces/Examples/FourPortHeatMassExchanger.mo"	2022-03-10 09:57:39.688144341 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Interfaces/Examples/FourPortHeatMassExchanger.mo"	2022-03-10 09:58:12.548148504 +0000
@@ -3,7 +3,7 @@
   "FourPortHeatMassExchanger example model"
   extends Modelica.Icons.Example;
   package Medium = IBPSA.Media.Water;
-  parameter Modelica.SIunits.MassFlowRate m_flow_nominal=1
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=1
     "Nominal mass flow rate";
 
   IBPSA.Fluid.Interfaces.FourPortHeatMassExchanger fouPor(
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Interfaces/Examples/Humidifier_u.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Interfaces/Examples/Humidifier_u.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Interfaces/Examples/Humidifier_u.mo"	2022-03-10 09:57:39.688144341 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Interfaces/Examples/Humidifier_u.mo"	2022-03-10 09:58:12.472148495 +0000
@@ -3,7 +3,7 @@
   extends Modelica.Icons.Example;
 
  package Medium = IBPSA.Media.Air;
- parameter Modelica.SIunits.MassFlowRate mWat_flow_nominal = 0.001
+ parameter Modelica.Units.SI.MassFlowRate mWat_flow_nominal = 0.001
     "Nominal water mass flow rate";
   Humidifier hea1(redeclare package Medium =
         Medium,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Interfaces/FourPortFlowResistanceParameters.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Interfaces/FourPortFlowResistanceParameters.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Interfaces/FourPortFlowResistanceParameters.mo"	2022-03-10 09:57:39.688144341 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Interfaces/FourPortFlowResistanceParameters.mo"	2022-03-10 09:58:11.852148416 +0000
@@ -10,7 +10,7 @@
     "= true, use m_flow = f(dp) else dp = f(m_flow)"
     annotation (Evaluate=true, Dialog(enable = computeFlowResistance1,
                 tab="Flow resistance", group="Medium 1"));
-  parameter Modelica.SIunits.PressureDifference dp1_nominal(min=0,
+  parameter Modelica.Units.SI.PressureDifference dp1_nominal(min=0,
                                                             displayUnit="Pa")
     "Pressure difference"
     annotation(Dialog(group = "Nominal condition"));
@@ -30,7 +30,7 @@
     "= true, use m_flow = f(dp) else dp = f(m_flow)"
     annotation (Evaluate=true, Dialog(enable = computeFlowResistance2,
                 tab="Flow resistance", group="Medium 2"));
-  parameter Modelica.SIunits.PressureDifference dp2_nominal(min=0,
+  parameter Modelica.Units.SI.PressureDifference dp2_nominal(min=0,
                                                             displayUnit="Pa")
     "Pressure difference"
     annotation(Dialog(group = "Nominal condition"));
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Interfaces/FourPortHeatMassExchanger.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Interfaces/FourPortHeatMassExchanger.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Interfaces/FourPortHeatMassExchanger.mo"	2022-03-10 09:57:39.688144341 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Interfaces/FourPortHeatMassExchanger.mo"	2022-03-10 09:58:11.840148415 +0000
@@ -9,16 +9,16 @@
   extends IBPSA.Fluid.Interfaces.FourPortFlowResistanceParameters(final
       computeFlowResistance1=true, final computeFlowResistance2=true);
 
-  parameter Modelica.SIunits.Time tau1 = 30 "Time constant at nominal flow"
+  parameter Modelica.Units.SI.Time tau1 = 30 "Time constant at nominal flow"
      annotation (Dialog(tab = "Dynamics", group="Nominal condition"));
-  parameter Modelica.SIunits.Time tau2 = 30 "Time constant at nominal flow"
+  parameter Modelica.Units.SI.Time tau2 = 30 "Time constant at nominal flow"
      annotation (Dialog(tab = "Dynamics", group="Nominal condition"));
 
-  // Advanced
+// Advanced
   parameter Boolean homotopyInitialization = true "= true, use homotopy method"
     annotation(Evaluate=true, Dialog(tab="Advanced"));
 
-  // Assumptions
+// Assumptions
   parameter Modelica.Fluid.Types.Dynamics energyDynamics=Modelica.Fluid.Types.Dynamics.DynamicFreeInitial
     "Type of energy balance: dynamic (3 initialization options) or steady state"
     annotation(Evaluate=true, Dialog(tab = "Dynamics", group="Equations"));
@@ -26,7 +26,7 @@
     "Type of mass balance: dynamic (3 initialization options) or steady state"
     annotation(Evaluate=true, Dialog(tab = "Dynamics", group="Equations"));
 
-  // Initialization
+// Initialization
   parameter Medium1.AbsolutePressure p1_start = Medium1.p_default
     "Start value of pressure"
     annotation(Dialog(tab = "Initialization", group = "Medium 1"));
@@ -63,9 +63,9 @@
     "Nominal value of trace substances. (Set to typical order of magnitude.)"
    annotation (Dialog(tab="Initialization", group = "Medium 2", enable=Medium2.nC > 0));
 
-  Modelica.SIunits.HeatFlowRate Q1_flow = vol1.heatPort.Q_flow
+  Modelica.Units.SI.HeatFlowRate Q1_flow = vol1.heatPort.Q_flow
     "Heat flow rate into medium 1";
-  Modelica.SIunits.HeatFlowRate Q2_flow = vol2.heatPort.Q_flow
+  Modelica.Units.SI.HeatFlowRate Q2_flow = vol2.heatPort.Q_flow
     "Heat flow rate into medium 2";
 
   replaceable IBPSA.Fluid.MixingVolumes.BaseClasses.MixingVolumeHeatPort vol1
@@ -136,39 +136,34 @@
 protected
   parameter Medium1.ThermodynamicState sta1_nominal=Medium1.setState_pTX(
       T=Medium1.T_default, p=Medium1.p_default, X=Medium1.X_default);
-  parameter Modelica.SIunits.Density rho1_nominal=Medium1.density(sta1_nominal)
+  parameter Modelica.Units.SI.Density rho1_nominal=Medium1.density(sta1_nominal)
     "Density, used to compute fluid volume";
   parameter Medium2.ThermodynamicState sta2_nominal=Medium2.setState_pTX(
       T=Medium2.T_default, p=Medium2.p_default, X=Medium2.X_default);
-  parameter Modelica.SIunits.Density rho2_nominal=Medium2.density(sta2_nominal)
+  parameter Modelica.Units.SI.Density rho2_nominal=Medium2.density(sta2_nominal)
     "Density, used to compute fluid volume";
 
   parameter Medium1.ThermodynamicState sta1_start=Medium1.setState_pTX(
       T=T1_start, p=p1_start, X=X1_start);
-  parameter Modelica.SIunits.SpecificEnthalpy h1_outflow_start = Medium1.specificEnthalpy(sta1_start)
+  parameter Modelica.Units.SI.SpecificEnthalpy h1_outflow_start = Medium1.specificEnthalpy(sta1_start)
     "Start value for outflowing enthalpy";
   parameter Medium2.ThermodynamicState sta2_start=Medium2.setState_pTX(
       T=T2_start, p=p2_start, X=X2_start);
-  parameter Modelica.SIunits.SpecificEnthalpy h2_outflow_start = Medium2.specificEnthalpy(sta2_start)
+  parameter Modelica.Units.SI.SpecificEnthalpy h2_outflow_start = Medium2.specificEnthalpy(sta2_start)
     "Start value for outflowing enthalpy";
 
-initial equation
-  // Check for tau1
-  assert((energyDynamics == Modelica.Fluid.Types.Dynamics.SteadyState) or
-          tau1 > Modelica.Constants.eps,
-"The parameter tau1, or the volume of the model from which tau may be derived, is unreasonably small.
+initial equation
+// Check for tau1
+  assert(energyDynamics == Modelica.Fluid.Types.Dynamics.SteadyState or tau1 > Modelica.Constants.eps, "The parameter tau1, or the volume of the model from which tau may be derived, is unreasonably small.
  You need to set energyDynamics == Modelica.Fluid.Types.Dynamics.SteadyState to model steady-state.
  Received tau1 = " + String(tau1) + "\n");
   assert((massDynamics == Modelica.Fluid.Types.Dynamics.SteadyState) or
           tau1 > Modelica.Constants.eps,
 "The parameter tau1, or the volume of the model from which tau may be derived, is unreasonably small.
  You need to set massDynamics == Modelica.Fluid.Types.Dynamics.SteadyState to model steady-state.
- Received tau1 = " + String(tau1) + "\n");
-
- // Check for tau2
-  assert((energyDynamics == Modelica.Fluid.Types.Dynamics.SteadyState) or
-          tau2 > Modelica.Constants.eps,
-"The parameter tau2, or the volume of the model from which tau may be derived, is unreasonably small.
+ Received tau1 = " + String(tau1) + "\n");
+// Check for tau2
+  assert(energyDynamics == Modelica.Fluid.Types.Dynamics.SteadyState or tau2 > Modelica.Constants.eps, "The parameter tau2, or the volume of the model from which tau may be derived, is unreasonably small.
  You need to set energyDynamics == Modelica.Fluid.Types.Dynamics.SteadyState to model steady-state.
  Received tau2 = " + String(tau2) + "\n");
   assert((massDynamics == Modelica.Fluid.Types.Dynamics.SteadyState) or
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Interfaces/LumpedVolumeDeclarations.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Interfaces/LumpedVolumeDeclarations.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Interfaces/LumpedVolumeDeclarations.mo"	2022-03-10 09:57:39.688144341 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Interfaces/LumpedVolumeDeclarations.mo"	2022-03-10 09:58:11.784148407 +0000
@@ -4,7 +4,7 @@
     Modelica.Media.Interfaces.PartialMedium "Medium in the component"
       annotation (choicesAllMatching = true);
 
-  // Assumptions
+// Assumptions
   parameter Modelica.Fluid.Types.Dynamics energyDynamics=Modelica.Fluid.Types.Dynamics.DynamicFreeInitial
     "Type of energy balance: dynamic (3 initialization options) or steady state"
     annotation(Evaluate=true, Dialog(tab = "Dynamics", group="Equations"));
@@ -18,7 +18,7 @@
     "Type of trace substance balance: dynamic (3 initialization options) or steady state"
     annotation(Evaluate=true, Dialog(tab = "Dynamics", group="Equations"));
 
-  // Initialization
+// Initialization
   parameter Medium.AbsolutePressure p_start = Medium.p_default
     "Start value of pressure"
     annotation(Dialog(tab = "Initialization"));
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Interfaces/PartialEightPortInterface.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Interfaces/PartialEightPortInterface.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Interfaces/PartialEightPortInterface.mo"	2022-03-10 09:57:39.688144341 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Interfaces/PartialEightPortInterface.mo"	2022-03-10 09:58:11.772148405 +0000
@@ -2,16 +2,16 @@
 partial model PartialEightPortInterface
   "Partial model transporting fluid between eight ports without storing mass or energy"
   extends IBPSA.Fluid.Interfaces.EightPort;
-  parameter Modelica.SIunits.MassFlowRate m1_flow_nominal(min=0)
+  parameter Modelica.Units.SI.MassFlowRate m1_flow_nominal(min=0)
     "Nominal mass flow rate"
     annotation(Dialog(group = "Nominal condition"));
-  parameter Modelica.SIunits.MassFlowRate m2_flow_nominal(min=0)
+  parameter Modelica.Units.SI.MassFlowRate m2_flow_nominal(min=0)
     "Nominal mass flow rate"
     annotation(Dialog(group = "Nominal condition"));
-    parameter Modelica.SIunits.MassFlowRate m3_flow_nominal(min=0)
+    parameter Modelica.Units.SI.MassFlowRate m3_flow_nominal(min=0)
     "Nominal mass flow rate"
     annotation(Dialog(group = "Nominal condition"));
-  parameter Modelica.SIunits.MassFlowRate m4_flow_nominal(min=0)
+  parameter Modelica.Units.SI.MassFlowRate m4_flow_nominal(min=0)
     "Nominal mass flow rate"
     annotation(Dialog(group = "Nominal condition"));
 
@@ -28,26 +28,26 @@
     "Small mass flow rate for regularization of zero flow"
     annotation(Dialog(tab = "Advanced"));
 
-  // Diagnostics
+// Diagnostics
   parameter Boolean show_T = false
     "= true, if actual temperature at port is computed"
     annotation(Dialog(tab="Advanced",group="Diagnostics"));
   Medium1.MassFlowRate m1_flow = port_a1.m_flow
     "Mass flow rate from port_a1 to port_b1 (m1_flow > 0 is design flow direction)";
-  Modelica.SIunits.Pressure dp1(displayUnit="Pa")
+  Modelica.Units.SI.Pressure dp1(displayUnit="Pa")
     "Pressure difference between port_a1 and port_b1";
   Medium2.MassFlowRate m2_flow = port_a2.m_flow
     "Mass flow rate from port_a2 to port_b2 (m2_flow > 0 is design flow direction)";
-  Modelica.SIunits.Pressure dp2(displayUnit="Pa")
+  Modelica.Units.SI.Pressure dp2(displayUnit="Pa")
     "Pressure difference between port_a2 and port_b2";
 
   Medium3.MassFlowRate m3_flow = port_a3.m_flow
     "Mass flow rate from port_a3 to port_b3 (m3_flow > 0 is design flow direction)";
-  Modelica.SIunits.Pressure dp3(displayUnit="Pa")
+  Modelica.Units.SI.Pressure dp3(displayUnit="Pa")
     "Pressure difference between port_a3 and port_b3";
   Medium2.MassFlowRate m4_flow = port_a4.m_flow
     "Mass flow rate from port_a4 to port_b4 (m4_flow > 0 is design flow direction)";
-  Modelica.SIunits.Pressure dp4(displayUnit="Pa")
+  Modelica.Units.SI.Pressure dp4(displayUnit="Pa")
     "Pressure difference between port_a4 and port_b4";
 
   Medium1.ThermodynamicState sta_a1=
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Interfaces/PartialFourPortInterface.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Interfaces/PartialFourPortInterface.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Interfaces/PartialFourPortInterface.mo"	2022-03-10 09:57:39.688144341 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Interfaces/PartialFourPortInterface.mo"	2022-03-10 09:58:11.728148400 +0000
@@ -2,10 +2,10 @@
 partial model PartialFourPortInterface
   "Partial model transporting fluid between two ports without storing mass or energy"
   extends IBPSA.Fluid.Interfaces.PartialFourPort;
-  parameter Modelica.SIunits.MassFlowRate m1_flow_nominal(min=0)
+  parameter Modelica.Units.SI.MassFlowRate m1_flow_nominal(min=0)
     "Nominal mass flow rate"
     annotation(Dialog(group = "Nominal condition"));
-  parameter Modelica.SIunits.MassFlowRate m2_flow_nominal(min=0)
+  parameter Modelica.Units.SI.MassFlowRate m2_flow_nominal(min=0)
     "Nominal mass flow rate"
     annotation(Dialog(group = "Nominal condition"));
   parameter Medium1.MassFlowRate m1_flow_small(min=0) = 1E-4*abs(m1_flow_nominal)
@@ -14,19 +14,19 @@
   parameter Medium2.MassFlowRate m2_flow_small(min=0) = 1E-4*abs(m2_flow_nominal)
     "Small mass flow rate for regularization of zero flow"
     annotation(Dialog(tab = "Advanced"));
-  // Diagnostics
+  // Diagnostics
   parameter Boolean show_T = false
     "= true, if actual temperature at port is computed"
     annotation(Dialog(tab="Advanced",group="Diagnostics"));
 
   Medium1.MassFlowRate m1_flow = port_a1.m_flow
     "Mass flow rate from port_a1 to port_b1 (m1_flow > 0 is design flow direction)";
-  Modelica.SIunits.PressureDifference dp1(displayUnit="Pa") = port_a1.p - port_b1.p
+  Modelica.Units.SI.PressureDifference dp1(displayUnit="Pa") = port_a1.p - port_b1.p
     "Pressure difference between port_a1 and port_b1";
 
   Medium2.MassFlowRate m2_flow = port_a2.m_flow
     "Mass flow rate from port_a2 to port_b2 (m2_flow > 0 is design flow direction)";
-  Modelica.SIunits.PressureDifference dp2(displayUnit="Pa") = port_a2.p - port_b2.p
+  Modelica.Units.SI.PressureDifference dp2(displayUnit="Pa") = port_a2.p - port_b2.p
     "Pressure difference between port_a2 and port_b2";
 
   Medium1.ThermodynamicState sta_a1=
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Interfaces/PartialTwoPortInterface.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Interfaces/PartialTwoPortInterface.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Interfaces/PartialTwoPortInterface.mo"	2022-03-10 09:57:39.688144341 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Interfaces/PartialTwoPortInterface.mo"	2022-03-10 09:58:11.564148379 +0000
@@ -4,21 +4,21 @@
   extends IBPSA.Fluid.Interfaces.PartialTwoPort(port_a(p(start=Medium.p_default)),
       port_b(p(start=Medium.p_default)));
 
-  parameter Modelica.SIunits.MassFlowRate m_flow_nominal
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal
     "Nominal mass flow rate"
     annotation(Dialog(group = "Nominal condition"));
-  parameter Modelica.SIunits.MassFlowRate m_flow_small(min=0) = 1E-4*abs(m_flow_nominal)
+  parameter Modelica.Units.SI.MassFlowRate m_flow_small(min=0) = 1E-4*abs(m_flow_nominal)
     "Small mass flow rate for regularization of zero flow"
     annotation(Dialog(tab = "Advanced"));
-  // Diagnostics
+  // Diagnostics
    parameter Boolean show_T = false
     "= true, if actual temperature at port is computed"
     annotation(Dialog(tab="Advanced",group="Diagnostics"));
 
-  Modelica.SIunits.MassFlowRate m_flow(start=_m_flow_start) = port_a.m_flow
+  Modelica.Units.SI.MassFlowRate m_flow(start=_m_flow_start) = port_a.m_flow
     "Mass flow rate from port_a to port_b (m_flow > 0 is design flow direction)";
 
-  Modelica.SIunits.PressureDifference dp(start=_dp_start, displayUnit="Pa") = port_a.p - port_b.p
+  Modelica.Units.SI.PressureDifference dp(start=_dp_start, displayUnit="Pa") = port_a.p - port_b.p
     "Pressure difference between port_a and port_b";
 
   Medium.ThermodynamicState sta_a=
@@ -34,11 +34,11 @@
           show_T "Medium properties in port_b";
 
 protected
-  final parameter Modelica.SIunits.MassFlowRate _m_flow_start = 0
+
+  final parameter Modelica.Units.SI.MassFlowRate _m_flow_start = 0
   "Start value for m_flow, used to avoid a warning if not set in m_flow, and to avoid m_flow.start in parameter window";
-  final parameter Modelica.SIunits.PressureDifference _dp_start(displayUnit="Pa") = 0
+  final parameter Modelica.Units.SI.PressureDifference _dp_start(displayUnit="Pa") = 0
   "Start value for dp, used to avoid a warning if not set in dp, and to avoid dp.start in parameter window";
-
   annotation (
     preferredView="info",
     Documentation(info="
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Interfaces/PartialTwoPortTransport.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Interfaces/PartialTwoPortTransport.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Interfaces/PartialTwoPortTransport.mo"	2022-03-10 09:57:39.688144341 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Interfaces/PartialTwoPortTransport.mo"	2022-03-10 09:58:11.548148376 +0000
@@ -6,19 +6,19 @@
   // Advanced
   // Note: value of dp_start shall be refined by derived model,
   // based on local dp_nominal
-  parameter Modelica.SIunits.PressureDifference dp_start(displayUnit="Pa") = 0
+  parameter Modelica.Units.SI.PressureDifference dp_start(displayUnit="Pa") = 0
     "Guess value of dp = port_a.p - port_b.p"
     annotation(Dialog(tab = "Advanced"));
   parameter Medium.MassFlowRate m_flow_start = 0
     "Guess value of m_flow = port_a.m_flow"
     annotation(Dialog(tab = "Advanced"));
-  // Note: value of m_flow_small shall be refined by derived model,
-  // based on local m_flow_nominal
+  // Note: value of m_flow_small shall be refined by derived model,
+  // based on local m_flow_nominal
   parameter Medium.MassFlowRate m_flow_small
     "Small mass flow rate for regularization of zero flow"
     annotation(Dialog(tab = "Advanced"));
 
-  // Diagnostics
+// Diagnostics
   parameter Boolean show_T = true
     "= true, if temperatures at port_a and port_b are computed"
     annotation(Dialog(tab="Advanced",group="Diagnostics"));
@@ -26,15 +26,15 @@
     "= true, if volume flow rate at inflowing port is computed"
     annotation(Dialog(tab="Advanced",group="Diagnostics"));
 
-  // Variables
+// Variables
   Medium.MassFlowRate m_flow(
      min=if allowFlowReversal then -Modelica.Constants.inf else 0,
      start = m_flow_start) "Mass flow rate in design flow direction";
-  Modelica.SIunits.PressureDifference dp(start=dp_start,
+  Modelica.Units.SI.PressureDifference dp(start=dp_start,
                                          displayUnit="Pa")
     "Pressure difference between port_a and port_b (= port_a.p - port_b.p)";
 
-  Modelica.SIunits.VolumeFlowRate V_flow=
+  Modelica.Units.SI.VolumeFlowRate V_flow=
       m_flow/Modelica.Fluid.Utilities.regStep(m_flow,
                   Medium.density(
                     Medium.setState_phX(
@@ -69,19 +69,16 @@
                   Medium.temperature(Medium.setState_phX(port_b.p, port_b.h_outflow, port_b.Xi_outflow)),
                   m_flow_small) if show_T
     "Temperature close to port_b, if show_T = true";
-equation
-  // Pressure drop in design flow direction
-  dp = port_a.p - port_b.p;
-
-  // Design direction of mass flow rate
+equation
+// Pressure drop in design flow direction
+  dp = port_a.p - port_b.p;
+// Design direction of mass flow rate
   m_flow = port_a.m_flow;
   assert(m_flow > -m_flow_small or allowFlowReversal,
-      "Reverting flow occurs even though allowFlowReversal is false");
-
-  // Mass balance (no storage)
-  port_a.m_flow + port_b.m_flow = 0;
-
-  // Transport of substances
+      "Reverting flow occurs even though allowFlowReversal is false");
+// Mass balance (no storage)
+  port_a.m_flow + port_b.m_flow = 0;
+// Transport of substances
   port_a.Xi_outflow = if allowFlowReversal then inStream(port_b.Xi_outflow) else Medium.X_default[1:Medium.nXi];
   port_b.Xi_outflow = inStream(port_a.Xi_outflow);
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Interfaces/PrescribedOutlet.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Interfaces/PrescribedOutlet.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Interfaces/PrescribedOutlet.mo"	2022-03-10 09:57:39.688144341 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Interfaces/PrescribedOutlet.mo"	2022-03-10 09:58:11.524148375 +0000
@@ -3,35 +3,35 @@
   "Component that assigns the outlet fluid property at port_a based on an input signal"
   extends IBPSA.Fluid.Interfaces.PartialTwoPortInterface;
 
-  parameter Modelica.SIunits.HeatFlowRate QMax_flow(min=0) = Modelica.Constants.inf
+  parameter Modelica.Units.SI.HeatFlowRate QMax_flow(min=0) = Modelica.Constants.inf
     "Maximum heat flow rate for heating (positive)"
     annotation (Evaluate=true, Dialog(enable=use_TSet));
-  parameter Modelica.SIunits.HeatFlowRate QMin_flow(max=0) = -Modelica.Constants.inf
+  parameter Modelica.Units.SI.HeatFlowRate QMin_flow(max=0) = -Modelica.Constants.inf
     "Maximum heat flow rate for cooling (negative)"
     annotation (Evaluate=true, Dialog(enable=use_TSet));
-  parameter Modelica.SIunits.MassFlowRate mWatMax_flow(min=0) = Modelica.Constants.inf
+  parameter Modelica.Units.SI.MassFlowRate mWatMax_flow(min=0) = Modelica.Constants.inf
     "Maximum water mass flow rate addition (positive)"
     annotation (Evaluate=true, Dialog(enable=use_X_wSet));
 
-  parameter Modelica.SIunits.MassFlowRate mWatMin_flow(max=0) = -Modelica.Constants.inf
+  parameter Modelica.Units.SI.MassFlowRate mWatMin_flow(max=0) = -Modelica.Constants.inf
     "Maximum water mass flow rate removal (negative)"
     annotation (Evaluate=true, Dialog(enable=use_X_wSet));
 
-  parameter Modelica.SIunits.MassFlowRate m_flow_nominal
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal
     "Nominal mass flow rate, used for regularization near zero flow"
     annotation(Dialog(group = "Nominal condition"));
 
-  parameter Modelica.SIunits.Time tau(min=0) = 10
+  parameter Modelica.Units.SI.Time tau(min=0) = 10
     "Time constant at nominal flow rate (used if energyDynamics or massDynamics not equal Modelica.Fluid.Types.Dynamics.SteadyState)"
     annotation(Dialog(tab = "Dynamics"));
-  parameter Modelica.SIunits.Temperature T_start=Medium.T_default
+  parameter Modelica.Units.SI.Temperature T_start=Medium.T_default
     "Start value of temperature"
     annotation(Dialog(tab = "Initialization", enable=use_TSet));
-  parameter Modelica.SIunits.MassFraction X_start[Medium.nX] = Medium.X_default
+  parameter Modelica.Units.SI.MassFraction X_start[Medium.nX] = Medium.X_default
     "Start value of mass fractions m_i/m"
     annotation (Dialog(tab="Initialization", enable=use_X_wSet and Medium.nXi > 0));
 
-  // Dynamics
+// Dynamics
   parameter Modelica.Fluid.Types.Dynamics energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState
     "Type of energy balance: dynamic (3 initialization options) or steady state"
     annotation(Evaluate=true, Dialog(tab = "Dynamics", group="Equations", enable=use_TSet));
@@ -73,7 +73,7 @@
     annotation (Placement(transformation(extent={{100,30},{120,50}})));
 
 protected
-  parameter Modelica.SIunits.SpecificHeatCapacity cp_default=
+  parameter Modelica.Units.SI.SpecificHeatCapacity cp_default=
       Medium.specificHeatCapacityCp(
         Medium.setState_pTX(
           p=Medium.p_default,
@@ -94,35 +94,35 @@
     "Flag, true if maximum dehumidification is restricted"
     annotation(Evaluate = true);
 
-  parameter Modelica.SIunits.SpecificEnthalpy deltaH=
+  parameter Modelica.Units.SI.SpecificEnthalpy deltaH=
     cp_default*1E-6
     "Small value for deltaH used for regularization";
 
-  parameter Modelica.SIunits.MassFraction deltaXi = 1E-6
+  parameter Modelica.Units.SI.MassFraction deltaXi = 1E-6
     "Small mass fraction used for regularization";
 
-  Modelica.SIunits.MassFlowRate m_flow_pos
+  Modelica.Units.SI.MassFlowRate m_flow_pos
     "Mass flow rate, or zero if reverse flow";
 
-  Modelica.SIunits.MassFlowRate m_flow_non_zero
+  Modelica.Units.SI.MassFlowRate m_flow_non_zero
     "Mass flow rate bounded away from zero";
 
-  Modelica.SIunits.SpecificEnthalpy hSet
+  Modelica.Units.SI.SpecificEnthalpy hSet
     "Set point for enthalpy leaving port_b";
 
-  Modelica.SIunits.Temperature T
+  Modelica.Units.SI.Temperature T
     "Temperature of outlet state assuming unlimited capacity and taking dynamics into account";
 
-  Modelica.SIunits.MassFraction Xi
+  Modelica.Units.SI.MassFraction Xi
     "Water vapor mass fraction of outlet state assuming unlimited capacity and taking dynamics into account";
 
-  Modelica.SIunits.MassFraction Xi_instream[Medium.nXi]
+  Modelica.Units.SI.MassFraction Xi_instream[Medium.nXi]
     "Instreaming water vapor mass fraction at port_a";
 
-  Modelica.SIunits.MassFraction Xi_outflow
+  Modelica.Units.SI.MassFraction Xi_outflow
     "Outstreaming water vapor mass fraction at port_a";
 
-  Modelica.SIunits.SpecificEnthalpy dhAct
+  Modelica.Units.SI.SpecificEnthalpy dhAct
     "Actual enthalpy difference from port_a to port_b";
 
   Real dXiAct(final unit="1")
@@ -140,8 +140,8 @@
     "Internal connector for set point for water vapor mass fraction of the fluid that leaves port_b";
 
 initial equation
-  // Set initial conditions, unless use_{T,Xi}Set = false in which case
-  // it is not a state.
+// Set initial conditions, unless use_{T,Xi}Set = false in which case
+// it is not a state.
   if use_TSet then
     if energyDynamics == Modelica.Fluid.Types.Dynamics.SteadyStateInitial then
       der(T) = 0;
@@ -173,10 +173,10 @@
   assert(Medium.nX > 1, "If use_X_wSet = true, require a medium with water vapor, such as IBPSA.Media.Air");
  end if;
 
-equation
-  // Conditional connectors
-  if not use_TSet then
-    TSet_internal = 293.15;
+equation
+// Conditional connectors
+  if not use_TSet then
+    TSet_internal = 293.15;
   end if;
   connect(TSet, TSet_internal);
   if not use_X_wSet then
@@ -208,15 +208,9 @@
     Xi = X_wSet_internal;
   end if;
 
-  Xi_instream = inStream(port_a.Xi_outflow);
-
-  // Set point without any capacity limitation
-  hSet = if use_TSet then Medium.specificEnthalpy(
-    Medium.setState_pTX(
-      p = port_a.p,
-      T = T,
-      X = Xi_instream + fill(dXiAct, Medium.nXi)))
-        else Medium.h_default;
+  Xi_instream = inStream(port_a.Xi_outflow);
+// Set point without any capacity limitation
+  hSet = if use_TSet then Medium.specificEnthalpy(Medium.setState_pTX(p = port_a.p, T = T, X = Xi_instream + fill(dXiAct, Medium.nXi))) else Medium.h_default;
 
   m_flow_pos = IBPSA.Utilities.Math.Functions.smoothMax(
           x1=m_flow,
@@ -231,107 +225,82 @@
             x1=port_a.m_flow,
             x2=m_flow_small,
             deltaX=m_flow_small/2);
-   end if;
-
-  // Compute mass fraction leaving the component.
-  // Below, we use sum(Xi_instream) as Xi anyway has only one element.
-  // However, scalar(Xi_instream) would not work as dim(Xi_instream) = 0
-  // if the medium is not a mixture.
-  // Note that the computations for the mass fraction and for the
-  // enthalpy change are identical. In a development version, they were
-  // put in a function, but this led to large nonlinear systems of equations.
-  if use_X_wSet then
-    if not restrictHumi and not restrictDehu then
-      // No capacity limit
-      dXiAct = Xi_outflow-sum(Xi_instream);
-      Xi_outflow  = Xi;
-      mWat_flow   = m_flow_pos*(Xi - sum(Xi_instream));
-    else
-      if restrictHumi and restrictDehu then
-        // Capacity limits for heating and cooling
-        dXiAct = IBPSA.Utilities.Math.Functions.smoothLimit(
-                x=Xi - sum(Xi_instream),
-                l=mWatMin_flow/m_flow_non_zero,
-                u=mWatMax_flow/m_flow_non_zero,
-                deltaX=deltaXi);
-      elseif restrictHumi then
-        // Capacity limit for heating only
-        dXiAct = IBPSA.Utilities.Math.Functions.smoothMin(
-                x1=Xi - sum(Xi_instream),
-                x2=mWatMax_flow/m_flow_non_zero,
-                deltaX=deltaXi);
-      else
-        // Capacity limit for cooling only
-        dXiAct = IBPSA.Utilities.Math.Functions.smoothMax(
-                x1=Xi - sum(Xi_instream),
-                x2=mWatMin_flow/m_flow_non_zero,
-                deltaX=deltaXi);
-      end if;
-      Xi_outflow = sum(Xi_instream) + dXiAct;
-      mWat_flow  = m_flow_pos*dXiAct;
-    end if;
-    port_b.Xi_outflow = fill(Xi_outflow, Medium.nXi);
-  else
-    Xi_outflow = sum(Xi_instream);
-    mWat_flow = 0;
-    dXiAct = 0;
-    port_b.Xi_outflow = Xi_instream;
-  end if;
-
-  // Compute enthalpy leaving the component.
-  if use_TSet then
-    if not restrictHeat and not restrictCool then
-      // No capacity limit
-      dhAct = 0;
-      port_b.h_outflow  = hSet;
-      Q_flow  =    m_flow_pos*(hSet - inStream(port_a.h_outflow));
-    else
-      if restrictHeat and restrictCool then
-        // Capacity limits for heating and cooling
-        dhAct = IBPSA.Utilities.Math.Functions.smoothLimit(
-                x=hSet - inStream(port_a.h_outflow),
-                l=QMin_flow/m_flow_non_zero,
-                u=QMax_flow/m_flow_non_zero,
-                deltaX=deltaH);
-      elseif restrictHeat then
-        // Capacity limit for heating only
-        dhAct = IBPSA.Utilities.Math.Functions.smoothMin(
-                x1=hSet - inStream(port_a.h_outflow),
-                x2=QMax_flow/m_flow_non_zero,
-                deltaX=deltaH);
-      else
-        // Capacity limit for cooling only
-        dhAct = IBPSA.Utilities.Math.Functions.smoothMax(
-                x1=hSet - inStream(port_a.h_outflow),
-                x2=QMin_flow/m_flow_non_zero,
-                deltaX=deltaH);
-      end if;
-      port_b.h_outflow = inStream(port_a.h_outflow) + dhAct;
-      Q_flow = m_flow_pos*dhAct;
-    end if;
-  else
-    port_b.h_outflow = inStream(port_a.h_outflow);
-    Q_flow = 0;
-    dhAct = 0;
-  end if;
-
-  // Outflowing property at port_a is unaffected by this model.
-  if allowFlowReversal then
-    port_a.h_outflow =  inStream(port_b.h_outflow);
-    port_a.Xi_outflow = inStream(port_b.Xi_outflow);
-    port_a.C_outflow =  inStream(port_b.C_outflow);
-  else
-    port_a.h_outflow =  Medium.h_default;
-    port_a.Xi_outflow = Medium.X_default[1:Medium.nXi];
-    port_a.C_outflow =  zeros(Medium.nC);
-  end if;
-  // No pressure drop
-  dp = 0;
-
-  // Mass balance (no storage)
-  port_a.m_flow + port_b.m_flow = 0;
-
-  // Transport of substances
+   end if;
+// Compute mass fraction leaving the component.
+// Below, we use sum(Xi_instream) as Xi anyway has only one element.
+// However, scalar(Xi_instream) would not work as dim(Xi_instream) = 0
+// if the medium is not a mixture.
+// Note that the computations for the mass fraction and for the
+// enthalpy change are identical. In a development version, they were
+// put in a function, but this led to large nonlinear systems of equations.
+  if use_X_wSet then
+    if not restrictHumi and not restrictDehu then
+// No capacity limit
+      dXiAct = Xi_outflow - sum(Xi_instream);
+      Xi_outflow = Xi;
+      mWat_flow = m_flow_pos * (Xi - sum(Xi_instream));
+    else
+      if restrictHumi and restrictDehu then
+// Capacity limits for heating and cooling
+        dXiAct = IBPSA.Utilities.Math.Functions.smoothLimit(x = Xi - sum(Xi_instream), l = mWatMin_flow / m_flow_non_zero, u = mWatMax_flow / m_flow_non_zero, deltaX = deltaXi);
+      elseif restrictHumi then
+// Capacity limit for heating only
+        dXiAct = IBPSA.Utilities.Math.Functions.smoothMin(x1 = Xi - sum(Xi_instream), x2 = mWatMax_flow / m_flow_non_zero, deltaX = deltaXi);
+      else
+// Capacity limit for cooling only
+        dXiAct = IBPSA.Utilities.Math.Functions.smoothMax(x1 = Xi - sum(Xi_instream), x2 = mWatMin_flow / m_flow_non_zero, deltaX = deltaXi);
+      end if;
+      Xi_outflow = sum(Xi_instream) + dXiAct;
+      mWat_flow = m_flow_pos * dXiAct;
+    end if;
+    port_b.Xi_outflow = fill(Xi_outflow, Medium.nXi);
+  else
+    Xi_outflow = sum(Xi_instream);
+    mWat_flow = 0;
+    dXiAct = 0;
+    port_b.Xi_outflow = Xi_instream;
+  end if;
+// Compute enthalpy leaving the component.
+  if use_TSet then
+    if not restrictHeat and not restrictCool then
+// No capacity limit
+      dhAct = 0;
+      port_b.h_outflow = hSet;
+      Q_flow = m_flow_pos * (hSet - inStream(port_a.h_outflow));
+    else
+      if restrictHeat and restrictCool then
+// Capacity limits for heating and cooling
+        dhAct = IBPSA.Utilities.Math.Functions.smoothLimit(x = hSet - inStream(port_a.h_outflow), l = QMin_flow / m_flow_non_zero, u = QMax_flow / m_flow_non_zero, deltaX = deltaH);
+      elseif restrictHeat then
+// Capacity limit for heating only
+        dhAct = IBPSA.Utilities.Math.Functions.smoothMin(x1 = hSet - inStream(port_a.h_outflow), x2 = QMax_flow / m_flow_non_zero, deltaX = deltaH);
+      else
+// Capacity limit for cooling only
+        dhAct = IBPSA.Utilities.Math.Functions.smoothMax(x1 = hSet - inStream(port_a.h_outflow), x2 = QMin_flow / m_flow_non_zero, deltaX = deltaH);
+      end if;
+      port_b.h_outflow = inStream(port_a.h_outflow) + dhAct;
+      Q_flow = m_flow_pos * dhAct;
+    end if;
+  else
+    port_b.h_outflow = inStream(port_a.h_outflow);
+    Q_flow = 0;
+    dhAct = 0;
+  end if;
+// Outflowing property at port_a is unaffected by this model.
+  if allowFlowReversal then
+    port_a.h_outflow = inStream(port_b.h_outflow);
+    port_a.Xi_outflow = inStream(port_b.Xi_outflow);
+    port_a.C_outflow = inStream(port_b.C_outflow);
+  else
+    port_a.h_outflow = Medium.h_default;
+    port_a.Xi_outflow = Medium.X_default[1:Medium.nXi];
+    port_a.C_outflow = zeros(Medium.nC);
+  end if;
+// No pressure drop
+  dp = 0;
+// Mass balance (no storage)
+  port_a.m_flow + port_b.m_flow = 0;
+// Transport of substances
   port_b.C_outflow = inStream(port_a.C_outflow);
 
   if not allowFlowReversal then
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Interfaces/StaticFourPortHeatMassExchanger.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Interfaces/StaticFourPortHeatMassExchanger.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Interfaces/StaticFourPortHeatMassExchanger.mo"	2022-03-10 09:57:39.688144341 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Interfaces/StaticFourPortHeatMassExchanger.mo"	2022-03-10 09:58:11.476148368 +0000
@@ -15,12 +15,12 @@
     annotation(Evaluate=true, Dialog(tab="Advanced"));
 
   // Q1_flow is sensible plus latent heat flow rate
-  input Modelica.SIunits.HeatFlowRate Q1_flow
+  input Modelica.Units.SI.HeatFlowRate Q1_flow
     "Heat transferred into the medium 1";
   input Medium1.MassFlowRate mWat1_flow
     "Moisture mass flow rate added to the medium 1";
   // Q2_flow is sensible plus latent heat flow rate
-  input Modelica.SIunits.HeatFlowRate Q2_flow
+  input Modelica.Units.SI.HeatFlowRate Q2_flow
     "Heat transferred into the medium 2";
   input Medium2.MassFlowRate mWat2_flow
     "Moisture mass flow rate added to the medium 2";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Interfaces/StaticTwoPortConservationEquation.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Interfaces/StaticTwoPortConservationEquation.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Interfaces/StaticTwoPortConservationEquation.mo"	2022-03-10 09:57:39.688144341 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Interfaces/StaticTwoPortConservationEquation.mo"	2022-03-10 09:58:11.460148365 +0000
@@ -28,7 +28,7 @@
        use_C_flow "Trace substance mass flow rate added to the medium"
     annotation (Placement(transformation(extent={{-140,-60},{-100,-20}})));
 
-  // Outputs that are needed in models that extend this model
+// Outputs that are needed in models that extend this model
   Modelica.Blocks.Interfaces.RealOutput hOut(unit="J/kg",
                                              start=Medium.specificEnthalpy_pTX(
                                                      p=Medium.p_default,
@@ -68,13 +68,13 @@
 
   Real m_flowInv(unit="s/kg") "Regularization of 1/m_flow of port_a";
 
-  Modelica.SIunits.MassFlowRate mXi_flow[Medium.nXi]
+  Modelica.Units.SI.MassFlowRate mXi_flow[Medium.nXi]
     "Mass flow rates of independent substances added to the medium";
 
-  // Parameters for inverseXRegularized.
-  // These are assigned here for efficiency reason.
-  // Otherwise, they would need to be computed each time
-  // the function is invocated.
+// Parameters for inverseXRegularized.
+  // These are assigned here for efficiency reason.
+  // Otherwise, they would need to be computed each time
+  // the function is invocated.
   final parameter Real deltaReg = m_flow_small/1E3
     "Smoothing region for inverseXRegularized";
 
@@ -99,25 +99,25 @@
       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.SpecificHeatCapacity cp_default=
+  final parameter Modelica.Units.SI.SpecificHeatCapacity cp_default=
     Medium.specificHeatCapacityCp(state=state_default)
     "Specific heat capacity, used to verify energy conservation";
-  constant Modelica.SIunits.TemperatureDifference dTMax(min=1) = 200
+  constant Modelica.Units.SI.TemperatureDifference dTMax(min=1) = 200
     "Maximum temperature difference across the StaticTwoPortConservationEquation";
-  // Conditional connectors
+  // Conditional connectors
   Modelica.Blocks.Interfaces.RealInput mWat_flow_internal(unit="kg/s")
     "Needed to connect to conditional connector";
   Modelica.Blocks.Interfaces.RealInput C_flow_internal[Medium.nC]
     "Needed to connect to conditional connector";
 initial equation
-  // Assert that the substance with name 'water' has been found.
+// Assert that the substance with name 'water' has been found.
   assert(Medium.nXi == 0 or abs(sum(s)-1) < 1e-5,
       "If Medium.nXi > 1, then substance 'water' must be present for one component.'"
          + Medium.mediumName + "'.\n"
          + "Check medium model.");
 
-equation
-  // Conditional connectors
+equation
+// Conditional connectors
   connect(mWat_flow, mWat_flow_internal);
   if not use_mWat_flow then
     mWat_flow_internal = 0;
@@ -126,28 +126,17 @@
   connect(C_flow, C_flow_internal);
   if not use_C_flow then
     C_flow_internal = zeros(Medium.nC);
-  end if;
-
-  // Species flow rate from connector mWat_flow
-  mXi_flow = mWat_flow_internal * s;
-
-  // Regularization of m_flow around the origin to avoid a division by zero
-  // m_flowInv is only used if prescribedHeatFlowRate == true, or
-  // if the input connectors mWat_flow or C_flow are enabled.
-  if use_m_flowInv then
-    m_flowInv = IBPSA.Utilities.Math.Functions.inverseXRegularized(
-            x=port_a.m_flow,
-            delta=deltaReg,
-            deltaInv=deltaInvReg,
-            a=aReg,
-            b=bReg,
-            c=cReg,
-            d=dReg,
-            e=eReg,
-            f=fReg);
-  else
-    // m_flowInv is not used.
-    m_flowInv = 0;
+  end if;
+// Species flow rate from connector mWat_flow
+  mXi_flow = mWat_flow_internal * s;
+// Regularization of m_flow around the origin to avoid a division by zero
+// m_flowInv is only used if prescribedHeatFlowRate == true, or
+// if the input connectors mWat_flow or C_flow are enabled.
+  if use_m_flowInv then
+    m_flowInv = IBPSA.Utilities.Math.Functions.inverseXRegularized(x = port_a.m_flow, delta = deltaReg, deltaInv = deltaInvReg, a = aReg, b = bReg, c = cReg, d = dReg, e = eReg, f = fReg);
+  else
+// m_flowInv is not used.
+    m_flowInv = 0;
   end if;
 
   if prescribedHeatFlowRate then
@@ -160,91 +149,76 @@
    " K > dTMax=" +String(dTMax) + " K.
    This may indicate that energy is not conserved for small mass flow rates.
    The implementation may require prescribedHeatFlowRate = false.");
-  end if;
-
-  if allowFlowReversal then
-    // Formulate hOut using spliceFunction. This avoids an event iteration.
-    // The introduced error is small because deltax=m_flow_small/1e3
-    hOut = IBPSA.Utilities.Math.Functions.regStep(
-            y1=port_b.h_outflow,
-            y2=port_a.h_outflow,
-            x=port_a.m_flow,
-            x_small=m_flow_small/1E3);
-    XiOut = IBPSA.Utilities.Math.Functions.regStep(
-            y1=port_b.Xi_outflow,
-            y2=port_a.Xi_outflow,
-            x=port_a.m_flow,
-            x_small=m_flow_small/1E3);
-    COut = IBPSA.Utilities.Math.Functions.regStep(
-            y1=port_b.C_outflow,
-            y2=port_a.C_outflow,
-            x=port_a.m_flow,
-            x_small=m_flow_small/1E3);
-  else
-    hOut =  port_b.h_outflow;
-    XiOut = port_b.Xi_outflow;
-    COut =  port_b.C_outflow;
-  end if;
-
-  //////////////////////////////////////////////////////////////////////////////////////////
-  // Energy balance and mass balance
-
-    // Mass balance (no storage)
-    port_a.m_flow + port_b.m_flow = if simplify_mWat_flow then 0 else -mWat_flow_internal;
-
-    // Substance balance
-    // a) forward flow
-    if use_m_flowInv then
-      port_b.Xi_outflow = inStream(port_a.Xi_outflow) + mXi_flow * m_flowInv;
-    else // no water is added
-      assert(use_mWat_flow == false, "In " + getInstanceName() + ": Wrong implementation for forward flow.");
-      port_b.Xi_outflow = inStream(port_a.Xi_outflow);
-    end if;
-
-    // b) backward flow
-    if allowFlowReversal then
-      if use_m_flowInv then
-        port_a.Xi_outflow = inStream(port_b.Xi_outflow) - mXi_flow * m_flowInv;
-      else // no water added
-        assert(use_mWat_flow == false, "In " + getInstanceName() + ": Wrong implementation for reverse flow.");
-        port_a.Xi_outflow = inStream(port_b.Xi_outflow);
-      end if;
-    else // no  flow reversal
-      port_a.Xi_outflow = Medium.X_default[1:Medium.nXi];
-    end if;
-
-    // Energy balance.
-    // This equation is approximate since m_flow = port_a.m_flow is used for the mass flow rate
-    // at both ports. Since mWat_flow_internal << m_flow, the error is small.
-    if prescribedHeatFlowRate then
-      port_b.h_outflow = inStream(port_a.h_outflow) + Q_flow * m_flowInv;
-      if allowFlowReversal then
-        port_a.h_outflow = inStream(port_b.h_outflow) - Q_flow * m_flowInv;
-      else
-        port_a.h_outflow = Medium.h_default;
-      end if;
-    else
-      // Case with prescribedHeatFlowRate == false.
-      // port_b.h_outflow is known and the equation needs to be solved for Q_flow.
-      // Hence, we cannot use m_flowInv as for m_flow=0, any Q_flow would satisfiy
-      // Q_flow * m_flowInv = 0.
-      // The same applies for port_b.Xi_outflow and mXi_flow.
-      port_a.m_flow * (inStream(port_a.h_outflow) - port_b.h_outflow)     = -Q_flow;
-      if allowFlowReversal then
-        port_a.m_flow * (inStream(port_b.h_outflow)  - port_a.h_outflow)  = +Q_flow;
-      else
-        // When allowFlowReversal = false, the downstream enthalpy does not matter.
-        // Therefore a dummy value is used to avoid algebraic loops
-        port_a.h_outflow = Medium.h_default;
-      end if;
-    end if;
-
-  // Transport of trace substances
-  if use_m_flowInv and use_C_flow then
-    port_b.C_outflow =  inStream(port_a.C_outflow) + C_flow_internal * m_flowInv;
-  else // no trace substance added.
-    assert(not use_C_flow, "In " + getInstanceName() + ": Wrong implementation of trace substance balance for forward flow.");
-    port_b.C_outflow =  inStream(port_a.C_outflow);
+  end if;
+  if allowFlowReversal then
+// Formulate hOut using spliceFunction. This avoids an event iteration.
+// The introduced error is small because deltax=m_flow_small/1e3
+    hOut = IBPSA.Utilities.Math.Functions.regStep(y1 = port_b.h_outflow, y2 = port_a.h_outflow, x = port_a.m_flow, x_small = m_flow_small / 1E3);
+    XiOut = IBPSA.Utilities.Math.Functions.regStep(y1 = port_b.Xi_outflow, y2 = port_a.Xi_outflow, x = port_a.m_flow, x_small = m_flow_small / 1E3);
+    COut = IBPSA.Utilities.Math.Functions.regStep(y1 = port_b.C_outflow, y2 = port_a.C_outflow, x = port_a.m_flow, x_small = m_flow_small / 1E3);
+  else
+    hOut = port_b.h_outflow;
+    XiOut = port_b.Xi_outflow;
+    COut = port_b.C_outflow;
+  end if;
+//////////////////////////////////////////////////////////////////////////////////////////
+// Energy balance and mass balance
+// Mass balance (no storage)
+  port_a.m_flow + port_b.m_flow = if simplify_mWat_flow then 0 else -mWat_flow_internal;
+// Substance balance
+// a) forward flow
+  if use_m_flowInv then
+    port_b.Xi_outflow = inStream(port_a.Xi_outflow) + mXi_flow * m_flowInv;
+  else
+// no water is added
+    assert(use_mWat_flow == false, "In " + getInstanceName() + ": Wrong implementation for forward flow.");
+    port_b.Xi_outflow = inStream(port_a.Xi_outflow);
+  end if;
+// b) backward flow
+  if allowFlowReversal then
+    if use_m_flowInv then
+      port_a.Xi_outflow = inStream(port_b.Xi_outflow) - mXi_flow * m_flowInv;
+    else
+// no water added
+      assert(use_mWat_flow == false, "In " + getInstanceName() + ": Wrong implementation for reverse flow.");
+      port_a.Xi_outflow = inStream(port_b.Xi_outflow);
+    end if;
+  else
+// no  flow reversal
+    port_a.Xi_outflow = Medium.X_default[1:Medium.nXi];
+  end if;
+// Energy balance.
+// This equation is approximate since m_flow = port_a.m_flow is used for the mass flow rate
+// at both ports. Since mWat_flow_internal << m_flow, the error is small.
+  if prescribedHeatFlowRate then
+    port_b.h_outflow = inStream(port_a.h_outflow) + Q_flow * m_flowInv;
+    if allowFlowReversal then
+      port_a.h_outflow = inStream(port_b.h_outflow) - Q_flow * m_flowInv;
+    else
+      port_a.h_outflow = Medium.h_default;
+    end if;
+  else
+// Case with prescribedHeatFlowRate == false.
+// port_b.h_outflow is known and the equation needs to be solved for Q_flow.
+// Hence, we cannot use m_flowInv as for m_flow=0, any Q_flow would satisfiy
+// Q_flow * m_flowInv = 0.
+// The same applies for port_b.Xi_outflow and mXi_flow.
+    port_a.m_flow * (inStream(port_a.h_outflow) - port_b.h_outflow) = -Q_flow;
+    if allowFlowReversal then
+      port_a.m_flow * (inStream(port_b.h_outflow) - port_a.h_outflow) = +Q_flow;
+    else
+// When allowFlowReversal = false, the downstream enthalpy does not matter.
+// Therefore a dummy value is used to avoid algebraic loops
+      port_a.h_outflow = Medium.h_default;
+    end if;
+  end if;
+// Transport of trace substances
+  if use_m_flowInv and use_C_flow then
+    port_b.C_outflow = inStream(port_a.C_outflow) + C_flow_internal * m_flowInv;
+  else
+// no trace substance added.
+    assert(not use_C_flow, "In " + getInstanceName() + ": Wrong implementation of trace substance balance for forward flow.");
+    port_b.C_outflow = inStream(port_a.C_outflow);
   end if;
 
   if allowFlowReversal then
@@ -255,12 +229,10 @@
     end if;
   else
     port_a.C_outflow = zeros(Medium.nC);
-  end if;
-
-  ////////////////////////////////////////////////////////////////////////////
-  // No pressure drop in this model
+  end if;
+////////////////////////////////////////////////////////////////////////////
+// No pressure drop in this model
   port_a.p = port_b.p;
-
   annotation (
     preferredView="info",
     Documentation(info="
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Interfaces/StaticTwoPortHeatMassExchanger.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Interfaces/StaticTwoPortHeatMassExchanger.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Interfaces/StaticTwoPortHeatMassExchanger.mo"	2022-03-10 09:57:39.688144341 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Interfaces/StaticTwoPortHeatMassExchanger.mo"	2022-03-10 09:58:11.412148360 +0000
@@ -14,11 +14,11 @@
 
   // Model inputs
   // Q_flow is the sensible plus latent heat flow rate
-  input Modelica.SIunits.HeatFlowRate Q_flow "Heat transferred into the medium";
-  input Modelica.SIunits.MassFlowRate mWat_flow
+  input Modelica.Units.SI.HeatFlowRate Q_flow "Heat transferred into the medium";
+  input Modelica.Units.SI.MassFlowRate mWat_flow
     "Moisture mass flow rate added to the medium";
 
-  // Models for conservation equations and pressure drop
+// Models for conservation equations and pressure drop
   IBPSA.Fluid.Interfaces.StaticTwoPortConservationEquation vol(
     redeclare final package Medium = Medium,
     final use_mWat_flow=not sensibleOnly,
@@ -41,7 +41,7 @@
     final dp_nominal=dp_nominal) "Flow resistance"
     annotation (Placement(transformation(extent={{-50,-10},{-30,10}})));
 
-  // Outputs that are needed in models that extend this model
+// Outputs that are needed in models that extend this model
   Modelica.Blocks.Interfaces.RealOutput hOut(unit="J/kg")
     "Leaving temperature of the component";
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Interfaces/TwoPortFlowResistanceParameters.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Interfaces/TwoPortFlowResistanceParameters.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Interfaces/TwoPortFlowResistanceParameters.mo"	2022-03-10 09:57:39.688144341 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Interfaces/TwoPortFlowResistanceParameters.mo"	2022-03-10 09:58:11.396148357 +0000
@@ -10,7 +10,7 @@
     "= true, use m_flow = f(dp) else dp = f(m_flow)"
     annotation (Evaluate=true, Dialog(enable = computeFlowResistance,
                 tab="Flow resistance"));
-  parameter Modelica.SIunits.PressureDifference dp_nominal(min=0,
+  parameter Modelica.Units.SI.PressureDifference dp_nominal(min=0,
                                                            displayUnit="Pa")
     "Pressure difference"
     annotation(Dialog(group = "Nominal condition"));
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Interfaces/TwoPortHeatMassExchanger.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Interfaces/TwoPortHeatMassExchanger.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Interfaces/TwoPortHeatMassExchanger.mo"	2022-03-10 09:57:39.688144341 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Interfaces/TwoPortHeatMassExchanger.mo"	2022-03-10 09:58:11.384148356 +0000
@@ -6,15 +6,15 @@
   extends IBPSA.Fluid.Interfaces.TwoPortFlowResistanceParameters(final
       computeFlowResistance=true);
 
-  parameter Modelica.SIunits.Time tau = 30
+  parameter Modelica.Units.SI.Time tau = 30
     "Time constant at nominal flow (if energyDynamics <> SteadyState)"
      annotation (Dialog(tab = "Dynamics", group="Nominal condition"));
 
-  // Advanced
+// Advanced
   parameter Boolean homotopyInitialization = true "= true, use homotopy method"
     annotation(Evaluate=true, Dialog(tab="Advanced"));
 
-  // Dynamics
+// Dynamics
   parameter Modelica.Fluid.Types.Dynamics energyDynamics=Modelica.Fluid.Types.Dynamics.DynamicFreeInitial
     "Type of energy balance: dynamic (3 initialization options) or steady state"
     annotation(Evaluate=true, Dialog(tab = "Dynamics", group="Equations"));
@@ -22,7 +22,7 @@
     "Type of mass balance: dynamic (3 initialization options) or steady state"
     annotation(Evaluate=true, Dialog(tab = "Dynamics", group="Equations"));
 
-  // Initialization
+// Initialization
   parameter Medium.AbsolutePressure p_start = Medium.p_default
     "Start value of pressure"
     annotation(Dialog(tab = "Initialization"));
@@ -69,13 +69,13 @@
 protected
   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 Medium.ThermodynamicState sta_start=Medium.setState_pTX(
       T=T_start, p=p_start, X=X_start);
-  parameter Modelica.SIunits.SpecificEnthalpy h_outflow_start = Medium.specificEnthalpy(sta_start)
-    "Start value for outflowing enthalpy";
 
+  parameter Modelica.Units.SI.SpecificEnthalpy h_outflow_start = Medium.specificEnthalpy(sta_start)
+    "Start value for outflowing enthalpy";
 initial algorithm
   assert((energyDynamics == Modelica.Fluid.Types.Dynamics.SteadyState) or
           tau > Modelica.Constants.eps,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/MassExchangers/ConstantEffectiveness.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/MassExchangers/ConstantEffectiveness.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/MassExchangers/ConstantEffectiveness.mo"	2022-03-10 09:57:39.688144341 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/MassExchangers/ConstantEffectiveness.mo"	2022-03-10 09:58:11.336148350 +0000
@@ -15,20 +15,20 @@
     mWat1_flow=+mWat_flow,
     mWat2_flow=-mWat_flow);
 
-  parameter Modelica.SIunits.Efficiency epsS(max=1) = 0.8
+  parameter Modelica.Units.SI.Efficiency epsS(max=1) = 0.8
     "Sensible heat exchanger effectiveness";
-  parameter Modelica.SIunits.Efficiency epsL(max=1) = 0.8
+  parameter Modelica.Units.SI.Efficiency epsL(max=1) = 0.8
     "Latent heat exchanger effectiveness";
 
-  Modelica.SIunits.HeatFlowRate QLat_flow
+  Modelica.Units.SI.HeatFlowRate QLat_flow
     "Latent heat exchange from medium 2 to medium 1";
 
   Medium1.MassFraction X_w_in1 "Inlet water mass fraction of medium 1";
   Medium2.MassFraction X_w_in2 "Inlet water mass fraction of medium 2";
 
-  Modelica.SIunits.MassFlowRate mWat_flow
+  Modelica.Units.SI.MassFlowRate mWat_flow
     "Water flow rate from medium 2 to medium 1";
-  Modelica.SIunits.MassFlowRate mMax_flow
+  Modelica.Units.SI.MassFlowRate mMax_flow
     "Maximum water flow rate from medium 2 to medium 1";
 
 protected
@@ -59,34 +59,29 @@
     assert(i2_w > 0, "Substance 'water' is not present in Medium2 '"
          + Medium2.mediumName + "'.\n"
          + "Check medium model.");
-equation
-  // Definitions for effectiveness model
-  X_w_in1 = Modelica.Fluid.Utilities.regStep(m1_flow,
-                  state_a1_inflow.X[i1_w],
-                  state_b1_inflow.X[i1_w], m1_flow_small);
+equation
+// Definitions for effectiveness model
+  X_w_in1 = Modelica.Fluid.Utilities.regStep(m1_flow, state_a1_inflow.X[i1_w], state_b1_inflow.X[i1_w], m1_flow_small);
   X_w_in2 = Modelica.Fluid.Utilities.regStep(m2_flow,
                   state_a2_inflow.X[i2_w],
-                  state_b2_inflow.X[i2_w], m2_flow_small);
-
-  // mass exchange
-  // Compute a gain that goes to zero near zero flow rate.
-  // This is required to smoothen the heat transfer at very small flow rates.
-  // Note that gaiK = 1 for abs(mK_flow) > mK_flow_small
-  gai1 = Modelica.Fluid.Utilities.regStep(abs(m1_flow) - 0.75*m1_flow_small,
-              1, 0, 0.25*m1_flow_small);
+                  state_b2_inflow.X[i2_w], m2_flow_small);
+// mass exchange
+// Compute a gain that goes to zero near zero flow rate.
+// This is required to smoothen the heat transfer at very small flow rates.
+// Note that gaiK = 1 for abs(mK_flow) > mK_flow_small
+  gai1 = Modelica.Fluid.Utilities.regStep(abs(m1_flow) - 0.75 * m1_flow_small, 1, 0, 0.25 * m1_flow_small);
   gai2 = Modelica.Fluid.Utilities.regStep(abs(m2_flow) - 0.75*m2_flow_small,
               1, 0, 0.25*m2_flow_small);
 
   mMax_flow = smooth(1, min(smooth(1, gai1 * abs(m1_flow)),
                             smooth(1, gai2 * abs(m2_flow)))) * (X_w_in2 - X_w_in1);
-  mWat_flow = epsL * mMax_flow;
-  // As enthalpyOfCondensingGas is dominated by the latent heat of phase change,
-  // we simplify and use Medium1.enthalpyOfVaporization for the
-  // latent heat that is exchanged among the fluid streams.
-  // This is simply added to QSen_flow, while mass is conserved because
-  // of the assignment of mWat1_flow and mWat2_flow.
+  mWat_flow = epsL * mMax_flow;
+// As enthalpyOfCondensingGas is dominated by the latent heat of phase change,
+// we simplify and use Medium1.enthalpyOfVaporization for the
+// latent heat that is exchanged among the fluid streams.
+// This is simply added to QSen_flow, while mass is conserved because
+// of the assignment of mWat1_flow and mWat2_flow.
   QLat_flow = mWat_flow * Medium1.enthalpyOfVaporization(Medium1.T_default);
-
   annotation (Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,
             -100},{100,100}}), graphics={
         Rectangle(
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/MixingVolumes/BaseClasses/PartialMixingVolume.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/MixingVolumes/BaseClasses/PartialMixingVolume.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/MixingVolumes/BaseClasses/PartialMixingVolume.mo"	2022-03-10 09:57:39.688144341 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/MixingVolumes/BaseClasses/PartialMixingVolume.mo"	2022-03-10 09:58:11.188148331 +0000
@@ -7,29 +7,29 @@
     "= true to set up initial equations for pressure"
     annotation(HideResult=true, Evaluate=true, Dialog(tab="Advanced"));
 
-  // We set prescribedHeatFlowRate=false so that the
-  // volume works without the user having to set this advanced parameter,
-  // but to get high robustness, a user can set it to the appropriate value
-  // as described in the info section.
+// We set prescribedHeatFlowRate=false so that the
+  // volume works without the user having to set this advanced parameter,
+  // but to get high robustness, a user can set it to the appropriate value
+  // as described in the info section.
   constant Boolean prescribedHeatFlowRate = false
     "Set to true if the model has a prescribed heat flow at its heatPort. If the heat flow rate at the heatPort is only based on temperature difference, then set to false";
 
   constant Boolean simplify_mWat_flow = true
     "Set to true to cause port_a.m_flow + port_b.m_flow = 0 even if mWat_flow is non-zero";
 
-  parameter Modelica.SIunits.MassFlowRate m_flow_nominal(min=0)
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal(min=0)
     "Nominal mass flow rate"
     annotation(Dialog(group = "Nominal condition"));
-  // Port definitions
+  // Port definitions
   parameter Integer nPorts=0 "Number of ports"
     annotation(Evaluate=true, Dialog(connectorSizing=true, tab="General",group="Ports"));
-  parameter Modelica.SIunits.MassFlowRate m_flow_small(min=0) = 1E-4*abs(m_flow_nominal)
+  parameter Modelica.Units.SI.MassFlowRate m_flow_small(min=0) = 1E-4*abs(m_flow_nominal)
     "Small mass flow rate for regularization of zero flow"
     annotation(Dialog(tab = "Advanced"));
   parameter Boolean allowFlowReversal = true
     "= false to simplify equations, assuming, but not enforcing, no flow reversal. Used only if model has two ports."
     annotation(Dialog(tab="Assumptions"), Evaluate=true);
-  parameter Modelica.SIunits.Volume V "Volume";
+  parameter Modelica.Units.SI.Volume V "Volume";
   Modelica.Fluid.Vessels.BaseClasses.VesselFluidPorts_b ports[nPorts](
       redeclare each package Medium = Medium) "Fluid inlets and outlets"
     annotation (Placement(transformation(extent={{-40,-10},{40,10}},
@@ -39,10 +39,10 @@
     "Temperature of the fluid";
   Modelica.Blocks.Interfaces.RealOutput U(unit="J")
     "Internal energy of the component";
-  Modelica.SIunits.Pressure p = if nPorts > 0 then ports[1].p else p_start
+  Modelica.Units.SI.Pressure p = if nPorts > 0 then ports[1].p else p_start
     "Pressure of the fluid";
   Modelica.Blocks.Interfaces.RealOutput m(unit="kg") "Mass of the component";
-  Modelica.SIunits.MassFraction Xi[Medium.nXi] = XiOut_internal
+  Modelica.Units.SI.MassFraction Xi[Medium.nXi] = XiOut_internal
     "Species concentration of the fluid";
   Modelica.Blocks.Interfaces.RealOutput mXi[Medium.nXi](each unit="kg")
     "Species mass of the component";
@@ -80,23 +80,23 @@
     annotation (Placement(transformation(extent={{60,0},{80,20}})));
 
   // Density at start values, used to compute initial values and start guesses
-  parameter Modelica.SIunits.Density rho_start=Medium.density(
+  parameter Modelica.Units.SI.Density rho_start=Medium.density(
    state=state_start) "Density, used to compute start and guess values";
   final parameter Medium.ThermodynamicState state_default = Medium.setState_pTX(
       T=Medium.T_default,
       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 compute fluid mass";
   final parameter Medium.ThermodynamicState state_start = Medium.setState_pTX(
       T=T_start,
       p=p_start,
       X=X_start[1:Medium.nXi]) "Medium state at start values";
-  // See info section for why prescribedHeatFlowRate is used here.
-  // The condition below may only be changed if StaticTwoPortConservationEquation
-  // contains a correct solution for all foreseeable parameters/inputs.
-  // See Buildings, issue 282 for a discussion.
+  // See info section for why prescribedHeatFlowRate is used here.
+  // The condition below may only be changed if StaticTwoPortConservationEquation
+  // contains a correct solution for all foreseeable parameters/inputs.
+  // See Buildings, issue 282 for a discussion.
   final parameter Boolean useSteadyStateTwoPort=(nPorts == 2) and
       (prescribedHeatFlowRate or (not allowFlowReversal)) and (
       energyDynamics == Modelica.Fluid.Types.Dynamics.SteadyState) and (
@@ -105,7 +105,7 @@
       traceDynamics == Modelica.Fluid.Types.Dynamics.SteadyState)
     "Flag, true if the model has two ports only and uses a steady state balance"
     annotation (Evaluate=true);
-  // Outputs that are needed to assign the medium properties
+  // Outputs that are needed to assign the medium properties
   Modelica.Blocks.Interfaces.RealOutput hOut_internal(unit="J/kg")
     "Internal connector for leaving temperature of the component";
   Modelica.Blocks.Interfaces.RealOutput XiOut_internal[Medium.nXi](each unit="1")
@@ -121,48 +121,42 @@
   Modelica.Thermal.HeatTransfer.Sensors.HeatFlowSensor heaFloSen
     "Heat flow sensor"
     annotation (Placement(transformation(extent={{-90,-10},{-70,10}})));
-equation
-  ///////////////////////////////////////////////////////////////////////////
-  // asserts
-  if not allowFlowReversal then
-    assert(ports[1].m_flow > -m_flow_small,
-"Model has flow reversal, but the parameter allowFlowReversal is set to false.
+equation
+///////////////////////////////////////////////////////////////////////////
+// asserts
+  if not allowFlowReversal then
+    assert(ports[1].m_flow > (-m_flow_small), "Model has flow reversal, but the parameter allowFlowReversal is set to false.
   m_flow_small    = " + String(m_flow_small) + "
   ports[1].m_flow = " + String(ports[1].m_flow) + "
-");
-  end if;
-  // Actual definition of port variables.
-  //
-  // If the model computes the energy and mass balances as steady-state,
-  // and if it has only two ports,
-  // then we use the same base class as for all other steady state models.
-  if useSteadyStateTwoPort then
-  connect(steBal.port_a, ports[1]) annotation (Line(
-      points={{20,10},{10,10},{10,-20},{0,-20},{0,-20},{0,-100}},
-      color={0,127,255}));
-
-  connect(steBal.port_b, ports[2]) annotation (Line(
-      points={{40,10},{46,10},{46,-20},{0,-20},{0,-100}},
-      color={0,127,255}));
-    U=0;
-    mXi=zeros(Medium.nXi);
-    m=0;
-    mC=zeros(Medium.nC);
-    connect(hOut_internal,  steBal.hOut);
-    connect(XiOut_internal, steBal.XiOut);
-    connect(COut_internal,  steBal.COut);
-  else
-      connect(dynBal.ports, ports) annotation (Line(
-      points={{70,0},{70,-80},{62,-80},{2.22045e-15,-80},{2.22045e-15,-90},{2.22045e-15,
-            -100}},
-      color={0,127,255}));
-    connect(U,dynBal.UOut);
-    connect(mXi,dynBal.mXiOut);
-    connect(m,dynBal.mOut);
-    connect(mC,dynBal.mCOut);
-    connect(hOut_internal,  dynBal.hOut);
-    connect(XiOut_internal, dynBal.XiOut);
-    connect(COut_internal,  dynBal.COut);
+    ");
+  end if;
+// Actual definition of port variables.
+//
+// If the model computes the energy and mass balances as steady-state,
+// and if it has only two ports,
+// then we use the same base class as for all other steady state models.
+  if useSteadyStateTwoPort then
+    connect(steBal.port_a, ports[1]) annotation(
+      Line(points = {{20, 10}, {10, 10}, {10, -20}, {0, -20}, {0, -20}, {0, -100}}, color = {0, 127, 255}));
+    connect(steBal.port_b, ports[2]) annotation(
+      Line(points = {{40, 10}, {46, 10}, {46, -20}, {0, -20}, {0, -100}}, color = {0, 127, 255}));
+    U = 0;
+    mXi = zeros(Medium.nXi);
+    m = 0;
+    mC = zeros(Medium.nC);
+    connect(hOut_internal, steBal.hOut);
+    connect(XiOut_internal, steBal.XiOut);
+    connect(COut_internal, steBal.COut);
+  else
+    connect(dynBal.ports, ports) annotation(
+      Line(points = {{70, 0}, {70, -80}, {62, -80}, {2.22045e-15, -80}, {2.22045e-15, -90}, {2.22045e-15, -100}}, color = {0, 127, 255}));
+    connect(U, dynBal.UOut);
+    connect(mXi, dynBal.mXiOut);
+    connect(m, dynBal.mOut);
+    connect(mC, dynBal.mCOut);
+    connect(hOut_internal, dynBal.hOut);
+    connect(XiOut_internal, dynBal.XiOut);
+    connect(COut_internal, dynBal.COut);
   end if;
 
   connect(portT.y, preTem.T)
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/MixingVolumes/Examples/MixingVolumeMoistAir.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/MixingVolumes/Examples/MixingVolumeMoistAir.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/MixingVolumes/Examples/MixingVolumeMoistAir.mo"	2022-03-10 09:57:39.688144341 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/MixingVolumes/Examples/MixingVolumeMoistAir.mo"	2022-03-10 09:58:11.088148319 +0000
@@ -4,7 +4,7 @@
 
   package Medium = IBPSA.Media.Air;
 
-  parameter Modelica.SIunits.MassFlowRate m_flow_nominal = 0.001
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = 0.001
     "Nominal mass flow rate";
 
   IBPSA.Fluid.MixingVolumes.MixingVolumeMoistAir vol1(
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/MixingVolumes/Validation/BaseClasses/MixingVolumeReverseFlow.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/MixingVolumes/Validation/BaseClasses/MixingVolumeReverseFlow.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/MixingVolumes/Validation/BaseClasses/MixingVolumeReverseFlow.mo"	2022-03-10 09:57:39.688144341 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/MixingVolumes/Validation/BaseClasses/MixingVolumeReverseFlow.mo"	2022-03-10 09:58:10.956148303 +0000
@@ -6,8 +6,8 @@
 
   constant Boolean prescribedHeatFlowRate = false
     "Flag that affects what steady state balance is used in the volume";
-  parameter Modelica.SIunits.Pressure dp_nominal = 10 "Nominal pressure drop";
-  parameter Modelica.SIunits.MassFlowRate m_flow_nominal = 2.0
+  parameter Modelica.Units.SI.Pressure dp_nominal = 10 "Nominal pressure drop";
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = 2.0
     "Nominal mass flow rate";
 
   Modelica.Fluid.Sources.MassFlowSource_T sou(
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/MixingVolumes/Validation/MixingVolumeMassFlow.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/MixingVolumes/Validation/MixingVolumeMassFlow.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/MixingVolumes/Validation/MixingVolumeMassFlow.mo"	2022-03-10 09:57:39.688144341 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/MixingVolumes/Validation/MixingVolumeMassFlow.mo"	2022-03-10 09:58:10.740148275 +0000
@@ -3,9 +3,9 @@
   extends Modelica.Icons.Example;
  package Medium = IBPSA.Media.Air "Medium model";
 
-  parameter Modelica.SIunits.PressureDifference dp_nominal = 10
+  parameter Modelica.Units.SI.PressureDifference dp_nominal = 10
     "Nominal pressure drop";
-  parameter Modelica.SIunits.MassFlowRate m_flow_nominal = 0.5
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = 0.5
     "Nominal mass flow rate";
 
   Modelica.Fluid.Sources.MassFlowSource_T sou(
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/MixingVolumes/Validation/MixingVolumeTraceSubstance.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/MixingVolumes/Validation/MixingVolumeTraceSubstance.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/MixingVolumes/Validation/MixingVolumeTraceSubstance.mo"	2022-03-10 09:57:39.688144341 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/MixingVolumes/Validation/MixingVolumeTraceSubstance.mo"	2022-03-10 09:58:10.656148264 +0000
@@ -5,8 +5,8 @@
  package Medium = IBPSA.Media.Air (extraPropertiesNames={"CO2"})
     "Medium model";
 
-  parameter Modelica.SIunits.Pressure dp_nominal = 10 "Nominal pressure drop";
-  parameter Modelica.SIunits.MassFlowRate m_flow_nominal = 0.5
+  parameter Modelica.Units.SI.Pressure dp_nominal = 10 "Nominal pressure drop";
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = 0.5
     "Nominal mass flow rate";
 
   Modelica.Fluid.Sources.MassFlowSource_T sou(
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/MixingVolumes/Validation/MixingVolumeZeroFlow.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/MixingVolumes/Validation/MixingVolumeZeroFlow.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/MixingVolumes/Validation/MixingVolumeZeroFlow.mo"	2022-03-10 09:57:39.688144341 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/MixingVolumes/Validation/MixingVolumeZeroFlow.mo"	2022-03-10 09:58:10.616148259 +0000
@@ -38,7 +38,7 @@
     "Prescribed temperature"
     annotation (Placement(transformation(extent={{-56,34},{-44,46}})));
   Modelica.Blocks.Sources.Cosine cos1(
-    freqHz=1,
+    f =1,
     offset=283.15,
     amplitude=0.001) "Cosine input"
     annotation (Placement(transformation(extent={{-76,34},{-64,46}})));
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/MixingVolumes/Validation/MoistureMixingConservationDynamicBalance.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/MixingVolumes/Validation/MoistureMixingConservationDynamicBalance.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/MixingVolumes/Validation/MoistureMixingConservationDynamicBalance.mo"	2022-03-10 09:57:39.688144341 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/MixingVolumes/Validation/MoistureMixingConservationDynamicBalance.mo"	2022-03-10 09:58:10.560148252 +0000
@@ -15,9 +15,9 @@
     hSol(k=sum(U_start)),
     mWatFlo3(k=0));
 
-    parameter Modelica.SIunits.Mass[3] m_start(each fixed=false)
+    parameter Modelica.Units.SI.Mass[3] m_start(each fixed=false)
     "Initial mass of the mixing volumes";
-    parameter Modelica.SIunits.InternalEnergy[3] U_start(each fixed=false)
+    parameter Modelica.Units.SI.InternalEnergy[3] U_start(each fixed=false)
     "Initial energy of the mixing volumes";
   Modelica.Blocks.Continuous.Integrator intMasFloVapIn(
     k=1,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/BaseClasses/Characteristics/efficiency.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/BaseClasses/Characteristics/efficiency.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/BaseClasses/Characteristics/efficiency.mo"	2022-03-10 09:57:39.688144341 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/BaseClasses/Characteristics/efficiency.mo"	2022-03-10 09:58:10.440148236 +0000
@@ -1,49 +1,36 @@
-within BuildSysPro.IBPSA.Fluid.Movers.BaseClasses.Characteristics;
-function efficiency "Flow vs. efficiency characteristics for fan or pump"
-  extends Modelica.Icons.Function;
-  input
-    IBPSA.Fluid.Movers.BaseClasses.Characteristics.efficiencyParameters
-    per "Efficiency performance data";
-  input Modelica.SIunits.VolumeFlowRate V_flow "Volumetric flow rate";
-  input Real d[:] "Derivatives at support points for spline interpolation";
-  input Real r_N(unit="1") "Relative revolution, r_N=N/N_nominal";
-  input Real delta "Small value for switching implementation around zero rpm";
-  output Real eta(unit="1", final quantity="Efficiency") "Efficiency";
-
-protected
-  Integer n = size(per.V_flow, 1) "Number of data points";
-  Real rat "Ratio of V_flow/r_N";
-  Integer i "Integer to select data interval";
-algorithm
-  if n == 1 then
-    eta := per.eta[1];
-  else
-    // The use of the max function to avoids problems for low speeds
-    // and turned off pumps
-    rat := V_flow/IBPSA.Utilities.Math.Functions.smoothMax(
-                x1=r_N,
-                x2=0.1,
-                deltaX=delta);
-    i :=1;
-    for j in 1:n-1 loop
-       if rat > per.V_flow[j] then
-         i := j;
-       end if;
-    end for;
-    // Extrapolate or interpolate the data
-    eta :=
-      IBPSA.Utilities.Math.Functions.cubicHermiteLinearExtrapolation(
-                x=rat,
-                x1=per.V_flow[i],
-                x2=per.V_flow[i + 1],
-                y1=per.eta[i],
-                y2=per.eta[i + 1],
-                y1d=d[i],
-                y2d=d[i + 1]);
-  end if;
-
-  annotation(smoothOrder=1,
-              Documentation(info="
+within BuildSysPro.IBPSA.Fluid.Movers.BaseClasses.Characteristics;
+
+function efficiency "Flow vs. efficiency characteristics for fan or pump"
+  extends Modelica.Icons.Function;
+  input IBPSA.Fluid.Movers.BaseClasses.Characteristics.efficiencyParameters per "Efficiency performance data";
+  input Modelica.Units.SI.VolumeFlowRate V_flow "Volumetric flow rate";
+  input Real d[:] "Derivatives at support points for spline interpolation";
+  input Real r_N(unit = "1") "Relative revolution, r_N=N/N_nominal";
+  input Real delta "Small value for switching implementation around zero rpm";
+  output Real eta(unit = "1", final quantity = "Efficiency") "Efficiency";
+protected
+  Integer n = size(per.V_flow, 1) "Number of data points";
+  Real rat "Ratio of V_flow/r_N";
+  Integer i "Integer to select data interval";
+algorithm
+  if n == 1 then
+    eta := per.eta[1];
+  else
+    rat := V_flow / IBPSA.Utilities.Math.Functions.smoothMax(x1 = r_N, x2 = 0.1, deltaX = delta);
+    i := 1;
+    for j in 1:n - 1 loop
+      if rat > per.V_flow[j] then
+        i := j;
+      end if;
+    end for;
+    eta := IBPSA.Utilities.Math.Functions.cubicHermiteLinearExtrapolation(x = rat, x1 = per.V_flow[i], x2 = per.V_flow[i + 1], y1 = per.eta[i], y2 = per.eta[i + 1], y1d = d[i], y2d = d[i + 1]);
+  end if;
+// The use of the max function to avoids problems for low speeds
+// and turned off pumps
+// Extrapolate or interpolate the data
+  annotation(
+    smoothOrder = 1,
+    Documentation(info = "
 
      
 This function computes the fan or pump efficiency for given normalized volume flow rate
 and performance data. The efficiency is
@@ -64,8 +51,7 @@
 If the data d define a monotone decreasing sequence, then
 s(·, d) is a monotone decreasing function.
 
      
-",
-revisions="
+", revisions = "
 
        
 
      • 
 December 2, 2016, by Michael Wetter:
        
@@ -97,5 +83,5 @@
 First implementation.
 
        • 
 
      
-"));
-end efficiency;
+"));
+end efficiency;
\ No newline at end of file
Only in converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/BaseClasses/Characteristics: efficiency.mo.after
Only in converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/BaseClasses/Characteristics: efficiency.mo.before
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/BaseClasses/Characteristics/efficiencyParameters.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/BaseClasses/Characteristics/efficiencyParameters.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/BaseClasses/Characteristics/efficiencyParameters.mo"	2022-03-10 09:57:39.688144341 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/BaseClasses/Characteristics/efficiencyParameters.mo"	2022-03-10 09:58:10.424148234 +0000
@@ -1,9 +1,9 @@
 within BuildSysPro.IBPSA.Fluid.Movers.BaseClasses.Characteristics;
 record efficiencyParameters "Record for efficiency parameters"
   extends Modelica.Icons.Record;
-  parameter Modelica.SIunits.VolumeFlowRate V_flow[:](
+  parameter Modelica.Units.SI.VolumeFlowRate V_flow[:](
     each min=0) "Volumetric flow rate at user-selected operating points";
-  parameter Modelica.SIunits.Efficiency eta[size(V_flow,1)](
+  parameter Modelica.Units.SI.Efficiency eta[size(V_flow,1)](
     each max=1) "Fan or pump efficiency at these flow rates";
   annotation (Documentation(info="
 
      
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/BaseClasses/Characteristics/flowParameters.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/BaseClasses/Characteristics/flowParameters.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/BaseClasses/Characteristics/flowParameters.mo"	2022-03-10 09:57:39.688144341 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/BaseClasses/Characteristics/flowParameters.mo"	2022-03-10 09:58:10.412148234 +0000
@@ -2,12 +2,12 @@
 record flowParameters "Record for flow parameters"
   extends Modelica.Icons.Record;
 
-  parameter Modelica.SIunits.VolumeFlowRate V_flow[:](each min=0)
+
+  parameter Modelica.Units.SI.VolumeFlowRate V_flow[:](each min=0)
     "Volume flow rate at user-selected operating points";
-  parameter Modelica.SIunits.PressureDifference dp[size(V_flow,1)](
+  parameter Modelica.Units.SI.PressureDifference dp[size(V_flow,1)](
      each min=0, each displayUnit="Pa")
     "Fan or pump total pressure at these flow rates";
-
   annotation (Documentation(info="
 
      
 Data record for performance data that describe volume flow rate versus
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/BaseClasses/Characteristics/flowParametersInternal.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/BaseClasses/Characteristics/flowParametersInternal.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/BaseClasses/Characteristics/flowParametersInternal.mo"	2022-03-10 09:57:39.688144341 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/BaseClasses/Characteristics/flowParametersInternal.mo"	2022-03-10 09:58:10.400148232 +0000
@@ -3,9 +3,9 @@
   extends Modelica.Icons.Record;
   parameter Integer n "Number of elements in each array"
    annotation(Evaluate=true);
-  parameter Modelica.SIunits.VolumeFlowRate V_flow[n](each min=0)
+  parameter Modelica.Units.SI.VolumeFlowRate V_flow[n](each min=0)
     "Volume flow rate at user-selected operating points";
-  parameter Modelica.SIunits.PressureDifference dp[n](
+  parameter Modelica.Units.SI.PressureDifference dp[n](
      each min=0, each displayUnit="Pa")
     "Fan or pump total pressure at these flow rates";
   annotation (Documentation(info="
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/BaseClasses/Characteristics/power.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/BaseClasses/Characteristics/power.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/BaseClasses/Characteristics/power.mo"	2022-03-10 09:57:39.688144341 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/BaseClasses/Characteristics/power.mo"	2022-03-10 09:58:10.352148225 +0000
@@ -1,50 +1,36 @@
-within BuildSysPro.IBPSA.Fluid.Movers.BaseClasses.Characteristics;
-function power "Flow vs. electrical power characteristics for fan or pump"
-  extends Modelica.Icons.Function;
-  input
-    IBPSA.Fluid.Movers.BaseClasses.Characteristics.powerParameters per
-    "Pressure performance data";
-  input Modelica.SIunits.VolumeFlowRate V_flow "Volumetric flow rate";
-  input Real r_N(unit="1") "Relative revolution, r_N=N/N_nominal";
-  input Real d[:] "Derivatives at support points for spline interpolation";
-  input Real delta "Small value for switching implementation around zero rpm";
-  output Modelica.SIunits.Power P "Power consumption";
-
-protected
-   Integer n=size(per.V_flow, 1) "Dimension of data vector";
-
-   Modelica.SIunits.VolumeFlowRate rat "Ratio of V_flow/r_N";
-   Integer i "Integer to select data interval";
-
-algorithm
-  if n == 1 then
-    P := r_N^3*per.P[1];
-  else
-    i :=1;
-    // The use of the max function to avoids problems for low speeds
-    // and turned off pumps
-    rat := V_flow/IBPSA.Utilities.Math.Functions.smoothMax(
-                x1=r_N,
-                x2=0.1,
-                deltaX=delta);
-    for j in 1:n-1 loop
-       if rat > per.V_flow[j] then
-         i := j;
-       end if;
-    end for;
-    // Extrapolate or interpolate the data
-    P := r_N^3*
-      IBPSA.Utilities.Math.Functions.cubicHermiteLinearExtrapolation(
-                x=rat,
-                x1=per.V_flow[i],
-                x2=per.V_flow[i + 1],
-                y1=per.P[i],
-                y2=per.P[i + 1],
-                y1d=d[i],
-                y2d=d[i + 1]);
-  end if;
-  annotation(smoothOrder=1,
-              Documentation(info="
+within BuildSysPro.IBPSA.Fluid.Movers.BaseClasses.Characteristics;
+
+function power "Flow vs. electrical power characteristics for fan or pump"
+  extends Modelica.Icons.Function;
+  input IBPSA.Fluid.Movers.BaseClasses.Characteristics.powerParameters per "Pressure performance data";
+  input Modelica.Units.SI.VolumeFlowRate V_flow "Volumetric flow rate";
+  input Real r_N(unit = "1") "Relative revolution, r_N=N/N_nominal";
+  input Real d[:] "Derivatives at support points for spline interpolation";
+  input Real delta "Small value for switching implementation around zero rpm";
+  output Modelica.Units.SI.Power P "Power consumption";
+protected
+  Integer n = size(per.V_flow, 1) "Dimension of data vector";
+  Modelica.Units.SI.VolumeFlowRate rat "Ratio of V_flow/r_N";
+  Integer i "Integer to select data interval";
+algorithm
+  if n == 1 then
+    P := r_N ^ 3 * per.P[1];
+  else
+    i := 1;
+    rat := V_flow / IBPSA.Utilities.Math.Functions.smoothMax(x1 = r_N, x2 = 0.1, deltaX = delta);
+    for j in 1:n - 1 loop
+      if rat > per.V_flow[j] then
+        i := j;
+      end if;
+    end for;
+    P := r_N ^ 3 * IBPSA.Utilities.Math.Functions.cubicHermiteLinearExtrapolation(x = rat, x1 = per.V_flow[i], x2 = per.V_flow[i + 1], y1 = per.P[i], y2 = per.P[i + 1], y1d = d[i], y2d = d[i + 1]);
+  end if;
+// The use of the max function to avoids problems for low speeds
+// and turned off pumps
+// Extrapolate or interpolate the data
+  annotation(
+    smoothOrder = 1,
+    Documentation(info = "
 
      
 This function computes the fan power consumption for given volume flow rate,
 speed and performance data. The power consumption is
@@ -65,8 +51,7 @@
 If the data d define a monotone decreasing sequence, then
 s(·, d) is a monotone decreasing function.
 
      
-",
-        revisions="
+", revisions = "
 
        
 
      • 
 February 26, 2014, by Filip Jorissen:
        
@@ -81,5 +66,5 @@
 First implementation.
 
        • 
 
      
-"));
-end power;
+"));
+end power;
\ No newline at end of file
Only in converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/BaseClasses/Characteristics: power.mo.after
Only in converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/BaseClasses/Characteristics: power.mo.before
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/BaseClasses/Characteristics/powerParameters.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/BaseClasses/Characteristics/powerParameters.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/BaseClasses/Characteristics/powerParameters.mo"	2022-03-10 09:57:39.688144341 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/BaseClasses/Characteristics/powerParameters.mo"	2022-03-10 09:58:10.336148224 +0000
@@ -1,9 +1,9 @@
 within BuildSysPro.IBPSA.Fluid.Movers.BaseClasses.Characteristics;
 record powerParameters "Record for electrical power parameters"
   extends Modelica.Icons.Record;
-  parameter Modelica.SIunits.VolumeFlowRate V_flow[:](each min=0)
+  parameter Modelica.Units.SI.VolumeFlowRate V_flow[:](each min=0)
     "Volume flow rate at user-selected operating points";
-  parameter Modelica.SIunits.Power P[size(V_flow,1)](each min=0)
+  parameter Modelica.Units.SI.Power P[size(V_flow,1)](each min=0)
     "Fan or pump electrical power at these flow rates";
   annotation (Documentation(info="
 
      
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/BaseClasses/Characteristics/pressure.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/BaseClasses/Characteristics/pressure.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/BaseClasses/Characteristics/pressure.mo"	2022-03-10 09:57:39.688144341 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/BaseClasses/Characteristics/pressure.mo"	2022-03-10 09:58:10.316148220 +0000
@@ -3,18 +3,18 @@
   "Pump or fan head away from the origin without correction for mover flow resistance"
   extends Modelica.Icons.Function;
 
-  input Modelica.SIunits.VolumeFlowRate V_flow "Volumetric flow rate";
+  input Modelica.Units.SI.VolumeFlowRate V_flow "Volumetric flow rate";
   input Real r_N(unit="1") "Relative revolution, r_N=N/N_nominal";
   input Real d[:] "Derivatives of flow rate vs. pressure at the support points";
-  input Modelica.SIunits.PressureDifference dpMax(displayUnit="Pa")
+  input Modelica.Units.SI.PressureDifference dpMax(displayUnit="Pa")
     "Maximum pressure drop at nominal speed, for regularisation";
-  input Modelica.SIunits.VolumeFlowRate V_flow_max
+  input Modelica.Units.SI.VolumeFlowRate V_flow_max
     "Maximum flow rate at nominal speed, for regularisation";
   input
     IBPSA.Fluid.Movers.BaseClasses.Characteristics.flowParametersInternal
     per "Pressure performance data";
 
-  output Modelica.SIunits.PressureDifference dp(displayUnit="Pa") "Pressure raise";
+  output Modelica.Units.SI.PressureDifference dp(displayUnit="Pa") "Pressure raise";
 
 protected
   constant Real delta = 0.05
@@ -22,52 +22,37 @@
   constant Real delta2 = delta/2 "= delta/2";
   Real r_R(unit="1") "Relative revolution, bounded below by delta";
   Integer i "Integer to select data interval";
-  Modelica.SIunits.VolumeFlowRate rat "Ratio of V_flow/r_R";
+  Modelica.Units.SI.VolumeFlowRate rat "Ratio of V_flow/r_R";
 
-algorithm
-  // For r_N < delta, we restrict r_N in the term V_flow/r_N.
-  // This is done using a cubic spline in a region 0.75*delta < r_N < 1.25*r_N
-  // We call this restricted value r_R
-  if r_N > delta then
-    r_R :=r_N;
-  elseif r_N < 0 then
-    r_R := delta2;
-  else
-    // Restrict r_N using a spline
-    r_R :=Modelica.Fluid.Utilities.cubicHermite(
-      x=r_N,
-      x1=0,
-      x2=delta,
-      y1=delta2,
-      y2=delta,
-      y1d=0,
-      y2d=1);
-  end if;
-
-  i :=1;
+algorithm
+// For r_N < delta, we restrict r_N in the term V_flow/r_N.
+// This is done using a cubic spline in a region 0.75*delta < r_N < 1.25*r_N
+// We call this restricted value r_R
+  if r_N > delta then
+    r_R := r_N;
+  elseif r_N < 0 then
+    r_R := delta2;
+  else
+    r_R := Modelica.Fluid.Utilities.cubicHermite(x = r_N, x1 = 0, x2 = delta, y1 = delta2, y2 = delta, y1d = 0, y2d = 1);
+  end if;
+// Restrict r_N using a spline
+  i := 1;
 
   rat := V_flow/r_R;
   for j in 1:size(d, 1)-1 loop
     if rat > per.V_flow[j] then
       i := j;
     end if;
-  end for;
-  // In the assignment below,
-  // dp -> 0 as r_N -> 0 quadratically, because rat is bounded
-  // by the above regularization
-  if r_N>=0 then
-    dp := r_N^2*
-      IBPSA.Utilities.Math.Functions.cubicHermiteLinearExtrapolation(
-                x=rat,
-                x1=per.V_flow[i],
-                x2=per.V_flow[i + 1],
-                y1=per.dp[i],
-                y2=per.dp[i + 1],
-                y1d=d[i],
-                y2d=d[i + 1]);
-  else
-    dp:=-r_N^2*(dpMax-dpMax/V_flow_max*V_flow);
-  end if;
+  end for;
+// In the assignment below,
+// dp -> 0 as r_N -> 0 quadratically, because rat is bounded
+// by the above regularization
+  if r_N >= 0 then
+    dp := r_N ^ 2 * IBPSA.Utilities.Math.Functions.cubicHermiteLinearExtrapolation(x = rat, x1 = per.V_flow[i], x2 = per.V_flow[i + 1], y1 = per.dp[i], y2 = per.dp[i + 1], y1d = d[i], y2d = d[i + 1]);
+  else
+    dp := -r_N ^ 2 * (dpMax - dpMax / V_flow_max * V_flow);
+  end if;
+
 annotation(smoothOrder=1,
 Documentation(info="
 
      
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/BaseClasses/FlowMachineInterface.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/BaseClasses/FlowMachineInterface.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/BaseClasses/FlowMachineInterface.mo"	2022-03-10 09:57:39.688144341 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/BaseClasses/FlowMachineInterface.mo"	2022-03-10 09:58:10.304148219 +0000
@@ -14,16 +14,16 @@
   parameter Boolean computePowerUsingSimilarityLaws
     "= true, compute power exactly, using similarity laws. Otherwise approximate.";
 
-  final parameter Modelica.SIunits.VolumeFlowRate V_flow_nominal=
+  final parameter Modelica.Units.SI.VolumeFlowRate V_flow_nominal=
     per.pressure.V_flow[nOri] "Nominal volume flow rate, used for homotopy";
 
-  parameter Modelica.SIunits.Density rho_default
+  parameter Modelica.Units.SI.Density rho_default
     "Fluid density at medium default state";
 
   parameter Boolean haveVMax
     "Flag, true if user specified data that contain V_flow_max";
 
-  parameter Modelica.SIunits.VolumeFlowRate V_flow_max
+  parameter Modelica.Units.SI.VolumeFlowRate V_flow_max
     "Maximum volume flow rate, used for smoothing";
 
   parameter Integer nOri(min=1) "Number of data points for pressure curve"
@@ -32,7 +32,7 @@
   parameter Boolean homotopyInitialization = true "= true, use homotopy method"
     annotation(Evaluate=true, Dialog(tab="Advanced"));
 
- // Normalized speed
+// Normalized speed
   Modelica.Blocks.Interfaces.RealInput y_in(final unit="1") if preSpe
     "Prescribed mover speed"
     annotation (Placement(
@@ -103,7 +103,7 @@
     annotation (Placement(transformation(extent={{100,-110},{120,-90}}),
         iconTransformation(extent={{100,-110},{120,-90}})));
 
-  // "Shaft rotational speed";
+// "Shaft rotational speed";
   Modelica.Blocks.Interfaces.RealOutput r_N(unit="1")
     "Ratio N_actual/N_nominal";
   Real r_V(start=1, unit="1") "Ratio V_flow/V_flow_max";
@@ -117,13 +117,13 @@
     preVar ==IBPSA.Fluid.Movers.BaseClasses.Types.PrescribedVariable.FlowRate
     "True if pressure head is a prescribed variable of this block";
 
-  // Derivatives for cubic spline
+// Derivatives for cubic spline
   final parameter Real motDer[size(per.motorEfficiency.V_flow, 1)](each fixed=false)
     "Coefficients for polynomial of motor efficiency vs. volume flow rate";
   final parameter Real hydDer[size(per.hydraulicEfficiency.V_flow,1)](each fixed=false)
     "Coefficients for polynomial of hydraulic efficiency vs. volume flow rate";
 
-  parameter Modelica.SIunits.PressureDifference dpMax(displayUnit="Pa")=
+  parameter Modelica.Units.SI.PressureDifference dpMax(displayUnit="Pa")=
     if haveDPMax then
       per.pressure.dp[1]
     else
@@ -265,8 +265,8 @@
   end for;
 end getArrayAsString;
 
-initial equation
-  // Check validity of data
+initial equation
+// Check validity of data
   assert(nOri > 1, "Must have at least two data points for pressure.V_flow.");
   assert(IBPSA.Utilities.Math.Functions.isMonotonic(x=per.pressure.V_flow,
     strict=true) and per.pressure.V_flow[1] > -Modelica.Constants.eps, "The fan pressure rise must be a strictly decreasing sequence with respect to the volume flow rate,
@@ -282,11 +282,10 @@
 Received
 " + getArrayAsString(per.pressure.dp, "dp"));
 
-  end if;
-
-  // Write warning if the volumetric flow rate versus pressure curve does not satisfy
-  // the minimum decrease condition
-  if (not haveMinimumDecrease) then
+  end if;
+// Write warning if the volumetric flow rate versus pressure curve does not satisfy
+// the minimum decrease condition
+  if not haveMinimumDecrease then
     Modelica.Utilities.Streams.print("
 Warning:
 ========
@@ -298,243 +297,120 @@
        (per.pressure.V_flow[i+1]-per.pressure.V_flow[i])
 
  is
-" + getArrayAsString({(per.pressure.dp[i+1]-per.pressure.dp[i])
-        /(per.pressure.V_flow[i+1]-per.pressure.V_flow[i]) for i in 1:nOri-1}, "d") + "
+    " + getArrayAsString({(per.pressure.dp[i + 1] - per.pressure.dp[i]) / (per.pressure.V_flow[i + 1] - per.pressure.V_flow[i]) for i in 1:nOri - 1}, "d") + "
 Otherwise, a solution to the equations may not exist if the fan or pump speed is reduced.
 In this situation, the solver will fail due to non-convergence and
-the simulation stops.");
-  end if;
-
-  // Correction for flow resistance of pump or fan
-  if (haveVMax and haveDPMax) or (nOri == 2) then  // ----- Curve 1
-    // V_flow_max and dpMax are provided by the user, or we only have two data points
-    preDer1 = IBPSA.Utilities.Math.Functions.splineDerivatives(x=pCur1.V_flow,
-      y=pCur1.dp);
-    preDer2= zeros(nOri + 1);
-    preDer3= zeros(nOri + 2);
-  elseif haveVMax or haveDPMax then  // ----- Curve 2
-    // V_flow_max or dpMax is provided by the user, but not both
-    preDer1= zeros(nOri);
-    preDer2 = IBPSA.Utilities.Math.Functions.splineDerivatives(x=pCur2.V_flow,
-      y=pCur2.dp);
-    preDer3= zeros(nOri + 2);
-  else  // ----- Curve 3
-    // Neither V_flow_max nor dpMax are provided by the user
-    preDer1= zeros(nOri);
-    preDer2= zeros(nOri + 1);
-    preDer3 = IBPSA.Utilities.Math.Functions.splineDerivatives(x=pCur3.V_flow,
-      y=pCur3.dp);
-  end if;
-
- // Compute derivatives for cubic spline
-  motDer = if per.use_powerCharacteristic then zeros(size(per.motorEfficiency.V_flow,
-    1)) elseif (size(per.motorEfficiency.V_flow, 1) == 1) then {0}
-     else IBPSA.Utilities.Math.Functions.splineDerivatives(
-            x=per.motorEfficiency.V_flow,
-            y=per.motorEfficiency.eta,
-            ensureMonotonicity=
-      IBPSA.Utilities.Math.Functions.isMonotonic(x=per.motorEfficiency.eta,
-      strict=false));
+the simulation stops.");
+  end if;
+// Correction for flow resistance of pump or fan
+  if haveVMax and haveDPMax or nOri == 2 then
+// ----- Curve 1
+// V_flow_max and dpMax are provided by the user, or we only have two data points
+    preDer1 = IBPSA.Utilities.Math.Functions.splineDerivatives(x = pCur1.V_flow, y = pCur1.dp);
+    preDer2 = zeros(nOri + 1);
+    preDer3 = zeros(nOri + 2);
+  elseif haveVMax or haveDPMax then
+// ----- Curve 2
+// V_flow_max or dpMax is provided by the user, but not both
+    preDer1 = zeros(nOri);
+    preDer2 = IBPSA.Utilities.Math.Functions.splineDerivatives(x = pCur2.V_flow, y = pCur2.dp);
+    preDer3 = zeros(nOri + 2);
+  else
+// ----- Curve 3
+// Neither V_flow_max nor dpMax are provided by the user
+    preDer1 = zeros(nOri);
+    preDer2 = zeros(nOri + 1);
+    preDer3 = IBPSA.Utilities.Math.Functions.splineDerivatives(x = pCur3.V_flow, y = pCur3.dp);
+  end if;
+// Compute derivatives for cubic spline
+  motDer = if per.use_powerCharacteristic then zeros(size(per.motorEfficiency.V_flow, 1)) elseif size(per.motorEfficiency.V_flow, 1) == 1 then {0} else IBPSA.Utilities.Math.Functions.splineDerivatives(x = per.motorEfficiency.V_flow, y = per.motorEfficiency.eta, ensureMonotonicity = IBPSA.Utilities.Math.Functions.isMonotonic(x = per.motorEfficiency.eta, strict = false));
   hydDer = if per.use_powerCharacteristic then zeros(size(per.hydraulicEfficiency.V_flow,
     1)) elseif (size(per.hydraulicEfficiency.V_flow, 1) == 1) then {0}
      else IBPSA.Utilities.Math.Functions.splineDerivatives(x=per.hydraulicEfficiency.V_flow,
     y=per.hydraulicEfficiency.eta);
 
-equation
-  //assign values of dp and r_N, depending on which variable exists and is prescribed
-  connect(dp_internal,dp);
+equation
+//assign values of dp and r_N, depending on which variable exists and is prescribed
+  connect(dp_internal, dp);
   connect(dp_internal,dp_in);
   connect(r_N, y_in);
   y_out=r_N;
 
-  V_flow = m_flow/rho;
-
-  // Hydraulic equations
-  r_V = V_flow/V_flow_max;
-
-  // If the speed is not prescribed and we do not require exact power computations, we set r_N = 1.
-  // Similarity laws are then not used, meaning the power computation is less accurate.
-  // This however has the advantage that no non-linear algebraic loop is formed and
-  // it allows an implementation when the pressure curve is unknown.
-  if (computePowerUsingSimilarityLaws == false) and preVar <> IBPSA.Fluid.Movers.BaseClasses.Types.PrescribedVariable.Speed then
-    r_N=1;
-  else
-  // For the homotopy method, we approximate dp by an equation
-  // that is linear in V_flow, and that goes linearly to 0 as r_N goes to 0.
-  // The three branches below are identical, except that we pass either
-  // pCur1, pCur2 or pCur3, and preDer1, preDer2 or preDer3
-  if (curve == 1) then
-    if homotopyInitialization then
-       V_flow*kRes + dp_internal = homotopy(actual=cha.pressure(
-                                                     V_flow=V_flow,
-                                                     r_N=r_N,
-                                                     dpMax=dpMax,
-                                                     V_flow_max=V_flow_max,
-                                                     d=preDer1,
-                                                     per=pCur1),
-                                           simplified=r_N * (cha.pressure(
-                                                     V_flow=V_flow_nominal,
-                                                     r_N=1,
-                                                     dpMax=dpMax,
-                                                     V_flow_max=V_flow_max,
-                                                     d=preDer1,
-                                                     per=pCur1)
-                               +(V_flow-V_flow_nominal) * (cha.pressure(
-                                                     V_flow=(1+delta)*V_flow_nominal,
-                                                     r_N=1,
-                                                     dpMax=dpMax,
-                                                     V_flow_max=V_flow_max,
-                                                     d=preDer1,
-                                                     per=pCur1)
-                                       -cha.pressure(V_flow=(1-delta)*V_flow_nominal,
-                                                     r_N=1,
-                                                     dpMax=dpMax,
-                                                     V_flow_max=V_flow_max,
-                                                     d=preDer1,
-                                                     per=pCur1))
-                                                    /(2*delta*V_flow_nominal)));
-
-    else
-       V_flow*kRes + dp_internal= cha.pressure(V_flow=V_flow,
-                                               r_N=r_N,
-                                               dpMax=dpMax,
-                                                     V_flow_max=V_flow_max,
-                                               d=preDer1,
-                                               per=pCur1);
-    end if;     // end of computation for this branch
-   elseif (curve == 2) then
-    if homotopyInitialization then
-       V_flow*kRes + dp_internal = homotopy(actual=cha.pressure(
-                                                     V_flow=V_flow,
-                                                     r_N=r_N,
-                                                     dpMax=dpMax,
-                                                     V_flow_max=V_flow_max,
-                                                     d=preDer2,
-                                                     per=pCur2),
-                                            simplified=r_N * (cha.pressure(
-                                                     V_flow=V_flow_nominal,
-                                                     r_N=1,
-                                                     dpMax=dpMax,
-                                                     V_flow_max=V_flow_max,
-                                                     d=preDer2,
-                                                     per=pCur2)
-                               +(V_flow-V_flow_nominal) * (cha.pressure(
-                                                     V_flow=(1+delta)*V_flow_nominal,
-                                                     r_N=1,
-                                                     dpMax=dpMax,
-                                                     V_flow_max=V_flow_max,
-                                                     d=preDer2,
-                                                     per=pCur2)
-                                       -cha.pressure(V_flow=(1-delta)*V_flow_nominal,
-                                                     r_N=1,
-                                                     dpMax=dpMax,
-                                                     V_flow_max=V_flow_max,
-                                                     d=preDer2,
-                                                     per=pCur2))
-                                                    /(2*delta*V_flow_nominal)));
-
-    else
-       V_flow*kRes + dp_internal= cha.pressure(V_flow=V_flow,
-                                                      r_N=r_N,
-                                                      dpMax=dpMax,
-                                                      V_flow_max=V_flow_max,
-                                                      d=preDer2,
-                                                      per=pCur2);
-    end if;     // end of computation for this branch
-  else
-    if homotopyInitialization then
-       V_flow*kRes + dp_internal = homotopy(actual=cha.pressure(
-                                                     V_flow=V_flow,
-                                                     r_N=r_N,
-                                                     dpMax=dpMax,
-                                                     V_flow_max=V_flow_max,
-                                                     d=preDer3,
-                                                     per=pCur3),
-                          simplified=r_N * (cha.pressure(
-                                                     V_flow=V_flow_nominal,
-                                                     r_N=1,
-                                                     dpMax=dpMax,
-                                                     V_flow_max=V_flow_max,
-                                                     d=preDer3,
-                                                     per=pCur3)
-                               +(V_flow-V_flow_nominal)*
-                                       (cha.pressure(V_flow=(1+delta)*V_flow_nominal,
-                                                     r_N=1,
-                                                     dpMax=dpMax,
-                                                     V_flow_max=V_flow_max,
-                                                     d=preDer3,
-                                                     per=pCur3)
-                                       -cha.pressure(V_flow=(1-delta)*V_flow_nominal,
-                                                     r_N=1,
-                                                     dpMax=dpMax,
-                                                     V_flow_max=V_flow_max,
-                                                     d=preDer3,
-                                                     per=pCur3))
-                                                    /(2*delta*V_flow_nominal)));
-
-    else
-       V_flow*kRes + dp_internal= cha.pressure(V_flow=V_flow,
-                                                      r_N=r_N,
-                                                      dpMax=dpMax,
-                                                      V_flow_max=V_flow_max,
-                                                      d=preDer3,
-                                                      per=pCur3);
-    end if;
-    // end of computation for this branch
+  V_flow = m_flow/rho;
+// Hydraulic equations
+  r_V = V_flow / V_flow_max;
+// If the speed is not prescribed and we do not require exact power computations, we set r_N = 1.
+// Similarity laws are then not used, meaning the power computation is less accurate.
+// This however has the advantage that no non-linear algebraic loop is formed and
+// it allows an implementation when the pressure curve is unknown.
+  if computePowerUsingSimilarityLaws == false and preVar <> IBPSA.Fluid.Movers.BaseClasses.Types.PrescribedVariable.Speed then
+    r_N = 1;
+  else
+// For the homotopy method, we approximate dp by an equation
+// that is linear in V_flow, and that goes linearly to 0 as r_N goes to 0.
+// The three branches below are identical, except that we pass either
+// pCur1, pCur2 or pCur3, and preDer1, preDer2 or preDer3
+    if curve == 1 then
+      if homotopyInitialization then
+        V_flow * kRes + dp_internal = homotopy(actual = cha.pressure(V_flow = V_flow, r_N = r_N, dpMax = dpMax, V_flow_max = V_flow_max, d = preDer1, per = pCur1), simplified = r_N * (cha.pressure(V_flow = V_flow_nominal, r_N = 1, dpMax = dpMax, V_flow_max = V_flow_max, d = preDer1, per = pCur1) + (V_flow - V_flow_nominal) * (cha.pressure(V_flow = (1 + delta) * V_flow_nominal, r_N = 1, dpMax = dpMax, V_flow_max = V_flow_max, d = preDer1, per = pCur1) - cha.pressure(V_flow = (1 - delta) * V_flow_nominal, r_N = 1, dpMax = dpMax, V_flow_max = V_flow_max, d = preDer1, per = pCur1)) / (2 * delta * V_flow_nominal)));
+      else
+        V_flow * kRes + dp_internal = cha.pressure(V_flow = V_flow, r_N = r_N, dpMax = dpMax, V_flow_max = V_flow_max, d = preDer1, per = pCur1);
+      end if;
+// end of computation for this branch
+    elseif curve == 2 then
+      if homotopyInitialization then
+        V_flow * kRes + dp_internal = homotopy(actual = cha.pressure(V_flow = V_flow, r_N = r_N, dpMax = dpMax, V_flow_max = V_flow_max, d = preDer2, per = pCur2), simplified = r_N * (cha.pressure(V_flow = V_flow_nominal, r_N = 1, dpMax = dpMax, V_flow_max = V_flow_max, d = preDer2, per = pCur2) + (V_flow - V_flow_nominal) * (cha.pressure(V_flow = (1 + delta) * V_flow_nominal, r_N = 1, dpMax = dpMax, V_flow_max = V_flow_max, d = preDer2, per = pCur2) - cha.pressure(V_flow = (1 - delta) * V_flow_nominal, r_N = 1, dpMax = dpMax, V_flow_max = V_flow_max, d = preDer2, per = pCur2)) / (2 * delta * V_flow_nominal)));
+      else
+        V_flow * kRes + dp_internal = cha.pressure(V_flow = V_flow, r_N = r_N, dpMax = dpMax, V_flow_max = V_flow_max, d = preDer2, per = pCur2);
+      end if;
+// end of computation for this branch
+    else
+      if homotopyInitialization then
+        V_flow * kRes + dp_internal = homotopy(actual = cha.pressure(V_flow = V_flow, r_N = r_N, dpMax = dpMax, V_flow_max = V_flow_max, d = preDer3, per = pCur3), simplified = r_N * (cha.pressure(V_flow = V_flow_nominal, r_N = 1, dpMax = dpMax, V_flow_max = V_flow_max, d = preDer3, per = pCur3) + (V_flow - V_flow_nominal) * (cha.pressure(V_flow = (1 + delta) * V_flow_nominal, r_N = 1, dpMax = dpMax, V_flow_max = V_flow_max, d = preDer3, per = pCur3) - cha.pressure(V_flow = (1 - delta) * V_flow_nominal, r_N = 1, dpMax = dpMax, V_flow_max = V_flow_max, d = preDer3, per = pCur3)) / (2 * delta * V_flow_nominal)));
+      else
+        V_flow * kRes + dp_internal = cha.pressure(V_flow = V_flow, r_N = r_N, dpMax = dpMax, V_flow_max = V_flow_max, d = preDer3, per = pCur3);
+      end if;
+// end of computation for this branch
+    end if;
+// end of if/else choosing between exact/simplified power computation
+  end if;
+// Flow work
+  WFlo = dp_internal * V_flow;
+// Power consumption
+  if per.use_powerCharacteristic then
+// For the homotopy, we want P/V_flow to be bounded as V_flow -> 0 to avoid a very high medium
+// temperature near zero flow.
+    if homotopyInitialization then
+      PEle = homotopy(actual = cha.power(per = per.power, V_flow = V_flow, r_N = r_N, d = powDer, delta = delta), simplified = V_flow / V_flow_nominal * cha.power(per = per.power, V_flow = V_flow_nominal, r_N = 1, d = powDer, delta = delta));
+    else
+      PEle = rho / rho_default * cha.power(per = per.power, V_flow = V_flow, r_N = r_N, d = powDer, delta = delta);
+    end if;
+// To compute the efficiency, we set a lower bound on the electricity consumption.
+// This is needed because WFlo can be close to zero when P is zero, thereby
+// causing a division by zero.
+// Earlier versions of the model computed WFlo = eta * P, but this caused
+// a division by zero.
+    eta = WFlo / IBPSA.Utilities.Math.Functions.smoothMax(x1 = PEle, x2 = 1E-5, deltaX = 1E-6);
+// In this configuration, we only know the total power consumption.
+// Because nothing is known about etaMot versus etaHyd, we set etaHyd=1. This will
+// cause etaMot=eta, because eta=etaHyd*etaMot.
+// Earlier versions used etaMot=sqrt(eta), but as eta->0, this function has
+// and infinite derivative.
+    etaHyd = 1;
+    etaMot = eta;
+  else
+    if homotopyInitialization then
+      etaHyd = homotopy(actual = cha.efficiency(per = per.hydraulicEfficiency, V_flow = V_flow, d = hydDer, r_N = r_N, delta = delta), simplified = cha.efficiency(per = per.hydraulicEfficiency, V_flow = V_flow_max, d = hydDer, r_N = r_N, delta = delta));
+      etaMot = homotopy(actual = cha.efficiency(per = per.motorEfficiency, V_flow = V_flow, d = motDer, r_N = r_N, delta = delta), simplified = cha.efficiency(per = per.motorEfficiency, V_flow = V_flow_max, d = motDer, r_N = r_N, delta = delta));
+    else
+      etaHyd = cha.efficiency(per = per.hydraulicEfficiency, V_flow = V_flow, d = hydDer, r_N = r_N, delta = delta);
+      etaMot = cha.efficiency(per = per.motorEfficiency, V_flow = V_flow, d = motDer, r_N = r_N, delta = delta);
+    end if;
+// To compute the electrical power, we set a lower bound for eta to avoid
+// a division by zero.
+    PEle = WFlo / IBPSA.Utilities.Math.Functions.smoothMax(x1 = eta, x2 = 1E-5, deltaX = 1E-6);
+    eta = etaHyd * etaMot;
   end if;
-    // end of if/else choosing between exact/simplified power computation
-  end if;
-
-  // Flow work
-  WFlo = dp_internal*V_flow;
-
-  // Power consumption
-  if per.use_powerCharacteristic then
-    // For the homotopy, we want P/V_flow to be bounded as V_flow -> 0 to avoid a very high medium
-    // temperature near zero flow.
-    if homotopyInitialization then
-      PEle = homotopy(actual=cha.power(per=per.power, V_flow=V_flow, r_N=r_N, d=powDer, delta=delta),
-                      simplified=V_flow/V_flow_nominal*
-                            cha.power(per=per.power, V_flow=V_flow_nominal, r_N=1, d=powDer, delta=delta));
-    else
-      PEle = (rho/rho_default)*cha.power(per=per.power, V_flow=V_flow, r_N=r_N, d=powDer, delta=delta);
-    end if;
-    // To compute the efficiency, we set a lower bound on the electricity consumption.
-    // This is needed because WFlo can be close to zero when P is zero, thereby
-    // causing a division by zero.
-    // Earlier versions of the model computed WFlo = eta * P, but this caused
-    // a division by zero.
-    eta = WFlo/IBPSA.Utilities.Math.Functions.smoothMax(
-              x1=PEle,
-              x2=1E-5,
-              deltaX=1E-6);
-    // In this configuration, we only know the total power consumption.
-    // Because nothing is known about etaMot versus etaHyd, we set etaHyd=1. This will
-    // cause etaMot=eta, because eta=etaHyd*etaMot.
-    // Earlier versions used etaMot=sqrt(eta), but as eta->0, this function has
-    // and infinite derivative.
-    etaHyd = 1;
-    etaMot = eta;
-  else
-    if homotopyInitialization then
-      etaHyd = homotopy(actual=cha.efficiency(per=per.hydraulicEfficiency,     V_flow=V_flow, d=hydDer, r_N=r_N, delta=delta),
-                        simplified=cha.efficiency(per=per.hydraulicEfficiency, V_flow=V_flow_max,   d=hydDer, r_N=r_N, delta=delta));
-      etaMot = homotopy(actual=cha.efficiency(per=per.motorEfficiency,     V_flow=V_flow, d=motDer, r_N=r_N, delta=delta),
-                        simplified=cha.efficiency(per=per.motorEfficiency, V_flow=V_flow_max,   d=motDer, r_N=r_N, delta=delta));
-    else
-      etaHyd = cha.efficiency(per=per.hydraulicEfficiency, V_flow=V_flow, d=hydDer, r_N=r_N, delta=delta);
-      etaMot = cha.efficiency(per=per.motorEfficiency,     V_flow=V_flow, d=motDer, r_N=r_N, delta=delta);
-    end if;
-    // To compute the electrical power, we set a lower bound for eta to avoid
-    // a division by zero.
-    PEle = WFlo/IBPSA.Utilities.Math.Functions.smoothMax(
-              x1=eta,
-              x2=1E-5,
-              deltaX=1E-6);
-    eta = etaHyd * etaMot;
-
-  end if;
-
   annotation (
     Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100,100}}),
                     graphics={
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/BaseClasses/IdealSource.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/BaseClasses/IdealSource.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/BaseClasses/IdealSource.mo"	2022-03-10 09:57:39.688144341 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/BaseClasses/IdealSource.mo"	2022-03-10 09:58:10.220148208 +0000
@@ -3,7 +3,7 @@
   "Base class for pressure and mass flow source with optional power input"
   extends IBPSA.Fluid.Interfaces.PartialTwoPortTransport(show_T=false);
 
-  // Quantity to control
+// Quantity to control
   parameter Boolean control_m_flow
     "if true, then the mass flow rate is equal to the value of m_flow_in"
     annotation(Evaluate = true);
@@ -36,12 +36,12 @@
   Modelica.Blocks.Interfaces.RealInput dp_internal(unit="Pa")
     "Needed to connect to conditional connector";
 
-equation
-  // Ideal control
-  if control_m_flow then
-    m_flow = m_flow_internal;
-  else
-    m_flow_internal = 0;
+equation
+// Ideal control
+  if control_m_flow then
+    m_flow = m_flow_internal;
+  else
+    m_flow_internal = 0;
   end if;
   if control_dp then
     dp = dp_internal;
@@ -50,9 +50,8 @@
   end if;
 
   connect(dp_internal, dp_in);
-  connect(m_flow_internal, m_flow_in);
-
-  // Energy balance (no storage)
+  connect(m_flow_internal, m_flow_in);
+// Energy balance (no storage)
   port_a.h_outflow = if allowFlowReversal then inStream(port_b.h_outflow) else Medium.h_default;
   port_b.h_outflow = inStream(port_a.h_outflow);
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/BaseClasses/PartialFlowMachine.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/BaseClasses/PartialFlowMachine.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/BaseClasses/PartialFlowMachine.mo"	2022-03-10 09:57:39.688144341 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/BaseClasses/PartialFlowMachine.mo"	2022-03-10 09:58:10.200148206 +0000
@@ -38,18 +38,18 @@
   parameter Boolean nominalValuesDefineDefaultPressureCurve = false
     "Set to true to avoid warning if m_flow_nominal and dp_nominal are used to construct the default pressure curve";
 
-  parameter Modelica.SIunits.Time tau=1
+  parameter Modelica.Units.SI.Time tau=1
     "Time constant of fluid volume for nominal flow, used if energy or mass balance is dynamic"
     annotation (Dialog(tab="Dynamics",
                         group="Nominal condition",
                         enable=energyDynamics <> Modelica.Fluid.Types.Dynamics.SteadyState or
                                massDynamics <> Modelica.Fluid.Types.Dynamics.SteadyState));
 
-  // Classes used to implement the filtered speed
+// Classes used to implement the filtered speed
   parameter Boolean use_inputFilter=true
     "= true, if speed is filtered with a 2nd order CriticalDamping filter"
     annotation(Dialog(tab="Dynamics", group="Filtered speed"));
-  parameter Modelica.SIunits.Time riseTime=30
+  parameter Modelica.Units.SI.Time riseTime=30
     "Rise time of the filter (time to reach 99.6 % of the speed)"
     annotation(Dialog(tab="Dynamics", group="Filtered speed",enable=use_inputFilter));
   parameter Modelica.Blocks.Types.Init init=Modelica.Blocks.Types.Init.InitialOutput
@@ -58,7 +58,7 @@
   parameter Real y_start(min=0, max=1, unit="1")=0 "Initial value of speed"
     annotation(Dialog(tab="Dynamics", group="Filtered speed",enable=use_inputFilter));
 
-  // Connectors and ports
+// Connectors and ports
     Modelica.Blocks.Interfaces.IntegerInput stage if inputType == IBPSA.Fluid.Types.InputType.Stages
     "Stage input signal for the pressure head"
     annotation (Placement(
@@ -85,28 +85,28 @@
         iconTransformation(extent={{-10,-78},{10,-58}})));
 
   // Variables
-  Modelica.SIunits.VolumeFlowRate VMachine_flow(start=_VMachine_flow) = eff.V_flow "Volume flow rate";
-  Modelica.SIunits.PressureDifference dpMachine(displayUnit="Pa")=
+  Modelica.Units.SI.VolumeFlowRate VMachine_flow(start=_VMachine_flow) = eff.V_flow "Volume flow rate";
+  Modelica.Units.SI.PressureDifference dpMachine(displayUnit="Pa")=
       -preSou.dp "Pressure difference";
 
   Real eta(unit="1", final quantity="Efficiency") =    eff.eta "Global efficiency";
   Real etaHyd(unit="1", final quantity="Efficiency") = eff.etaHyd "Hydraulic efficiency";
   Real etaMot(unit="1", final quantity="Efficiency") = eff.etaMot "Motor efficiency";
 
-  // Quantity to control
+// Quantity to control
 protected
-  final parameter Modelica.SIunits.VolumeFlowRate _VMachine_flow = 0
+  final parameter Modelica.Units.SI.VolumeFlowRate _VMachine_flow = 0
     "Start value for VMachine_flow, used to avoid a warning if not specified";
 
   parameter Types.PrescribedVariable preVar "Type of prescribed variable";
 
-  // The parameter speedIsInput is required to conditionally remove the instance gain.
-  // If the conditional removal of this instance where to use the test
-  // preVar == IBPSA.Fluid.Movers.BaseClasses.Types.PrescribedVariable.Speed,
-  // then OpenModelica fails to translate the model with the message
-  // .../PartialFlowMachine.mo:185:3-189:70:writable]
-  // Error: Variable Types.PrescribedVariable.Speed not found in scope
-  // IBPSA.Fluid.Movers.SpeedControlled_y$floMac1.
+// The parameter speedIsInput is required to conditionally remove the instance gain.
+  // If the conditional removal of this instance where to use the test
+  // preVar == IBPSA.Fluid.Movers.BaseClasses.Types.PrescribedVariable.Speed,
+  // then OpenModelica fails to translate the model with the message
+  // .../PartialFlowMachine.mo:185:3-189:70:writable]
+  // Error: Variable Types.PrescribedVariable.Speed not found in scope
+  // IBPSA.Fluid.Movers.SpeedControlled_y$floMac1.
   final parameter Boolean speedIsInput=
     (preVar ==IBPSA.Fluid.Movers.BaseClasses.Types.PrescribedVariable.Speed)
     "Parameter that is true if speed is the controlled variables";
@@ -118,7 +118,7 @@
   final parameter Boolean haveVMax = (abs(per.pressure.dp[nOri]) < Modelica.Constants.eps)
     "Flag, true if user specified data that contain V_flow_max";
 
-  final parameter Modelica.SIunits.VolumeFlowRate V_flow_max=
+  final parameter Modelica.Units.SI.VolumeFlowRate V_flow_max=
     if per.havePressureCurve then
     (if haveVMax then
       per.pressure.V_flow[nOri]
@@ -127,7 +127,7 @@
       nOri - 1])/((per.pressure.dp[nOri] - per.pressure.dp[nOri - 1]))*per.pressure.dp[nOri])
     else
       m_flow_nominal/rho_default "Maximum volume flow rate, used for smoothing";
-  final parameter Modelica.SIunits.Density rho_default=
+  final parameter Modelica.Units.SI.Density rho_default=
     Medium.density_pTX(
       p=Medium.p_default,
       T=Medium.T_default,
@@ -138,7 +138,7 @@
     p=p_start,
     X=X_start) "Medium state at start values";
 
-  final parameter Modelica.SIunits.SpecificEnthalpy h_outflow_start = Medium.specificEnthalpy(sta_start)
+  final parameter Modelica.Units.SI.SpecificEnthalpy h_outflow_start = Medium.specificEnthalpy(sta_start)
     "Start value for outflowing enthalpy";
 
   Modelica.Blocks.Sources.Constant[size(stageInputs, 1)] stageValues(
@@ -232,8 +232,8 @@
     redeclare final package Medium = Medium) "Head of mover"
     annotation (Placement(transformation(extent={{58,-27},{43,-14}})));
 
-  // Because the speed data are not used by FlowMachineInterface, we set them
-  // to zero.
+// Because the speed data are not used by FlowMachineInterface, we set them
+  // to zero.
   FlowMachineInterface eff(
     per(
       final hydraulicEfficiency = per.hydraulicEfficiency,
@@ -333,38 +333,29 @@
             fillPattern=FillPattern.Solid)}));
   end Extractor;
 
-initial equation
-  // The control signal is dp or m_flow but the user did not provide a pump curve.
-  // Hence, the speed is computed using default values, which likely are wrong.
-  // Therefore, scaling the power using the speed is inaccurate.
-  assert(   nominalValuesDefineDefaultPressureCurve or per.havePressureCurve
-       or (preVar == IBPSA.Fluid.Movers.BaseClasses.Types.PrescribedVariable.Speed),
-            "*** Warning: You are using a flow or pressure controlled mover with the
+initial equation
+// The control signal is dp or m_flow but the user did not provide a pump curve.
+// Hence, the speed is computed using default values, which likely are wrong.
+// Therefore, scaling the power using the speed is inaccurate.
+  assert(nominalValuesDefineDefaultPressureCurve or per.havePressureCurve or preVar == IBPSA.Fluid.Movers.BaseClasses.Types.PrescribedVariable.Speed, "*** Warning: You are using a flow or pressure controlled mover with the
              default pressure curve.
              This leads to approximate calculations of the electrical power
              consumption. Add the correct pressure curve in the record per
              to obtain an accurate computation.
-             Setting nominalValuesDefineDefaultPressureCurve=true will suppress this warning.",
-            level=AssertionLevel.warning);
-
-  // The control signal is dp or m_flow but the user did not provide a pump curve.
-  // Hence, the speed is computed using default values, which likely are wrong.
-  // In addition, the user wants to use (V_flow, P) to compute the power.
-  // This can lead to using a power that is less than the flow work. We avoid
-  // this by ignoring the setting of per.use_powerCharacteristics.
-  assert(   nominalValuesDefineDefaultPressureCurve or (per.havePressureCurve
-       or (preVar == IBPSA.Fluid.Movers.BaseClasses.Types.PrescribedVariable.Speed))
-       or per.use_powerCharacteristic == false,
-            "*** Warning: You are using a flow or pressure controlled mover with the
+             Setting nominalValuesDefineDefaultPressureCurve=true will suppress this warning.", level = AssertionLevel.warning);
+// The control signal is dp or m_flow but the user did not provide a pump curve.
+// Hence, the speed is computed using default values, which likely are wrong.
+// In addition, the user wants to use (V_flow, P) to compute the power.
+// This can lead to using a power that is less than the flow work. We avoid
+// this by ignoring the setting of per.use_powerCharacteristics.
+  assert(nominalValuesDefineDefaultPressureCurve or per.havePressureCurve or preVar == IBPSA.Fluid.Movers.BaseClasses.Types.PrescribedVariable.Speed or per.use_powerCharacteristic == false, "*** Warning: You are using a flow or pressure controlled mover with the
              default pressure curve and you set use_powerCharacteristic = true.
              Since this can cause wrong power consumption, the model will overwrite
              this setting and use instead use_powerCharacteristic = false.
              Since this causes the efficiency curve to be used,
              make sure that the efficiency curves in the performance record per
              are correct or add the pressure curve of the mover.
-             Setting nominalValuesDefineDefaultPressureCurve=true will suppress this warning.",
-            level=AssertionLevel.warning);
-
+             Setting nominalValuesDefineDefaultPressureCurve=true will suppress this warning.", level = AssertionLevel.warning);
 equation
   connect(prePow.port, vol.heatPort) annotation (Line(
       points={{-34,-94},{-60,-94},{-60,10},{-70,10}},
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/BaseClasses/PowerInterface.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/BaseClasses/PowerInterface.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/BaseClasses/PowerInterface.mo"	2022-03-10 09:57:39.688144341 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/BaseClasses/PowerInterface.mo"	2022-03-10 09:58:10.100148193 +0000
@@ -9,7 +9,7 @@
   parameter Boolean motorCooledByFluid
     "Flag, true if the motor is cooled by the fluid stream";
 
-  parameter Modelica.SIunits.VolumeFlowRate delta_V_flow
+  parameter Modelica.Units.SI.VolumeFlowRate delta_V_flow
     "Factor used for setting heat input into medium to zero at very small flows";
 
   Modelica.Blocks.Interfaces.RealInput etaHyd(
@@ -40,32 +40,21 @@
     final unit="W") "Heat input from fan or pump to medium"
     annotation (Placement(transformation(extent={{100,-10},{120,10}})));
 
-  Modelica.SIunits.Power WHyd
+  Modelica.Units.SI.Power WHyd
     "Hydraulic power input (converted to flow work and heat)";
 
 protected
-  Modelica.SIunits.HeatFlowRate QThe_flow
+  Modelica.Units.SI.HeatFlowRate QThe_flow
     "Heat input from fan or pump to medium";
 
-equation
-  // Hydraulic power (transmitted by shaft), etaHyd = WFlo/WHyd
-  etaHyd * WHyd   = WFlo;
-  // Heat input into medium
-  QThe_flow +  WFlo = if motorCooledByFluid then PEle else WHyd;
-  // At m_flow = 0, the solver may still obtain positive values for QThe_flow.
-  // The next statement sets the heat input into the medium to zero for very small flow rates.
-  Q_flow = if homotopyInitialization then homotopy(actual=
-    IBPSA.Utilities.Math.Functions.regStep(
-            y1=QThe_flow,
-            y2=0,
-            x=noEvent(abs(V_flow)) - 2*delta_V_flow,
-            x_small=delta_V_flow), simplified=0) else
-    IBPSA.Utilities.Math.Functions.regStep(
-            y1=QThe_flow,
-            y2=0,
-            x=noEvent(abs(V_flow)) - 2*delta_V_flow,
-            x_small=delta_V_flow);
-
+equation
+// Hydraulic power (transmitted by shaft), etaHyd = WFlo/WHyd
+  etaHyd * WHyd = WFlo;
+// Heat input into medium
+  QThe_flow + WFlo = if motorCooledByFluid then PEle else WHyd;
+// At m_flow = 0, the solver may still obtain positive values for QThe_flow.
+// The next statement sets the heat input into the medium to zero for very small flow rates.
+  Q_flow = if homotopyInitialization then homotopy(actual = IBPSA.Utilities.Math.Functions.regStep(y1 = QThe_flow, y2 = 0, x = noEvent(abs(V_flow)) - 2 * delta_V_flow, x_small = delta_V_flow), simplified = 0) else IBPSA.Utilities.Math.Functions.regStep(y1 = QThe_flow, y2 = 0, x = noEvent(abs(V_flow)) - 2 * delta_V_flow, x_small = delta_V_flow);
   annotation (
     Icon(coordinateSystem(preserveAspectRatio=true,  extent={{-100,-100},{100,
             100}}), graphics={
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/Data/Generic.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/Data/Generic.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/Data/Generic.mo"	2022-03-10 09:57:39.688144341 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/Data/Generic.mo"	2022-03-10 09:58:10.000148180 +0000
@@ -2,8 +2,8 @@
 record Generic "Generic data record for movers"
   extends Modelica.Icons.Record;
 
-  // Pressure requires default values to avoid in Dymola the message
-  // Failed to expand the variable pressure.V_flow.
+// Pressure requires default values to avoid in Dymola the message
+  // Failed to expand the variable pressure.V_flow.
   parameter
     IBPSA.Fluid.Movers.BaseClasses.Characteristics.flowParameters pressure(V_flow={0,
         0}, dp={0,0}) "Volume flow rate vs. total pressure rise"
@@ -26,8 +26,8 @@
     annotation (Dialog(group="Power computation", enable=not
           use_powerCharacteristic));
 
-  // Power requires default values to avoid in Dymola the message
-  // Failed to expand the variable Power.V_flow
+// Power requires default values to avoid in Dymola the message
+  // Failed to expand the variable Power.V_flow
   parameter BaseClasses.Characteristics.powerParameters power(
     V_flow={0},
     P={0})
@@ -52,28 +52,28 @@
     "Vector of normalized speed set points, used if inputType = IBPSA.Fluid.Types.InputType.Stages"
     annotation (Dialog(group="Normalized speeds (used in model, default values assigned from speeds in rpm)"));
 
-  parameter Modelica.SIunits.Conversions.NonSIunits.AngularVelocity_rpm speed_rpm_nominal=1500
+
+  parameter Modelica.Units.NonSI.AngularVelocity_rpm speed_rpm_nominal=1500
     "Nominal rotational speed for flow characteristic"
     annotation (Dialog(group="Speeds in RPM"));
 
-  parameter Modelica.SIunits.Conversions.NonSIunits.AngularVelocity_rpm constantSpeed_rpm=speed_rpm_nominal
+  parameter Modelica.Units.NonSI.AngularVelocity_rpm constantSpeed_rpm=speed_rpm_nominal
     "Speed set point, used if inputType = IBPSA.Fluid.Types.InputType.Constant"
     annotation (Dialog(group="Speeds in RPM"));
 
-  parameter Modelica.SIunits.Conversions.NonSIunits.AngularVelocity_rpm[:] speeds_rpm = {speed_rpm_nominal}
+  parameter Modelica.Units.NonSI.AngularVelocity_rpm[:] speeds_rpm = {speed_rpm_nominal}
     "Vector of speed set points, used if inputType = IBPSA.Fluid.Types.InputType.Stages"
     annotation (Dialog(group="Speeds in RPM"));
 
-  // Set a parameter in order for
-  // (a) FlowControlled_m_flow and FlowControlled_dp being able to set a reasonable
-  //     default pressure curve if it is not specified here, and
-  // (b) SpeedControlled_y and SpeedControlled_Nrpm being able to issue an assert
-  //     if no pressure curve is specified.
+// Set a parameter in order for
+  // (a) FlowControlled_m_flow and FlowControlled_dp being able to set a reasonable
+  //     default pressure curve if it is not specified here, and
+  // (b) SpeedControlled_y and SpeedControlled_Nrpm being able to issue an assert
+  //     if no pressure curve is specified.
   final parameter Boolean havePressureCurve=
     sum(pressure.V_flow) > Modelica.Constants.eps and
     sum(pressure.dp) > Modelica.Constants.eps
     "= true, if default record values are being used";
-
   annotation (
   defaultComponentPrefixes = "parameter",
   defaultComponentName = "per",
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/Examples/ClosedLoop_y.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/Examples/ClosedLoop_y.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/Examples/ClosedLoop_y.mo"	2022-03-10 09:57:39.692144340 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/Examples/ClosedLoop_y.mo"	2022-03-10 09:58:09.684148140 +0000
@@ -4,9 +4,9 @@
 
   package Medium = IBPSA.Media.Air;
 
-  parameter Modelica.SIunits.MassFlowRate m_flow_nominal= 0.1
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal= 0.1
     "Nominal mass flow rate";
-  parameter Modelica.SIunits.PressureDifference dp_nominal = 500
+  parameter Modelica.Units.SI.PressureDifference dp_nominal = 500
     "Nominal pressure difference";
 
   Modelica.Blocks.Sources.Pulse y(
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/Examples/MoverParameter.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/Examples/MoverParameter.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/Examples/MoverParameter.mo"	2022-03-10 09:57:39.692144340 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/Examples/MoverParameter.mo"	2022-03-10 09:58:09.572148127 +0000
@@ -4,7 +4,7 @@
   extends Modelica.Icons.Example;
   package Medium = IBPSA.Media.Water;
 
-  parameter Modelica.SIunits.MassFlowRate m_flow_nominal=2
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=2
     "Nominal mass flow rate";
 
   FlowControlled_m_flow pump_m_flow(
@@ -59,7 +59,7 @@
     energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState)
     "Pump with speed input"
     annotation (Placement(transformation(extent={{-10,30},{10,50}})));
-  parameter Modelica.SIunits.PressureDifference dp_nominal=10000
+  parameter Modelica.Units.SI.PressureDifference dp_nominal=10000
     "Nominal pressure raise";
 equation
   connect(sou.ports[1], pump_m_flow.port_a) annotation (Line(
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/Examples/MoverStages.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/Examples/MoverStages.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/Examples/MoverStages.mo"	2022-03-10 09:57:39.692144340 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/Examples/MoverStages.mo"	2022-03-10 09:58:09.548148124 +0000
@@ -8,13 +8,13 @@
     pump_dp(inputType=IBPSA.Fluid.Types.InputType.Stages));
   package Medium = IBPSA.Media.Water;
 
-  parameter Modelica.SIunits.MassFlowRate m_flow_nominal=2
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=2
     "Nominal mass flow rate";
 
   Modelica.Blocks.Sources.IntegerTable integerTable(table=[0,1; 0.3,2; 0.6,3])
     "Integer step input, 1 is off, 2 is on"
     annotation (Placement(transformation(extent={{-60,70},{-40,90}})));
-  parameter Modelica.SIunits.PressureDifference dp_nominal=10000 "Nominal pressure raise";
+  parameter Modelica.Units.SI.PressureDifference dp_nominal=10000 "Nominal pressure raise";
 equation
   connect(integerTable.y, pump_Nrpm.stage)
     annotation (Line(points={{-39,80},{0,80},{0,52}}, color={255,127,0}));
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/Examples/PumpsParallel.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/Examples/PumpsParallel.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/Examples/PumpsParallel.mo"	2022-03-10 09:57:39.692144340 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/Examples/PumpsParallel.mo"	2022-03-10 09:58:09.540148123 +0000
@@ -4,10 +4,10 @@
 
   package Medium = IBPSA.Media.Water "Medium model";
 
-  parameter Modelica.SIunits.MassFlowRate m_flow_nominal= 1
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal= 1
     "Nominal mass flow rate";
 
-  parameter Modelica.SIunits.Density rho_nominal=1000
+  parameter Modelica.Units.SI.Density rho_nominal=1000
     "Density, used to compute fluid mass";
 
   IBPSA.Fluid.FixedResistances.PressureDrop dpIn1(
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/Examples/PumpsSeries.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/Examples/PumpsSeries.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/Examples/PumpsSeries.mo"	2022-03-10 09:57:39.692144340 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/Examples/PumpsSeries.mo"	2022-03-10 09:58:09.512148119 +0000
@@ -3,7 +3,7 @@
   extends Modelica.Icons.Example;
   package Medium = IBPSA.Media.Water;
 
-  parameter Modelica.SIunits.MassFlowRate m_flow_nominal=1
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=1
     "Nominal mass flow rate";
 
   IBPSA.Fluid.Movers.SpeedControlled_y floMac1(
@@ -25,7 +25,7 @@
       T=Medium.T_default,
       p=Medium.p_default,
       X=Medium.X_default) "Start state";
-  parameter Modelica.SIunits.Density rho_nominal=Medium.density(
+  parameter Modelica.Units.SI.Density rho_nominal=Medium.density(
      state_start) "Density, used to compute fluid mass";
 
   IBPSA.Fluid.Movers.SpeedControlled_y floMac2(
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/Examples/SpeedControlled_y_pumpCurves.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/Examples/SpeedControlled_y_pumpCurves.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/Examples/SpeedControlled_y_pumpCurves.mo"	2022-03-10 09:57:39.692144340 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/Examples/SpeedControlled_y_pumpCurves.mo"	2022-03-10 09:58:09.492148116 +0000
@@ -6,11 +6,11 @@
 
   // For OpenModelica, changed m_flow_nominal to a constant. Otherwise
   // the translation fails with "Error: Cyclically dependent parameters found"
-  constant Modelica.SIunits.MassFlowRate m_flow_nominal = 0.5
+  constant Modelica.Units.SI.MassFlowRate m_flow_nominal = 0.5
     "Nominal mass flow rate";
   // For OpenModelica, changed dp_nominal to a constant. Otherwise
   // the compilation fails.
-  constant Modelica.SIunits.PressureDifference dp_nominal = 10000
+  constant Modelica.Units.SI.PressureDifference dp_nominal = 10000
     "Nominal pressure";
 
    model pumpModel = IBPSA.Fluid.Movers.SpeedControlled_y (
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/FlowControlled_dp.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/FlowControlled_dp.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/FlowControlled_dp.mo"	2022-03-10 09:57:39.692144340 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/FlowControlled_dp.mo"	2022-03-10 09:58:09.460148112 +0000
@@ -20,13 +20,13 @@
             nOri - 1):-1:0}), final use_powerCharacteristic=if per.havePressureCurve
              then per.use_powerCharacteristic else false)));
 
-  parameter Modelica.SIunits.PressureDifference dp_start(
+  parameter Modelica.Units.SI.PressureDifference dp_start(
     min=0,
     displayUnit="Pa")=0 "Initial value of pressure raise"
     annotation(Dialog(tab="Dynamics", group="Filtered speed"));
 
   // For air, we set dp_nominal = 600 as default, for water we set 10000
-  parameter Modelica.SIunits.PressureDifference dp_nominal(
+  parameter Modelica.Units.SI.PressureDifference dp_nominal(
     min=0,
     displayUnit="Pa")=
       if rho_default < 500 then 500 else 10000 "Nominal pressure raise, used to normalized the filter if use_inputFilter=true,
@@ -34,14 +34,14 @@
         and for default pressure curve if not specified in record per"
     annotation(Dialog(group="Nominal condition"));
 
-  parameter Modelica.SIunits.PressureDifference constantHead(
+  parameter Modelica.Units.SI.PressureDifference constantHead(
     min=0,
     displayUnit="Pa")=dp_nominal
     "Constant pump head, used when inputType=Constant"
     annotation(Dialog(enable=inputType == IBPSA.Fluid.Types.InputType.Constant));
 
   // By default, set heads proportional to sqrt(speed/speed_nominal)
-  parameter Modelica.SIunits.PressureDifference[:] heads(
+  parameter Modelica.Units.SI.PressureDifference[:] heads(
     each min=0,
     each displayUnit="Pa")=
     dp_nominal*{(per.speeds[i]/per.speeds[end])^2 for i in 1:size(per.speeds, 1)}
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/FlowControlled_m_flow.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/FlowControlled_m_flow.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/FlowControlled_m_flow.mo"	2022-03-10 09:57:39.692144340 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/FlowControlled_m_flow.mo"	2022-03-10 09:58:09.436148109 +0000
@@ -21,21 +21,21 @@
     preSou(m_flow_start=m_flow_start));
 
   // For air, we set dp_nominal = 600 as default, for water we set 10000
-  parameter Modelica.SIunits.PressureDifference dp_nominal(min=0, displayUnit="Pa")=
+  parameter Modelica.Units.SI.PressureDifference dp_nominal(min=0, displayUnit="Pa")=
     if rho_default < 500 then 500 else 10000
     "Nominal pressure raise, used for default pressure curve if not specified in record per"
     annotation(Dialog(group="Nominal condition"));
 
-  parameter Modelica.SIunits.MassFlowRate m_flow_start(min=0)=0
+  parameter Modelica.Units.SI.MassFlowRate m_flow_start(min=0)=0
     "Initial value of mass flow rate"
     annotation(Dialog(tab="Dynamics", group="Filtered speed"));
 
-  parameter Modelica.SIunits.MassFlowRate constantMassFlowRate=m_flow_nominal
+  parameter Modelica.Units.SI.MassFlowRate constantMassFlowRate=m_flow_nominal
     "Constant pump mass flow rate, used when inputType=Constant"
     annotation(Dialog(enable=inputType == IBPSA.Fluid.Types.InputType.Constant));
 
   // By default, set massFlowRates proportional to (speed/speed_nominal)
-  parameter Modelica.SIunits.MassFlowRate[:] massFlowRates=
+  parameter Modelica.Units.SI.MassFlowRate[:] massFlowRates=
     m_flow_nominal*{per.speeds[i]/per.speeds[end] for i in 1:size(per.speeds, 1)}
     "Vector of mass flow rate set points, used when inputType=Stage"
     annotation(Dialog(enable=inputType == IBPSA.Fluid.Types.InputType.Stages));
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/Validation/BaseClasses/FlowMachine_ZeroFlow.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/Validation/BaseClasses/FlowMachine_ZeroFlow.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/Validation/BaseClasses/FlowMachine_ZeroFlow.mo"	2022-03-10 09:57:39.692144340 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/Validation/BaseClasses/FlowMachine_ZeroFlow.mo"	2022-03-10 09:58:09.308148094 +0000
@@ -5,9 +5,9 @@
   replaceable package Medium = IBPSA.Media.Air constrainedby
     Modelica.Media.Interfaces.PartialMedium                 "Medium model";
 
-  parameter Modelica.SIunits.MassFlowRate m_flow_nominal= 1
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal= 1
     "Nominal mass flow rate";
-  parameter Modelica.SIunits.PressureDifference dp_nominal = 500
+  parameter Modelica.Units.SI.PressureDifference dp_nominal = 500
     "Nominal pressure difference";
 
   Modelica.Blocks.Sources.Ramp y(
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/Validation/FlowControlled_dpSystem.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/Validation/FlowControlled_dpSystem.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/Validation/FlowControlled_dpSystem.mo"	2022-03-10 09:57:39.692144340 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/Validation/FlowControlled_dpSystem.mo"	2022-03-10 09:58:09.196148079 +0000
@@ -3,9 +3,9 @@
   "Demonstration of the use of prescribedPressure"
   extends Modelica.Icons.Example;
   package Medium = IBPSA.Media.Air;
-  parameter Modelica.SIunits.MassFlowRate m_flow_nominal= 0.1
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal= 0.1
     "Nominal mass flow rate";
-  parameter Modelica.SIunits.PressureDifference dp_nominal = 100
+  parameter Modelica.Units.SI.PressureDifference dp_nominal = 100
     "Nominal pressure difference";
   Modelica.Blocks.Sources.Ramp y(
     duration=0.5,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/Validation/PowerSimplified.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/Validation/PowerSimplified.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/Validation/PowerSimplified.mo"	2022-03-10 09:57:39.692144340 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/Validation/PowerSimplified.mo"	2022-03-10 09:58:09.132148071 +0000
@@ -5,7 +5,7 @@
 
   package Medium = IBPSA.Media.Water "Medium model";
 
-  parameter Modelica.SIunits.MassFlowRate m_flow_nominal=3
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=3
     "Nominal mass flow rate";
 
   parameter Data.Pumps.Wilo.Stratos30slash1to8 per "Pump performance data"
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/Validation/PumpCurveConstruction.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/Validation/PumpCurveConstruction.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/Validation/PumpCurveConstruction.mo"	2022-03-10 09:57:39.692144340 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/Validation/PumpCurveConstruction.mo"	2022-03-10 09:58:09.108148068 +0000
@@ -5,12 +5,12 @@
 
   package Medium = IBPSA.Media.Water "Medium model";
 
-  parameter Modelica.SIunits.MassFlowRate m_flow_nominal = 1
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = 1
     "Nominal mass flow rate at zero pump head";
-  parameter Modelica.SIunits.VolumeFlowRate V_flow_nominal = m_flow_nominal/1000
+  parameter Modelica.Units.SI.VolumeFlowRate V_flow_nominal = m_flow_nominal/1000
     "Nominal mass flow rate at zero pump head";
 
-  parameter Modelica.SIunits.PressureDifference dp_nominal = 10000
+  parameter Modelica.Units.SI.PressureDifference dp_nominal = 10000
     "Nominal pump head at zero mass flow rate";
 
   Actuators.Valves.TwoWayLinear val1(
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/Validation/SpeedControlled_y_linear.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/Validation/SpeedControlled_y_linear.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/Validation/SpeedControlled_y_linear.mo"	2022-03-10 09:57:39.692144340 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Movers/Validation/SpeedControlled_y_linear.mo"	2022-03-10 09:58:08.976148051 +0000
@@ -4,9 +4,9 @@
   extends Modelica.Icons.Example;
   package Medium = IBPSA.Media.Water "Medium model";
 
-  parameter Modelica.SIunits.MassFlowRate m_flow_nominal = 0.5
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = 0.5
     "Nominal mass flow rate";
-  parameter Modelica.SIunits.PressureDifference dp_nominal = 10000
+  parameter Modelica.Units.SI.PressureDifference dp_nominal = 10000
     "Nominal pressure";
 
   Modelica.Blocks.Sources.Ramp y(
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/BaseClasses/PartialDynamicFlowSensor.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/BaseClasses/PartialDynamicFlowSensor.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/BaseClasses/PartialDynamicFlowSensor.mo"	2022-03-10 09:57:39.692144340 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/BaseClasses/PartialDynamicFlowSensor.mo"	2022-03-10 09:58:08.872148039 +0000
@@ -3,7 +3,7 @@
   "Partial component to model sensors that measure flow properties using a dynamic model"
   extends PartialFlowSensor;
 
-  parameter Modelica.SIunits.Time tau(min=0) = 1
+  parameter Modelica.Units.SI.Time tau(min=0) = 1
     "Time constant at nominal flow rate (use tau=0 for steady-state sensor, but see user guide for potential problems)";
   parameter Modelica.Blocks.Types.Init initType = Modelica.Blocks.Types.Init.InitialState
     "Type of initialization (InitialState and InitialOutput are identical)"
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/BaseClasses/PartialFlowSensor.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/BaseClasses/PartialFlowSensor.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/BaseClasses/PartialFlowSensor.mo"	2022-03-10 09:57:39.692144340 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/BaseClasses/PartialFlowSensor.mo"	2022-03-10 09:58:08.864148038 +0000
@@ -2,18 +2,18 @@
 partial model PartialFlowSensor
   "Partial component to model sensors that measure flow properties"
   extends IBPSA.Fluid.Interfaces.PartialTwoPort;
-  parameter Modelica.SIunits.MassFlowRate m_flow_nominal(min=0)
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal(min=0)
     "Nominal mass flow rate, used for regularization near zero flow"
     annotation(Dialog(group = "Nominal condition"));
-  parameter Modelica.SIunits.MassFlowRate m_flow_small(min=0) = 1E-4*m_flow_nominal
+  parameter Modelica.Units.SI.MassFlowRate m_flow_small(min=0) = 1E-4*m_flow_nominal
     "For bi-directional flow, temperature is regularized in the region |m_flow| < m_flow_small (m_flow_small > 0 required)"
     annotation(Dialog(tab="Advanced"));
-equation
-  // mass balance
-  port_b.m_flow = -port_a.m_flow;
-  // momentum equation (no pressure loss)
-  port_a.p = port_b.p;
-  // isenthalpic state transformation (no storage and no loss of energy)
+equation
+// mass balance
+  port_b.m_flow = -port_a.m_flow;
+// momentum equation (no pressure loss)
+  port_a.p = port_b.p;
+// isenthalpic state transformation (no storage and no loss of energy)
   port_a.h_outflow = if allowFlowReversal then inStream(port_b.h_outflow) else Medium.h_default;
   port_b.h_outflow = inStream(port_a.h_outflow);
   port_a.Xi_outflow = if allowFlowReversal then inStream(port_b.Xi_outflow) else Medium.X_default[1:Medium.nXi];
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/Conversions/To_VolumeFraction.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/Conversions/To_VolumeFraction.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/Conversions/To_VolumeFraction.mo"	2022-03-10 09:57:39.692144340 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/Conversions/To_VolumeFraction.mo"	2022-03-10 09:58:08.828148033 +0000
@@ -1,8 +1,8 @@
 within BuildSysPro.IBPSA.Fluid.Sensors.Conversions;
 model To_VolumeFraction "Conversion from mass fraction to volume fraction"
 
-  parameter Modelica.SIunits.MolarMass MMMea "Molar mass of measured substance";
-  parameter Modelica.SIunits.MolarMass MMBul=Modelica.Media.IdealGases.Common.SingleGasesData.Air.MM
+  parameter Modelica.Units.SI.MolarMass MMMea "Molar mass of measured substance";
+  parameter Modelica.Units.SI.MolarMass MMBul=Modelica.Media.IdealGases.Common.SingleGasesData.Air.MM
     "Molar mass of bulk medium";
 
   Modelica.Blocks.Interfaces.RealInput m "Mass fraction"
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/Density.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/Density.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/Density.mo"	2022-03-10 09:57:39.692144340 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/Density.mo"	2022-03-10 09:58:08.816148031 +0000
@@ -1,7 +1,7 @@
 within BuildSysPro.IBPSA.Fluid.Sensors;
 model Density "Ideal one port density sensor"
   extends IBPSA.Fluid.Sensors.BaseClasses.PartialAbsoluteSensor;
-  extends Modelica.Icons.RotationalSensor;
+  extends Modelica.Icons.RoundSensor;
   Modelica.Blocks.Interfaces.RealOutput d(final quantity="Density",
                                           final unit="kg/m3",
                                           min=0) "Density in port medium"
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/DensityTwoPort.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/DensityTwoPort.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/DensityTwoPort.mo"	2022-03-10 09:57:39.692144340 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/DensityTwoPort.mo"	2022-03-10 09:58:08.808148031 +0000
@@ -1,7 +1,7 @@
 within BuildSysPro.IBPSA.Fluid.Sensors;
 model DensityTwoPort "Ideal two port density sensor"
   extends IBPSA.Fluid.Sensors.BaseClasses.PartialDynamicFlowSensor;
-  extends Modelica.Icons.RotationalSensor;
+  extends Modelica.Icons.RoundSensor;
   Modelica.Blocks.Interfaces.RealOutput d(final quantity="Density",
                                           final unit="kg/m3",
                                           min=0) "Density of the passing fluid"
@@ -14,13 +14,13 @@
        p=p_start, T=T_start, X=X_start))
     "Initial or guess value of output (=state)"
     annotation (Dialog(group="Initialization"));
-  parameter Modelica.SIunits.Temperature T_start=Medium.T_default
+  parameter Modelica.Units.SI.Temperature T_start=Medium.T_default
     "Temperature used to compute d_start"
     annotation (Dialog(group="Initialization"));
-  parameter Modelica.SIunits.Pressure p_start=Medium.p_default
+  parameter Modelica.Units.SI.Pressure p_start=Medium.p_default
     "Pressure used to compute d_start"
     annotation (Dialog(group="Initialization"));
-  parameter Modelica.SIunits.MassFraction X_start[Medium.nX]=Medium.X_default
+  parameter Modelica.Units.SI.MassFraction X_start[Medium.nX]=Medium.X_default
     "Mass fraction used to compute d_start"
     annotation (Dialog(group="Initialization"));
 protected
@@ -53,12 +53,13 @@
      d_a_inflow = dMed;
      d_b_inflow = dMed;
   end if;
-  // Output signal of sensor
+// Output signal of sensor
   if dynamic then
     der(d) = (dMed-d)*k*tauInv;
   else
     d = dMed;
-  end if;
+  end if;
+
 annotation (defaultComponentName="senDen",
   Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100,100}},
         grid={1,1}), graphics={
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/EnthalpyFlowRate.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/EnthalpyFlowRate.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/EnthalpyFlowRate.mo"	2022-03-10 09:57:39.692144340 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/EnthalpyFlowRate.mo"	2022-03-10 09:58:08.792148028 +0000
@@ -1,14 +1,14 @@
 within BuildSysPro.IBPSA.Fluid.Sensors;
 model EnthalpyFlowRate "Ideal enthalphy flow rate sensor"
   extends IBPSA.Fluid.Sensors.BaseClasses.PartialDynamicFlowSensor;
-  extends Modelica.Icons.RotationalSensor;
+  extends Modelica.Icons.RoundSensor;
   Modelica.Blocks.Interfaces.RealOutput H_flow(final unit="W")
     "Enthalpy flow rate, positive if from port_a to port_b"
     annotation (Placement(transformation(
         origin={0,110},
         extent={{-10,-10},{10,10}},
         rotation=90)));
-  parameter Modelica.SIunits.SpecificEnthalpy h_out_start=
+  parameter Modelica.Units.SI.SpecificEnthalpy h_out_start=
     Medium.specificEnthalpy_pTX(
       p=Medium.p_default,
       T=Medium.T_default,
@@ -16,9 +16,9 @@
     "Initial or guess value of measured specific enthalpy"
     annotation (Dialog(group="Initialization"));
 protected
-  Modelica.SIunits.SpecificEnthalpy hMed_out(start=h_out_start)
+  Modelica.Units.SI.SpecificEnthalpy hMed_out(start=h_out_start)
     "Medium enthalpy to which the sensor is exposed";
-  Modelica.SIunits.SpecificEnthalpy h_out(start=h_out_start)
+  Modelica.Units.SI.SpecificEnthalpy h_out(start=h_out_start)
     "Medium enthalpy that is used to compute the enthalpy flow rate";
 initial equation
   if dynamic then
@@ -38,15 +38,16 @@
                  x_small=m_flow_small);
   else
     hMed_out = port_b.h_outflow;
-  end if;
-  // Specific enthalpy measured by sensor
-  if dynamic then
-    der(h_out) = (hMed_out-h_out)*k*tauInv;
-  else
-    h_out = hMed_out;
-  end if;
-  // Sensor output signal
-  H_flow = port_a.m_flow * h_out;
+  end if;
+// Specific enthalpy measured by sensor
+  if dynamic then
+    der(h_out) = (hMed_out - h_out) * k * tauInv;
+  else
+    h_out = hMed_out;
+  end if;
+// Sensor output signal
+  H_flow = port_a.m_flow * h_out;
+
 annotation (defaultComponentName="senEntFlo",
   Icon(graphics={
         Line(points={{-100,0},{-70,0}}, color={0,128,255}),
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/EntropyFlowRate.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/EntropyFlowRate.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/EntropyFlowRate.mo"	2022-03-10 09:57:39.692144340 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/EntropyFlowRate.mo"	2022-03-10 09:58:08.780148026 +0000
@@ -1,25 +1,25 @@
 within BuildSysPro.IBPSA.Fluid.Sensors;
 model EntropyFlowRate "Ideal entropy flow rate sensor"
   extends IBPSA.Fluid.Sensors.BaseClasses.PartialDynamicFlowSensor;
-  extends Modelica.Icons.RotationalSensor;
+  extends Modelica.Icons.RoundSensor;
   Modelica.Blocks.Interfaces.RealOutput S_flow(final unit="W/K")
     "Entropy flow rate, positive if from port_a to port_b"
     annotation (Placement(transformation(
         origin={0,110},
         extent={{-10,-10},{10,10}},
         rotation=90)));
-  parameter Modelica.SIunits.SpecificEntropy s_out_start=
+  parameter Modelica.Units.SI.SpecificEntropy s_out_start=
     Medium.specificEntropy_pTX(
       p=Medium.p_default,
       T=Medium.T_default,
       X=Medium.X_default) "Initial or guess value of measured specific entropy"
     annotation (Dialog(group="Initialization"));
 protected
-  Modelica.SIunits.SpecificEntropy sMed_out(start=s_out_start)
+  Modelica.Units.SI.SpecificEntropy sMed_out(start=s_out_start)
     "Medium entropy to which the sensor is exposed";
-  Modelica.SIunits.SpecificEntropy s_out(start=s_out_start)
+  Modelica.Units.SI.SpecificEntropy s_out(start=s_out_start)
     "Medium entropy that is used to compute the entropy flow rate";
-  Modelica.SIunits.SpecificEntropy port_b_s_outflow(start=s_out_start)
+  Modelica.Units.SI.SpecificEntropy port_b_s_outflow(start=s_out_start)
     "Medium entropy outflowing at port_b if mass flow were from port_a to port_b";
 initial equation
   if dynamic then
@@ -48,15 +48,16 @@
                  x_small=m_flow_small);
   else
     sMed_out = port_b_s_outflow;
-  end if;
-  // Specific entropy measured by sensor
-  if dynamic then
-    der(s_out) = (sMed_out-s_out)*k*tauInv;
-  else
-    s_out = sMed_out;
-  end if;
-  // Sensor output signal
-  S_flow = port_a.m_flow * s_out;
+  end if;
+// Specific entropy measured by sensor
+  if dynamic then
+    der(s_out) = (sMed_out - s_out) * k * tauInv;
+  else
+    s_out = sMed_out;
+  end if;
+// Sensor output signal
+  S_flow = port_a.m_flow * s_out;
+
 annotation (defaultComponentName="senS_flow",
   Icon(graphics={
         Line(points={{-100,0},{-70,0}}, color={0,128,255}),
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/Examples/PPM.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/Examples/PPM.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/Examples/PPM.mo"	2022-03-10 09:57:39.692144340 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/Examples/PPM.mo"	2022-03-10 09:58:08.580148002 +0000
@@ -4,7 +4,7 @@
   package Medium = IBPSA.Media.Air (extraPropertiesNames={"CO2"})
     "Medium model";
 
-  parameter Modelica.SIunits.MassFlowRate m_flow_nominal = volDyn.V*senPPMTwoPort.tau*3*rho_default
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = volDyn.V*senPPMTwoPort.tau*3*rho_default
     "Mass flow rate into and out of the volume";
 
   IBPSA.Fluid.MixingVolumes.MixingVolume volDyn(
@@ -68,10 +68,10 @@
       T=Medium.T_default,
       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 compute fluid mass";
-
 public
   IBPSA.Fluid.MixingVolumes.MixingVolume volSte(
     redeclare package Medium = Medium,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/Examples/TraceSubstances.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/Examples/TraceSubstances.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/Examples/TraceSubstances.mo"	2022-03-10 09:57:39.692144340 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/Examples/TraceSubstances.mo"	2022-03-10 09:58:08.496147990 +0000
@@ -4,7 +4,7 @@
  package Medium = IBPSA.Media.Air (extraPropertiesNames={"CO2"})
     "Medium model";
 
- parameter Modelica.SIunits.MassFlowRate m_flow_nominal = 15*1.2/3600
+ parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = 15*1.2/3600
     "Mass flow rate into and out of the volume";
 
   MixingVolumes.MixingVolume vol(
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/Examples/Velocity.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/Examples/Velocity.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/Examples/Velocity.mo"	2022-03-10 09:57:39.692144340 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/Examples/Velocity.mo"	2022-03-10 09:58:08.472147987 +0000
@@ -4,7 +4,7 @@
 
   package Medium = IBPSA.Media.Air "Medium model";
 
-  parameter Modelica.SIunits.Area A = 0.1*0.1/4*Modelica.Constants.pi
+  parameter Modelica.Units.SI.Area A = 0.1*0.1/4*Modelica.Constants.pi
     "Cross sectional area of flow channel";
 
   IBPSA.Fluid.Sources.Boundary_pT sin(
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/LatentEnthalpyFlowRate.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/LatentEnthalpyFlowRate.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/LatentEnthalpyFlowRate.mo"	2022-03-10 09:57:39.692144340 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/LatentEnthalpyFlowRate.mo"	2022-03-10 09:58:08.448147985 +0000
@@ -5,14 +5,14 @@
       redeclare replaceable package Medium =
         Modelica.Media.Interfaces.PartialCondensingGases);
   extends IBPSA.Fluid.BaseClasses.IndexMassFraction(final substanceName="water");
-  extends Modelica.Icons.RotationalSensor;
+  extends Modelica.Icons.RoundSensor;
   Modelica.Blocks.Interfaces.RealOutput H_flow(final unit="W")
     "Latent enthalpy flow rate, positive if from port_a to port_b"
     annotation (Placement(transformation(
         origin={0,110},
         extent={{-10,-10},{10,10}},
         rotation=90)));
-  parameter Modelica.SIunits.SpecificEnthalpy h_out_start=
+  parameter Modelica.Units.SI.SpecificEnthalpy h_out_start=
     Medium.specificEnthalpy_pTX(
       p=Medium.p_default, T=Medium.T_default, X=Medium.X_default)
     -Medium.enthalpyOfNonCondensingGas(T=Medium.T_default)
@@ -20,9 +20,9 @@
     annotation (Dialog(group="Initialization"));
 
 protected
-  Modelica.SIunits.SpecificEnthalpy hMed_out(start=h_out_start)
+  Modelica.Units.SI.SpecificEnthalpy hMed_out(start=h_out_start)
     "Medium latent enthalpy to which the sensor is exposed";
-  Modelica.SIunits.SpecificEnthalpy h_out(start=h_out_start)
+  Modelica.Units.SI.SpecificEnthalpy h_out(start=h_out_start)
     "Medium latent enthalpy that is used to compute the enthalpy flow rate";
 
   Medium.MassFraction XiActual[Medium.nXi]
@@ -30,7 +30,7 @@
   Medium.SpecificEnthalpy hActual
     "Medium enthalpy to which sensor is exposed to";
 initial equation
- // Compute initial state
+// Compute initial state
  if dynamic then
     if initType == Modelica.Blocks.Types.Init.SteadyState then
       der(h_out) = 0;
@@ -54,21 +54,20 @@
   else
      XiActual = port_b.Xi_outflow;
      hActual = port_b.h_outflow;
-  end if;
-  // Specific enthalpy measured by sensor.
-  // Compute H_flow as difference between total enthalpy and enthalpy on non-condensing gas.
-  // This is needed to compute the liquid vs. gas fraction of water, using the equations
-  // provided by the medium model
-  hMed_out = (hActual -
-     (1-XiActual[i_x]) * Medium.enthalpyOfNonCondensingGas(
-       T=Medium.temperature(Medium.setState_phX(p=port_a.p, h=hActual, X=XiActual))));
+  end if;
+// Specific enthalpy measured by sensor.
+// Compute H_flow as difference between total enthalpy and enthalpy on non-condensing gas.
+// This is needed to compute the liquid vs. gas fraction of water, using the equations
+// provided by the medium model
+  hMed_out = hActual - (1 - XiActual[i_x]) * Medium.enthalpyOfNonCondensingGas(T = Medium.temperature(Medium.setState_phX(p = port_a.p, h = hActual, X = XiActual)));
   if dynamic then
     der(h_out) = (hMed_out-h_out)*k*tauInv;
   else
     h_out = hMed_out;
-  end if;
-  // Sensor output signal
-  H_flow = port_a.m_flow * h_out;
+  end if;
+// Sensor output signal
+  H_flow = port_a.m_flow * h_out;
+
 annotation (defaultComponentName="senLatEnt",
   Icon(graphics={
         Line(points={{-100,0},{-70,0}}, color={0,128,255}),
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/MassFlowRate.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/MassFlowRate.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/MassFlowRate.mo"	2022-03-10 09:57:39.692144340 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/MassFlowRate.mo"	2022-03-10 09:58:08.432147982 +0000
@@ -2,7 +2,7 @@
 model MassFlowRate "Ideal sensor for mass flow rate"
   extends IBPSA.Fluid.Sensors.BaseClasses.PartialFlowSensor(final
       m_flow_nominal=0, final m_flow_small=0);
-  extends Modelica.Icons.RotationalSensor;
+  extends Modelica.Icons.RoundSensor;
   Modelica.Blocks.Interfaces.RealOutput m_flow(quantity="MassFlowRate",
                                                final unit="kg/s")
     "Mass flow rate from port_a to port_b" annotation (Placement(
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/MassFraction.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/MassFraction.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/MassFraction.mo"	2022-03-10 09:57:39.692144340 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/MassFraction.mo"	2022-03-10 09:58:08.424147981 +0000
@@ -4,7 +4,7 @@
       redeclare replaceable package Medium =
         Modelica.Media.Interfaces.PartialCondensingGases);
   extends IBPSA.Fluid.BaseClasses.IndexMassFraction(substanceName="water");
-  extends Modelica.Icons.RotationalSensor;
+  extends Modelica.Icons.RoundSensor;
 
   Modelica.Blocks.Interfaces.RealOutput X(min=-1e-3,
                                           max=1.001,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/MassFractionTwoPort.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/MassFractionTwoPort.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/MassFractionTwoPort.mo"	2022-03-10 09:57:39.692144340 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/MassFractionTwoPort.mo"	2022-03-10 09:58:08.416147981 +0000
@@ -4,7 +4,7 @@
       redeclare replaceable package Medium =
         Modelica.Media.Interfaces.PartialCondensingGases);
   extends IBPSA.Fluid.BaseClasses.IndexMassFraction(substanceName="water");
-  extends Modelica.Icons.RotationalSensor;
+  extends Modelica.Icons.RoundSensor;
 
   parameter Medium.MassFraction X_start=Medium.X_default[i_x]
     "Initial or guess value of output (= state)"
@@ -27,7 +27,7 @@
     final quantity=Medium.substanceNames[1:Medium.nXi])
     "Mass fraction vector, needed because indexed argument for the operator inStream is not supported";
 initial equation
-  // Assign initial conditions
+// Assign initial conditions
   if dynamic then
     if initType == Modelica.Blocks.Types.Init.SteadyState then
       der(X) = 0;
@@ -47,12 +47,13 @@
     XiVec = port_b.Xi_outflow;
   end if;
   XMed = if i_x > Medium.nXi then (1-sum(XiVec)) else XiVec[i_x];
-  // Output signal of sensor
+// Output signal of sensor
   if dynamic then
     der(X)  = (XMed-X)*k*tauInv;
   else
     X = XMed;
-  end if;
+  end if;
+
 annotation (defaultComponentName="senMasFra",
   Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100,100}},
         grid={1,1}), graphics={
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/PPM.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/PPM.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/PPM.mo"	2022-03-10 09:57:39.692144340 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/PPM.mo"	2022-03-10 09:58:08.400147978 +0000
@@ -7,11 +7,11 @@
         each final unit="1",
         each min=0,
         each max=1)));
-  extends Modelica.Icons.RotationalSensor;
+  extends Modelica.Icons.RoundSensor;
 
   parameter String substanceName = "CO2" "Name of trace substance";
 
-  parameter Modelica.SIunits.MolarMass MM=
+  parameter Modelica.Units.SI.MolarMass MM=
     Modelica.Media.IdealGases.Common.SingleGasesData.CO2.MM
     "Molar mass of the trace substance";
 
@@ -27,7 +27,7 @@
     then 1 else 0 for i in 1:Medium.nC}
     "Vector with zero everywhere except where species is";
 
-  final parameter Modelica.SIunits.MolarMass MMBul=Medium.molarMass(
+  final parameter Modelica.Units.SI.MolarMass MMBul=Medium.molarMass(
     Medium.setState_phX(
       p=Medium.p_default,
       h=Medium.h_default,
@@ -48,10 +48,10 @@
          + Medium.mediumName + "'.\n"
          + "Check sensor parameter and medium model.");
 equation
-  // We obtain the species concentration with a vector multiplication
-  // because Dymola 7.3 cannot find the derivative in the model
-  // Buildings.Examples.VAVSystemCTControl.mo
-  // if we set C = CVec[ind];
+// We obtain the species concentration with a vector multiplication
+// because Dymola 7.3 cannot find the derivative in the model
+// Buildings.Examples.VAVSystemCTControl.mo
+// if we set C = CVec[ind];
   ppm = s*inStream(port.C_outflow)*coeff;
 
 annotation (defaultComponentName="senPPM",
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/PPMTwoPort.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/PPMTwoPort.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/PPMTwoPort.mo"	2022-03-10 09:57:39.692144340 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/PPMTwoPort.mo"	2022-03-10 09:58:08.384147977 +0000
@@ -11,13 +11,13 @@
         each final unit="1",
         each min=0,
         each max=1)));
-  extends Modelica.Icons.RotationalSensor;
+  extends Modelica.Icons.RoundSensor;
 
   parameter String substanceName = "CO2" "Name of trace substance";
   parameter Real C_start(min=0) = 0
     "Initial or guess value of output (= state)"
     annotation (Dialog(group="Initialization"));
-  parameter Modelica.SIunits.MolarMass MM=
+  parameter Modelica.Units.SI.MolarMass MM=
     Modelica.Media.IdealGases.Common.SingleGasesData.CO2.MM
     "Molar mass of the trace substance";
   Modelica.Blocks.Interfaces.RealOutput ppm(min=0)
@@ -36,7 +36,7 @@
     then 1 else 0 for i in 1:Medium.nC}
     "Vector with zero everywhere except where species is";
 
-  final parameter Modelica.SIunits.MolarMass MMBul=Medium.molarMass(
+  final parameter Modelica.Units.SI.MolarMass MMBul=Medium.molarMass(
     Medium.setState_phX(
       p=Medium.p_default,
       h=Medium.h_default,
@@ -80,13 +80,13 @@
 
 equation
   ppm = C*coeff;
-
-  // Output signal of sensor
+// Output signal of sensor
   if dynamic then
     der(C) = (CMed-C)*k*tauInv;
   else
     C = CMed;
-  end if;
+  end if;
+
 annotation (defaultComponentName="senPPM",
   Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100,100}}),
         graphics={
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/Pressure.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/Pressure.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/Pressure.mo"	2022-03-10 09:57:39.692144340 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/Pressure.mo"	2022-03-10 09:58:08.336147970 +0000
@@ -1,7 +1,7 @@
 within BuildSysPro.IBPSA.Fluid.Sensors;
 model Pressure "Ideal pressure sensor"
   extends IBPSA.Fluid.Sensors.BaseClasses.PartialAbsoluteSensor;
-  extends Modelica.Icons.RotationalSensor;
+  extends Modelica.Icons.RoundSensor;
   Modelica.Blocks.Interfaces.RealOutput p(final quantity="AbsolutePressure",
                                           final unit="Pa",
                                           min=0) "Pressure at port"
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/RelativeHumidity.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/RelativeHumidity.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/RelativeHumidity.mo"	2022-03-10 09:57:39.692144340 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/RelativeHumidity.mo"	2022-03-10 09:58:08.328147970 +0000
@@ -1,14 +1,14 @@
 within BuildSysPro.IBPSA.Fluid.Sensors;
 model RelativeHumidity "Ideal one port relative humidity sensor"
   extends IBPSA.Fluid.Sensors.BaseClasses.PartialAbsoluteSensor;
-  extends Modelica.Icons.RotationalSensor;
+  extends Modelica.Icons.RoundSensor;
 
   Modelica.Blocks.Interfaces.RealOutput phi(final unit="1", min=0)
     "Relative humidity in port medium"
     annotation (Placement(transformation(extent={{100,-10},{120,10}})));
 
 protected
-  Modelica.SIunits.Temperature T "Temperature of the medium";
+  Modelica.Units.SI.Temperature T "Temperature of the medium";
   Medium.MassFraction Xi[Medium.nXi](
     quantity=Medium.substanceNames[1:Medium.nXi]) "Mass fraction of the medium";
 equation
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/RelativeHumidityTwoPort.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/RelativeHumidityTwoPort.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/RelativeHumidityTwoPort.mo"	2022-03-10 09:57:39.692144340 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/RelativeHumidityTwoPort.mo"	2022-03-10 09:58:08.320147967 +0000
@@ -1,7 +1,7 @@
 within BuildSysPro.IBPSA.Fluid.Sensors;
 model RelativeHumidityTwoPort "Ideal two port relative humidity sensor"
   extends IBPSA.Fluid.Sensors.BaseClasses.PartialDynamicFlowSensor;
-  extends Modelica.Icons.RotationalSensor;
+  extends Modelica.Icons.RoundSensor;
   Modelica.Blocks.Interfaces.RealOutput phi(final unit="1",
                                             min=0,
                                             start=phi_start)
@@ -18,14 +18,14 @@
     "Relative humidity to which the sensor is exposed to";
 
 protected
-  Modelica.SIunits.Temperature T_a
+  Modelica.Units.SI.Temperature T_a
     "Temperature of the medium flowing from port_a to port_b";
   Medium.MassFraction Xi_a[Medium.nXi](
     quantity=Medium.substanceNames[1:Medium.nXi])
     "Mass fraction of the medium flowing from port_a to port_b";
   Real phi_a(final unit="1")
     "Relative humidity of the medium flowing from port_a to port_b";
-  Modelica.SIunits.Temperature T_b
+  Modelica.Units.SI.Temperature T_b
     "Temperature of the medium flowing from port_b to port_a";
   Medium.MassFraction Xi_b[Medium.nXi](
     quantity=Medium.substanceNames[1:Medium.nXi])
@@ -42,10 +42,9 @@
       phi = phi_start;
     end if;
   end if;
-equation
-
-  // Since the sensor does not affect the medium, we can use
-  // port_b.Xi_outflow = inStream(port_a.Xi_outflow).
+equation
+// Since the sensor does not affect the medium, we can use
+// port_b.Xi_outflow = inStream(port_a.Xi_outflow).
   Xi_a = port_b.Xi_outflow;
 
   T_a=Medium.temperature_phX(
@@ -78,13 +77,14 @@
     T_b = 273.15;
     Xi_b = zeros(Medium.nXi);
     phiMed = phi_a;
-  end if;
-  // Output signal of sensor
-  if dynamic then
-    der(phi) = (phiMed-phi)*k*tauInv;
-  else
-    phi = phiMed;
-  end if;
+  end if;
+// Output signal of sensor
+  if dynamic then
+    der(phi) = (phiMed - phi) * k * tauInv;
+  else
+    phi = phiMed;
+  end if;
+
 annotation (defaultComponentName="senRelHum",
   Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100,100}},
         grid={1,1}), graphics={
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/RelativePressure.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/RelativePressure.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/RelativePressure.mo"	2022-03-10 09:57:39.692144340 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/RelativePressure.mo"	2022-03-10 09:58:08.308147967 +0000
@@ -1,6 +1,6 @@
 within BuildSysPro.IBPSA.Fluid.Sensors;
 model RelativePressure "Ideal relative pressure sensor"
-  extends Modelica.Icons.TranslationalSensor;
+  extends Modelica.Icons.RectangularSensor;
   replaceable package Medium =
     Modelica.Media.Interfaces.PartialMedium "Medium in the sensor"  annotation (
       choicesAllMatching = true);
@@ -23,20 +23,18 @@
         origin={0,-90},
         extent={{10,-10},{-10,10}},
         rotation=90)));
-equation
-  // Zero flow equations for connectors
+equation
+// Zero flow equations for connectors
   port_a.m_flow = 0;
-  port_b.m_flow = 0;
-
-  // No contribution of specific quantities
+  port_b.m_flow = 0;
+// No contribution of specific quantities
   port_a.h_outflow = 0;
   port_b.h_outflow = 0;
   port_a.Xi_outflow = zeros(Medium.nXi);
   port_b.Xi_outflow = zeros(Medium.nXi);
   port_a.C_outflow  = zeros(Medium.nC);
-  port_b.C_outflow  = zeros(Medium.nC);
-
-  // Relative pressure
+  port_b.C_outflow  = zeros(Medium.nC);
+// Relative pressure
   p_rel = port_a.p - port_b.p;
   annotation (defaultComponentName="senRelPre",
     Icon(graphics={
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/RelativeTemperature.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/RelativeTemperature.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/RelativeTemperature.mo"	2022-03-10 09:57:39.692144340 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/RelativeTemperature.mo"	2022-03-10 09:58:08.296147966 +0000
@@ -1,6 +1,6 @@
 within BuildSysPro.IBPSA.Fluid.Sensors;
 model RelativeTemperature "Ideal relative temperature sensor"
-  extends Modelica.Icons.TranslationalSensor;
+  extends Modelica.Icons.RectangularSensor;
   replaceable package Medium =
     Modelica.Media.Interfaces.PartialMedium "Medium in the sensor"  annotation (
       choicesAllMatching = true);
@@ -22,22 +22,19 @@
         origin={0,-90},
         extent={{10,-10},{-10,10}},
         rotation=90)));
-equation
-  // Zero flow equations for connectors
+equation
+// Zero flow equations for connectors
   port_a.m_flow = 0;
-  port_b.m_flow = 0;
-  // No contribution of specific quantities
+  port_b.m_flow = 0;
+// No contribution of specific quantities
   port_a.h_outflow = 0;
   port_b.h_outflow = 0;
   port_a.Xi_outflow = zeros(Medium.nXi);
   port_b.Xi_outflow = zeros(Medium.nXi);
   port_a.C_outflow  = zeros(Medium.nC);
-  port_b.C_outflow  = zeros(Medium.nC);
-  // Relative temperature
-  T_rel = Medium.temperature(state=Medium.setState_phX(
-            p=port_a.p, h=inStream(port_a.h_outflow), X=inStream(port_a.Xi_outflow))) -
-          Medium.temperature(state=Medium.setState_phX(
-            p=port_b.p, h=inStream(port_b.h_outflow), X=inStream(port_b.Xi_outflow)));
+  port_b.C_outflow  = zeros(Medium.nC);
+// Relative temperature
+  T_rel = Medium.temperature(state = Medium.setState_phX(p = port_a.p, h = inStream(port_a.h_outflow), X = inStream(port_a.Xi_outflow))) - Medium.temperature(state = Medium.setState_phX(p = port_b.p, h = inStream(port_b.h_outflow), X = inStream(port_b.Xi_outflow)));
   annotation (defaultComponentName="senRelTem",
     Icon(graphics={
         Line(points={{-100,0},{-70,0}}, color={0,127,255}),
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/SensibleEnthalpyFlowRate.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/SensibleEnthalpyFlowRate.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/SensibleEnthalpyFlowRate.mo"	2022-03-10 09:57:39.692144340 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/SensibleEnthalpyFlowRate.mo"	2022-03-10 09:58:08.284147964 +0000
@@ -5,28 +5,28 @@
       redeclare replaceable package Medium =
         Modelica.Media.Interfaces.PartialCondensingGases);
   extends IBPSA.Fluid.BaseClasses.IndexMassFraction(final substanceName="water");
-  extends Modelica.Icons.RotationalSensor;
+  extends Modelica.Icons.RoundSensor;
   Modelica.Blocks.Interfaces.RealOutput H_flow(final unit="W")
     "Sensible enthalpy flow rate, positive if from port_a to port_b"
     annotation (Placement(transformation(
         origin={0,110},
         extent={{-10,-10},{10,10}},
         rotation=90)));
-  parameter Modelica.SIunits.SpecificEnthalpy h_out_start=
+  parameter Modelica.Units.SI.SpecificEnthalpy h_out_start=
     Medium.enthalpyOfNonCondensingGas(T=Medium.T_default)
     "Initial or guess value of measured specific sensible enthalpy"
     annotation (Dialog(group="Initialization"));
 protected
-  Modelica.SIunits.SpecificEnthalpy hMed_out(start=h_out_start)
+  Modelica.Units.SI.SpecificEnthalpy hMed_out(start=h_out_start)
     "Medium sensible enthalpy to which the sensor is exposed";
-  Modelica.SIunits.SpecificEnthalpy h_out(start=h_out_start)
+  Modelica.Units.SI.SpecificEnthalpy h_out(start=h_out_start)
     "Medium sensible enthalpy that is used to compute the enthalpy flow rate";
   Medium.MassFraction XiActual[Medium.nXi]
     "Medium mass fraction to which sensor is exposed to";
   Medium.SpecificEnthalpy hActual
     "Medium enthalpy to which sensor is exposed to";
 initial equation
- // Compute initial state
+// Compute initial state
  if dynamic then
     if initType == Modelica.Blocks.Types.Init.SteadyState then
       der(h_out) = 0;
@@ -50,17 +50,17 @@
   else
      XiActual = port_b.Xi_outflow;
      hActual = port_b.h_outflow;
-  end if;
-  // Specific enthalpy measured by sensor
-  hMed_out = (1-XiActual[i_x]) * Medium.enthalpyOfNonCondensingGas(
-      T=Medium.temperature(state=Medium.setState_phX(p=port_a.p, h=hActual, X=XiActual)));
+  end if;
+// Specific enthalpy measured by sensor
+  hMed_out = (1 - XiActual[i_x]) * Medium.enthalpyOfNonCondensingGas(T = Medium.temperature(state = Medium.setState_phX(p = port_a.p, h = hActual, X = XiActual)));
   if dynamic then
     der(h_out) = (hMed_out-h_out)*k*tauInv;
   else
     h_out = hMed_out;
-  end if;
-  // Sensor output signal
-  H_flow = port_a.m_flow * h_out;
+  end if;
+// Sensor output signal
+  H_flow = port_a.m_flow * h_out;
+
 annotation (defaultComponentName="senEntFlo",
   Icon(graphics={
         Ellipse(
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/SpecificEnthalpy.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/SpecificEnthalpy.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/SpecificEnthalpy.mo"	2022-03-10 09:57:39.692144340 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/SpecificEnthalpy.mo"	2022-03-10 09:58:08.268147961 +0000
@@ -1,7 +1,7 @@
 within BuildSysPro.IBPSA.Fluid.Sensors;
 model SpecificEnthalpy "Ideal one port specific enthalpy sensor"
   extends IBPSA.Fluid.Sensors.BaseClasses.PartialAbsoluteSensor;
-  extends Modelica.Icons.RotationalSensor;
+  extends Modelica.Icons.RoundSensor;
   Modelica.Blocks.Interfaces.RealOutput h_out(final quantity="SpecificEnergy",
                                               final unit="J/kg")
     "Specific enthalpy in port medium"
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/SpecificEnthalpyTwoPort.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/SpecificEnthalpyTwoPort.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/SpecificEnthalpyTwoPort.mo"	2022-03-10 09:57:39.692144340 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/SpecificEnthalpyTwoPort.mo"	2022-03-10 09:58:08.260147960 +0000
@@ -1,8 +1,8 @@
 within BuildSysPro.IBPSA.Fluid.Sensors;
 model SpecificEnthalpyTwoPort "Ideal two port sensor for the specific enthalpy"
   extends IBPSA.Fluid.Sensors.BaseClasses.PartialDynamicFlowSensor;
-  extends Modelica.Icons.RotationalSensor;
-  parameter Modelica.SIunits.SpecificEnthalpy h_out_start=
+  extends Modelica.Icons.RoundSensor;
+  parameter Modelica.Units.SI.SpecificEnthalpy h_out_start=
     Medium.specificEnthalpy_pTX(p=Medium.p_default, T=Medium.T_default, X=Medium.X_default)
     "Initial or guess value of output (= state)"
     annotation (Dialog(group="Initialization"));
@@ -15,7 +15,7 @@
         extent={{10,-10},{-10,10}},
         rotation=270)));
 protected
-  Modelica.SIunits.SpecificEnthalpy hMed_out(start=h_out_start)
+  Modelica.Units.SI.SpecificEnthalpy hMed_out(start=h_out_start)
     "Medium enthalpy to which the sensor is exposed";
 initial equation
   if dynamic then
@@ -36,12 +36,13 @@
   else
     hMed_out = port_b.h_outflow;
   end if;
-  // Output signal of sensor
+// Output signal of sensor
   if dynamic then
     der(h_out) = (hMed_out-h_out)*k*tauInv;
   else
     h_out = hMed_out;
-  end if;
+  end if;
+
 annotation (defaultComponentName="senSpeEnt",
   Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100,100}}),
         graphics={
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/SpecificEntropy.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/SpecificEntropy.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/SpecificEntropy.mo"	2022-03-10 09:57:39.692144340 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/SpecificEntropy.mo"	2022-03-10 09:58:08.240147959 +0000
@@ -1,7 +1,7 @@
 within BuildSysPro.IBPSA.Fluid.Sensors;
 model SpecificEntropy "Ideal one port specific entropy sensor"
   extends IBPSA.Fluid.Sensors.BaseClasses.PartialAbsoluteSensor;
-  extends Modelica.Icons.RotationalSensor;
+  extends Modelica.Icons.RoundSensor;
   Modelica.Blocks.Interfaces.RealOutput s(final quantity="SpecificEntropy",
                                           final unit="J/(kg.K)")
     "Specific entropy in port medium"
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/SpecificEntropyTwoPort.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/SpecificEntropyTwoPort.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/SpecificEntropyTwoPort.mo"	2022-03-10 09:57:39.692144340 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/SpecificEntropyTwoPort.mo"	2022-03-10 09:58:08.228147957 +0000
@@ -1,8 +1,8 @@
 within BuildSysPro.IBPSA.Fluid.Sensors;
 model SpecificEntropyTwoPort "Ideal two port sensor for the specific entropy"
   extends IBPSA.Fluid.Sensors.BaseClasses.PartialDynamicFlowSensor;
-  extends Modelica.Icons.RotationalSensor;
-  parameter Modelica.SIunits.SpecificEntropy s_start=
+  extends Modelica.Icons.RoundSensor;
+  parameter Modelica.Units.SI.SpecificEntropy s_start=
     Medium.specificEntropy_pTX(p=Medium.p_default, T=Medium.T_default, X=Medium.X_default)
     "Initial or guess value of output (= state)"
     annotation (Dialog(group="Initialization"));
@@ -15,7 +15,7 @@
         extent={{10,-10},{-10,10}},
         rotation=270)));
 protected
-  Modelica.SIunits.SpecificEntropy sMed(start=s_start)
+  Modelica.Units.SI.SpecificEntropy sMed(start=s_start)
     "Medium entropy to which the sensor is exposed";
   Medium.SpecificEntropy s_a_inflow
     "Specific entropy of inflowing fluid at port_a";
@@ -47,12 +47,13 @@
      s_a_inflow = sMed;
      s_b_inflow = sMed;
   end if;
-  // Output signal of sensor
+// Output signal of sensor
   if dynamic then
     der(s) = (sMed-s)*k*tauInv;
   else
     s = sMed;
-  end if;
+  end if;
+
 annotation (defaultComponentName="senSpeEnt",
   Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100,100}}),
         graphics={
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/TemperatureTwoPort.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/TemperatureTwoPort.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/TemperatureTwoPort.mo"	2022-03-10 09:57:39.692144340 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/TemperatureTwoPort.mo"	2022-03-10 09:58:08.200147952 +0000
@@ -11,17 +11,17 @@
         origin={0,110},
         extent={{10,-10},{-10,10}},
         rotation=270)));
-  parameter Modelica.SIunits.Temperature T_start=Medium.T_default
+  parameter Modelica.Units.SI.Temperature T_start=Medium.T_default
     "Initial or guess value of output (= state)"
     annotation (Dialog(group="Initialization"));
 
   parameter Boolean transferHeat = false
     "if true, temperature T converges towards TAmb when no flow"
     annotation(Evaluate=true, Dialog(group="Heat transfer"));
-  parameter Modelica.SIunits.Temperature TAmb=Medium.T_default
+  parameter Modelica.Units.SI.Temperature TAmb=Medium.T_default
     "Fixed ambient temperature for heat transfer"
     annotation(Dialog(enable=transferHeat, group="Heat transfer"));
-  parameter Modelica.SIunits.Time tauHeaTra(min=1)=1200
+  parameter Modelica.Units.SI.Time tauHeaTra(min=1)=1200
     "Time constant for heat transfer, default 20 minutes"
     annotation(Dialog(enable=transferHeat, group="Heat transfer"));
 
@@ -62,7 +62,7 @@
      T_a_inflow = TMed;
      T_b_inflow = TMed;
   end if;
-  // Output signal of sensor
+// Output signal of sensor
   if dynamic then
     if transferHeat then
       der(T) = (TMed-T)*k*tauInv + (TAmb-T)*tauHeaTraInv/(ratTau*k+1);
@@ -71,7 +71,8 @@
     end if;
   else
     T = TMed;
-  end if;
+  end if;
+
 annotation (defaultComponentName="senTem",
     Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100,100}}),
          graphics={
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/TemperatureWetBulbTwoPort.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/TemperatureWetBulbTwoPort.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/TemperatureWetBulbTwoPort.mo"	2022-03-10 09:57:39.692144340 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/TemperatureWetBulbTwoPort.mo"	2022-03-10 09:58:08.180147950 +0000
@@ -13,7 +13,7 @@
         extent={{-10,-10},{10,10}},
         rotation=90,
         origin={0,110})));
-  parameter Modelica.SIunits.Temperature TWetBul_start = Medium.T_default
+  parameter Modelica.Units.SI.Temperature TWetBul_start = Medium.T_default
     "Initial or guess value of wet bulb temperature (used to compute initial output signal))"
     annotation (Dialog(group="Initialization"));
 
@@ -23,11 +23,11 @@
   IBPSA.Utilities.Psychrometrics.TWetBul_TDryBulXi wetBulMod(redeclare package
       Medium =         Medium, TWetBul(start=TWetBul_start))
     "Block for wet bulb temperature";
-  Modelica.SIunits.SpecificEnthalpy h "Specific enthalpy";
+  Modelica.Units.SI.SpecificEnthalpy h "Specific enthalpy";
   Medium.MassFraction Xi[Medium.nXi]
     "Species vector, needed because indexed argument for the operator inStream is not supported";
 initial equation
-  // Initialization of wet bulb temperature
+// Initialization of wet bulb temperature
   if dynamic then
     if initType == Modelica.Blocks.Types.Init.SteadyState then
       der(T) = 0;
@@ -51,18 +51,19 @@
   else
     h = port_b.h_outflow;
     Xi = port_b.Xi_outflow;
-  end if;
-  // Compute wet bulb temperature
-  wetBulMod.TDryBul = Medium.temperature_phX(p=port_a.p, h=h, X=cat(1,Xi,{1-sum(Xi)}));
+  end if;
+// Compute wet bulb temperature
+  wetBulMod.TDryBul = Medium.temperature_phX(p = port_a.p, h = h, X = cat(1, Xi, {1 - sum(Xi)}));
   wetBulMod.Xi = Xi;
   wetBulMod.p  = port_a.p;
-  TMedWetBul = wetBulMod.TWetBul;
-  // Output signal of sensor
-  if dynamic then
-    der(T) = (TMedWetBul-T)*k*tauInv;
-  else
-    T = TMedWetBul;
-  end if;
+  TMedWetBul = wetBulMod.TWetBul;
+// Output signal of sensor
+  if dynamic then
+    der(T) = (TMedWetBul - T) * k * tauInv;
+  else
+    T = TMedWetBul;
+  end if;
+
 annotation (defaultComponentName="senWetBul",
     Icon(graphics={
         Line(points={{-100,0},{92,0}}, color={0,128,255}),
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/TraceSubstances.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/TraceSubstances.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/TraceSubstances.mo"	2022-03-10 09:57:39.692144340 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/TraceSubstances.mo"	2022-03-10 09:58:08.164147949 +0000
@@ -1,7 +1,7 @@
 within BuildSysPro.IBPSA.Fluid.Sensors;
 model TraceSubstances "Ideal one port trace substances sensor"
   extends IBPSA.Fluid.Sensors.BaseClasses.PartialAbsoluteSensor;
-  extends Modelica.Icons.RotationalSensor;
+  extends Modelica.Icons.RoundSensor;
 
   parameter String substanceName = "CO2" "Name of trace substance";
 
@@ -21,11 +21,12 @@
          + Medium.mediumName + "'.\n"
          + "Check sensor parameter and medium model.");
 equation
-  // We obtain the species concentration with a vector multiplication
-  // because Dymola 7.3 cannot find the derivative in the model
-  // Buildings.Examples.VAVSystemCTControl.mo
-  // if we set C = CVec[ind];
-  C = s*inStream(port.C_outflow);
+// We obtain the species concentration with a vector multiplication
+// because Dymola 7.3 cannot find the derivative in the model
+// Buildings.Examples.VAVSystemCTControl.mo
+// if we set C = CVec[ind];
+  C = s*inStream(port.C_outflow);
+
 annotation (defaultComponentName="senTraSub",
   Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100,100}}),
         graphics={
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/TraceSubstancesTwoPort.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/TraceSubstancesTwoPort.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/TraceSubstancesTwoPort.mo"	2022-03-10 09:57:39.692144340 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/TraceSubstancesTwoPort.mo"	2022-03-10 09:58:08.152147947 +0000
@@ -1,7 +1,7 @@
 within BuildSysPro.IBPSA.Fluid.Sensors;
 model TraceSubstancesTwoPort "Ideal two port sensor for trace substance"
   extends IBPSA.Fluid.Sensors.BaseClasses.PartialDynamicFlowSensor;
-  extends Modelica.Icons.RotationalSensor;
+  extends Modelica.Icons.RoundSensor;
   Modelica.Blocks.Interfaces.RealOutput C(min=0,
                                           start=C_start)
     "Trace substance of the passing fluid"
@@ -49,12 +49,13 @@
   else
      CMed = s*port_b.C_outflow;
   end if;
-  // Output signal of sensor
+// Output signal of sensor
   if dynamic then
     der(C) = (CMed-C)*k*tauInv;
   else
     C = CMed;
-  end if;
+  end if;
+
 annotation (defaultComponentName="senTraSub",
   Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100,100}}),
         graphics={
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/Velocity.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/Velocity.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/Velocity.mo"	2022-03-10 09:57:39.692144340 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/Velocity.mo"	2022-03-10 09:58:08.108147942 +0000
@@ -1,23 +1,23 @@
 within BuildSysPro.IBPSA.Fluid.Sensors;
 model Velocity "Ideal sensor for flow velocity"
   extends IBPSA.Fluid.Sensors.BaseClasses.PartialDynamicFlowSensor;
-  extends Modelica.Icons.RotationalSensor;
+  extends Modelica.Icons.RoundSensor;
   parameter Medium.Density
     d_start=Medium.density(Medium.setState_pTX(p_start, T_start, X_start))
     "Initial or guess value of density"
     annotation (Dialog(group="Initialization"));
-  parameter Modelica.SIunits.Temperature T_start=Medium.T_default
+  parameter Modelica.Units.SI.Temperature T_start=Medium.T_default
     "Temperature used to compute d_start"
     annotation (Dialog(group="Initialization"));
-  parameter Modelica.SIunits.Pressure p_start=Medium.p_default
+  parameter Modelica.Units.SI.Pressure p_start=Medium.p_default
     "Pressure used to compute d_start"
     annotation (Dialog(group="Initialization"));
-  parameter Modelica.SIunits.MassFraction X_start[Medium.nX]=Medium.X_default
+  parameter Modelica.Units.SI.MassFraction X_start[Medium.nX]=Medium.X_default
     "Mass fraction used to compute d_start"
     annotation (Dialog(group="Initialization"));
 
-  parameter Modelica.SIunits.Area A "Cross sectional area of flow channel";
-  Modelica.SIunits.VolumeFlowRate V_flow
+  parameter Modelica.Units.SI.Area A "Cross sectional area of flow channel";
+  Modelica.Units.SI.VolumeFlowRate V_flow
     "Volume flow rate from port_a to port_b";
   Modelica.Blocks.Interfaces.RealOutput v(final quantity="Velocity",
                                           final unit="m/s")
@@ -62,18 +62,19 @@
               X=port_b.Xi_outflow));
      d_a_inflow = dMed;
      d_b_inflow = dMed;
-  end if;
-  // Output signal of density sensor that is used to compute
-  // the volume flow rate
-  if dynamic then
-    der(d) = (dMed-d)*k*tauInv;
-  else
-    d = dMed;
-  end if;
-  // Volume flow rate
-  V_flow = port_a.m_flow/d;
-  // Flow velocity
-  v = V_flow / A;
+  end if;
+// Output signal of density sensor that is used to compute
+// the volume flow rate
+  if dynamic then
+    der(d) = (dMed - d) * k * tauInv;
+  else
+    d = dMed;
+  end if;
+// Volume flow rate
+  V_flow = port_a.m_flow / d;
+// Flow velocity
+  v = V_flow / A;
+
 annotation (defaultComponentName="senVel",
   Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100,100}}),
         graphics={
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/VolumeFlowRate.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/VolumeFlowRate.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/VolumeFlowRate.mo"	2022-03-10 09:57:39.692144340 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sensors/VolumeFlowRate.mo"	2022-03-10 09:58:07.988147927 +0000
@@ -1,18 +1,18 @@
 within BuildSysPro.IBPSA.Fluid.Sensors;
 model VolumeFlowRate "Ideal sensor for volume flow rate"
   extends IBPSA.Fluid.Sensors.BaseClasses.PartialDynamicFlowSensor;
-  extends Modelica.Icons.RotationalSensor;
+  extends Modelica.Icons.RoundSensor;
   parameter Medium.Density
     d_start=Medium.density(Medium.setState_pTX(p_start, T_start, X_start))
     "Initial or guess value of density"
     annotation (Dialog(group="Initialization"));
-  parameter Modelica.SIunits.Temperature T_start=Medium.T_default
+  parameter Modelica.Units.SI.Temperature T_start=Medium.T_default
     "Temperature used to compute d_start"
     annotation (Dialog(group="Initialization"));
-  parameter Modelica.SIunits.Pressure p_start=Medium.p_default
+  parameter Modelica.Units.SI.Pressure p_start=Medium.p_default
     "Pressure used to compute d_start"
     annotation (Dialog(group="Initialization"));
-  parameter Modelica.SIunits.MassFraction X_start[Medium.nX]=Medium.X_default
+  parameter Modelica.Units.SI.MassFraction X_start[Medium.nX]=Medium.X_default
     "Mass fraction used to compute d_start"
     annotation (Dialog(group="Initialization"));
   Modelica.Blocks.Interfaces.RealOutput V_flow(final quantity="VolumeFlowRate",
@@ -58,16 +58,17 @@
               X=port_b.Xi_outflow));
      d_a_inflow = dMed;
      d_b_inflow = dMed;
-  end if;
-  // Output signal of density sensor that is used to compute
-  // the volume flow rate
-  if dynamic then
-    der(d) = (dMed-d)*k*tauInv;
-  else
-    d = dMed;
-  end if;
-  // Volume flow rate
-  V_flow = port_a.m_flow/d;
+  end if;
+// Output signal of density sensor that is used to compute
+// the volume flow rate
+  if dynamic then
+    der(d) = (dMed - d) * k * tauInv;
+  else
+    d = dMed;
+  end if;
+// Volume flow rate
+  V_flow = port_a.m_flow / d;
+
 annotation (defaultComponentName="senVolFlo",
   Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100,100}}),
         graphics={
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sources/BaseClasses/Outside.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sources/BaseClasses/Outside.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sources/BaseClasses/Outside.mo"	2022-03-10 09:57:39.692144340 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sources/BaseClasses/Outside.mo"	2022-03-10 09:58:07.960147922 +0000
@@ -38,21 +38,18 @@
        quantity=Medium.extraPropertiesNames)
     "Needed to connect to conditional connector";
 
-equation
-  // Check medium properties
-  Modelica.Fluid.Utilities.checkBoundary(Medium.mediumName, Medium.substanceNames,
-    Medium.singleState, true, medium.X, "Boundary_pT");
-
-  // Conditional connectors for trace substances
+equation
+// Check medium properties
+  Modelica.Fluid.Utilities.checkBoundary(Medium.mediumName, Medium.substanceNames, Medium.singleState, true, medium.X, "Boundary_pT");
+// Conditional connectors for trace substances
   connect(C_in, C_in_internal);
   if not use_C_in then
     C_in_internal = C;
-  end if;
-  // Connections to input. This is required to obtain the data from
-  // the weather bus in case that the component x_pTphi is conditionally removed
-  connect(weaBus.TDryBul, T_in_internal);
-
-  // Connections to compute species concentration
+  end if;
+// Connections to input. This is required to obtain the data from
+// the weather bus in case that the component x_pTphi is conditionally removed
+  connect(weaBus.TDryBul, T_in_internal);
+// Connections to compute species concentration
   connect(p_in_internal, x_pTphi.p_in);
   connect(T_in_internal, x_pTphi.T);
   connect(weaBus.relHum, x_pTphi.phi);
@@ -60,8 +57,8 @@
   connect(X_in_internal, x_pTphi.X);
   if singleSubstance then
     X_in_internal = ones(Medium.nX);
-  end if;
-  // Assign medium properties
+  end if;
+// Assign medium properties
   medium.p = p_in_internal;
   medium.T = T_in_internal;
   medium.Xi = X_in_internal[1:Medium.nXi];
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sources/BaseClasses/PartialSource.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sources/BaseClasses/PartialSource.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sources/BaseClasses/PartialSource.mo"	2022-03-10 09:57:39.692144340 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sources/BaseClasses/PartialSource.mo"	2022-03-10 09:58:07.928147918 +0000
@@ -37,7 +37,7 @@
     "Needed to connect to conditional connector";
 
 initial equation
-  // Only one connection allowed to a port to avoid unwanted ideal mixing
+// Only one connection allowed to a port to avoid unwanted ideal mixing
   for i in 1:nPorts loop
     assert(cardinality(ports[i]) <= 1,"
 Each ports[i] of boundary shall at most be connected to one component.
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sources/BaseClasses/PartialSource_m_flow.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sources/BaseClasses/PartialSource_m_flow.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sources/BaseClasses/PartialSource_m_flow.mo"	2022-03-10 09:57:39.692144340 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sources/BaseClasses/PartialSource_m_flow.mo"	2022-03-10 09:58:07.896147914 +0000
@@ -4,7 +4,7 @@
   parameter Boolean use_m_flow_in = false
     "Get the mass flow rate from the input connector"
     annotation(Evaluate=true, HideResult=true, Dialog(group="Conditional inputs"));
-  parameter Modelica.SIunits.MassFlowRate m_flow = 0
+  parameter Modelica.Units.SI.MassFlowRate m_flow = 0
     "Fixed mass flow rate going out of the fluid port"
     annotation (Dialog(enable = not use_m_flow_in,group="Fixed inputs"));
   Modelica.Blocks.Interfaces.RealInput m_flow_in(final unit="kg/s") if use_m_flow_in
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sources/MassFlowSource_WeatherData.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sources/MassFlowSource_WeatherData.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sources/MassFlowSource_WeatherData.mo"	2022-03-10 09:57:39.692144340 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sources/MassFlowSource_WeatherData.mo"	2022-03-10 09:58:07.652147884 +0000
@@ -9,7 +9,7 @@
   parameter Boolean use_C_in = false
     "Get the trace substances from the input connector"
     annotation(Evaluate=true, HideResult=true);
-  parameter Modelica.SIunits.MassFlowRate m_flow = 0
+  parameter Modelica.Units.SI.MassFlowRate m_flow = 0
     "Fixed mass flow rate going out of the fluid port"
     annotation (Dialog(enable = not use_m_flow_in));
   parameter Medium.ExtraProperty C[Medium.nC](
@@ -65,15 +65,13 @@
     Medium.singleState,
     true,
     medium.X,
-    "MassFlowSourceFromOutside_h");
-
-  // Connections and calculation to find specific enthalpy
+    "MassFlowSourceFromOutside_h");
+// Connections and calculation to find specific enthalpy
   connect(weaBus.pAtm, pAtm);
   connect(weaBus.TDryBul, TDryBul);
   h_out_internal = Medium.specificEnthalpy(Medium.setState_pTX(
-    pAtm, TDryBul, X_in_internal));
-
-  // Connections to compute species concentration
+    pAtm, TDryBul, X_in_internal));
+// Connections to compute species concentration
   connect(weaBus.pAtm, x_pTphi.p_in);
   connect(weaBus.TDryBul, x_pTphi.T);
   connect(weaBus.relHum, x_pTphi.phi);
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sources/Outside_CpLowRise.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sources/Outside_CpLowRise.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sources/Outside_CpLowRise.mo"	2022-03-10 09:57:39.692144340 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sources/Outside_CpLowRise.mo"	2022-03-10 09:58:07.588147876 +0000
@@ -7,12 +7,12 @@
     "Wind pressure coefficient for wind normal to wall";
   parameter Real s(final min=0, final unit="1")
     "Side ratio, s=length of this wall/length of adjacent wall";
-  parameter Modelica.SIunits.Angle azi "Surface azimuth (South:0, West:pi/2)"
+  parameter Modelica.Units.SI.Angle azi "Surface azimuth (South:0, West:pi/2)"
     annotation (choicesAllMatching=true);
 
-  Modelica.SIunits.Angle alpha "Wind incidence angle (0: normal to wall)";
+  Modelica.Units.SI.Angle alpha "Wind incidence angle (0: normal to wall)";
   Real CpAct(min=0, final unit="1") "Actual wind pressure coefficient";
-  Modelica.SIunits.Pressure pWin(displayUnit="Pa")
+  Modelica.Units.SI.Pressure pWin(displayUnit="Pa")
     "Change in pressure due to wind force";
 protected
   Modelica.Blocks.Interfaces.RealInput pWea(min=0, nominal=1E5, final unit="Pa")
@@ -27,7 +27,7 @@
   Modelica.Blocks.Interfaces.RealInput winDir(final unit="rad",
                                               displayUnit="deg")
     "Wind direction from weather bus";
-  Modelica.SIunits.Angle surOut = azi-Modelica.Constants.pi
+  Modelica.Units.SI.Angle surOut = azi-Modelica.Constants.pi
     "Angle of surface that is used to compute angle of attack of wind";
 equation
   alpha = winDir-surOut;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sources/PropertySource_T.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sources/PropertySource_T.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sources/PropertySource_T.mo"	2022-03-10 09:57:39.692144340 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sources/PropertySource_T.mo"	2022-03-10 09:58:07.560147871 +0000
@@ -1,8 +1,8 @@
 within BuildSysPro.IBPSA.Fluid.Sources;
 model PropertySource_T
   "Model for overriding fluid properties that flow through the component, using temperature input"
-  // The parameter declaration is before 'extends',
-  // since this affects the parameter order in the parameters window.
+  // The parameter declaration is before 'extends',
+  // since this affects the parameter order in the parameters window.
   parameter Boolean use_T_in= false
     "Set to true to get the leaving fluid temperature from the input connector"
     annotation(Evaluate=true, Dialog(group="Inputs"));
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sources/PropertySource_h.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sources/PropertySource_h.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sources/PropertySource_h.mo"	2022-03-10 09:57:39.692144340 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sources/PropertySource_h.mo"	2022-03-10 09:58:07.548147870 +0000
@@ -1,8 +1,8 @@
 within BuildSysPro.IBPSA.Fluid.Sources;
 model PropertySource_h
   "Model for overriding fluid properties that flow through the component, using specific enthalpy input"
-  // The parameter declaration is before 'extends',
-  // since this affects the parameter order in the parameters window.
+  // The parameter declaration is before 'extends',
+  // since this affects the parameter order in the parameters window.
   parameter Boolean use_h_in= false
     "Set to true to get the specific enthalpy from the input connector"
     annotation(Evaluate=true, Dialog(group="Inputs"));
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sources/TraceSubstancesFlowSource.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sources/TraceSubstancesFlowSource.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sources/TraceSubstancesFlowSource.mo"	2022-03-10 09:57:39.692144340 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Sources/TraceSubstancesFlowSource.mo"	2022-03-10 09:58:07.532147869 +0000
@@ -8,7 +8,7 @@
     "Get the trace substance mass flow rate from the input connector"
     annotation(Evaluate=true, HideResult=true);
 
-  parameter Modelica.SIunits.MassFlowRate m_flow = 0
+  parameter Modelica.Units.SI.MassFlowRate m_flow = 0
     "Fixed mass flow rate going out of the fluid port"
     annotation (Dialog(enable = not use_m_flow_in));
   Modelica.Blocks.Interfaces.RealInput m_flow_in(final unit="kg/s") if
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Storage/BaseClasses/Buoyancy.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Storage/BaseClasses/Buoyancy.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Storage/BaseClasses/Buoyancy.mo"	2022-03-10 09:57:39.692144340 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Storage/BaseClasses/Buoyancy.mo"	2022-03-10 09:58:07.500147865 +0000
@@ -6,27 +6,27 @@
   replaceable package Medium =
       Modelica.Media.Interfaces.PartialMedium                          "Medium model"  annotation (
       choicesAllMatching = true);
-  parameter Modelica.SIunits.Volume V "Volume";
+  parameter Modelica.Units.SI.Volume V "Volume";
   parameter Integer nSeg(min=2) = 2 "Number of volume segments";
-  parameter Modelica.SIunits.Time tau(min=0) "Time constant for mixing";
+  parameter Modelica.Units.SI.Time tau(min=0) "Time constant for mixing";
 
   Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_a[nSeg] heatPort
     "Heat input into the volumes"
     annotation (Placement(transformation(extent={{90,-10},{110,10}})));
 
-  Modelica.SIunits.HeatFlowRate[nSeg-1] Q_flow
+  Modelica.Units.SI.HeatFlowRate[nSeg-1] Q_flow
     "Heat flow rate from segment i+1 to i";
 protected
    parameter Medium.ThermodynamicState sta_default = Medium.setState_pTX(T=Medium.T_default,
          p=Medium.p_default, X=Medium.X_default[1:Medium.nXi])
     "Medium state at default properties";
-   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 mass";
-   parameter Modelica.SIunits.SpecificHeatCapacity cp_default=Medium.specificHeatCapacityCp(sta_default)
+   parameter Modelica.Units.SI.SpecificHeatCapacity cp_default=Medium.specificHeatCapacityCp(sta_default)
     "Specific heat capacity";
    parameter Real k(unit="W/K") = V*rho_default*cp_default/tau/nSeg
     "Proportionality constant, since we use dT instead of dH";
-   Modelica.SIunits.TemperatureDifference dT[nSeg-1]
+   Modelica.Units.SI.TemperatureDifference dT[nSeg-1]
     "Temperature difference between adjoining volumes";
 equation
   for i in 1:nSeg-1 loop
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Storage/BaseClasses/IndirectTankHeatExchanger.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Storage/BaseClasses/IndirectTankHeatExchanger.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Storage/BaseClasses/IndirectTankHeatExchanger.mo"	2022-03-10 09:57:39.692144340 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Storage/BaseClasses/IndirectTankHeatExchanger.mo"	2022-03-10 09:58:07.460147859 +0000
@@ -16,28 +16,28 @@
       package Medium =       MediumHex, final show_T=false);
 
   parameter Integer nSeg(min=2) "Number of segments in the heat exchanger";
-  parameter Modelica.SIunits.HeatCapacity CHex
+  parameter Modelica.Units.SI.HeatCapacity CHex
     "Capacitance of the heat exchanger";
-  parameter Modelica.SIunits.Volume volHexFlu
+  parameter Modelica.Units.SI.Volume volHexFlu
     "Volume of heat transfer fluid in the heat exchanger";
-  parameter Modelica.SIunits.HeatFlowRate Q_flow_nominal
+  parameter Modelica.Units.SI.HeatFlowRate Q_flow_nominal
     "Heat transfer at nominal conditions"
   annotation(Dialog(tab="General", group="Nominal condition"));
 
-  final parameter Modelica.SIunits.ThermalConductance UA_nominal=
+  final parameter Modelica.Units.SI.ThermalConductance UA_nominal=
     abs(Q_flow_nominal/(THex_nominal-TTan_nominal))
     "Nominal UA value for the heat exchanger";
-  parameter Modelica.SIunits.Temperature TTan_nominal
+  parameter Modelica.Units.SI.Temperature TTan_nominal
     "Temperature of fluid inside the tank at UA_nominal"
     annotation(Dialog(tab="General", group="Nominal condition"));
-  parameter Modelica.SIunits.Temperature THex_nominal
+  parameter Modelica.Units.SI.Temperature THex_nominal
     "Temperature of fluid inside the heat exchanger at UA_nominal"
     annotation(Dialog(tab="General", group="Nominal condition"));
   parameter Real r_nominal(min=0, max=1)=0.5
     "Ratio between coil inside and outside convective heat transfer"
           annotation(Dialog(tab="General", group="Nominal condition"));
 
-  parameter Modelica.SIunits.Diameter dExtHex
+  parameter Modelica.Units.SI.Diameter dExtHex
     "Exterior diameter of the heat exchanger pipe";
 
   parameter Modelica.Fluid.Types.Dynamics energyDynamics=Modelica.Fluid.Types.Dynamics.DynamicFreeInitial
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Storage/BaseClasses/PartialStratified.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Storage/BaseClasses/PartialStratified.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Storage/BaseClasses/PartialStratified.mo"	2022-03-10 09:57:39.692144340 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Storage/BaseClasses/PartialStratified.mo"	2022-03-10 09:58:07.376147848 +0000
@@ -5,15 +5,15 @@
 
   import Modelica.Fluid.Types;
   import Modelica.Fluid.Types.Dynamics;
-  parameter Modelica.SIunits.Volume VTan "Tank volume";
-  parameter Modelica.SIunits.Length hTan "Height of tank (without insulation)";
-  parameter Modelica.SIunits.Length dIns "Thickness of insulation";
-  parameter Modelica.SIunits.ThermalConductivity kIns = 0.04
+  parameter Modelica.Units.SI.Volume VTan "Tank volume";
+  parameter Modelica.Units.SI.Length hTan "Height of tank (without insulation)";
+  parameter Modelica.Units.SI.Length dIns "Thickness of insulation";
+  parameter Modelica.Units.SI.ThermalConductivity kIns = 0.04
     "Specific heat conductivity of insulation";
   parameter Integer nSeg(min=2) = 2 "Number of volume segments";
 
-  ////////////////////////////////////////////////////////////////////
-  // Assumptions
+////////////////////////////////////////////////////////////////////
+  // Assumptions
   parameter Types.Dynamics energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial
     "Formulation of energy balance"
     annotation(Evaluate=true, Dialog(tab = "Dynamics", group="Equations"));
@@ -21,7 +21,7 @@
     "Formulation of mass balance"
     annotation(Evaluate=true, Dialog(tab = "Dynamics", group="Equations"));
 
-  // Initialization
+// Initialization
   parameter Medium.AbsolutePressure p_start = Medium.p_default
     "Start value of pressure"
     annotation(Dialog(tab = "Initialization"));
@@ -37,11 +37,10 @@
     annotation (Dialog(tab="Initialization", enable=Medium.nC > 0));
 
   // Dynamics
-  parameter Modelica.SIunits.Time tau=1 "Time constant for mixing";
-
-  ////////////////////////////////////////////////////////////////////
-  // Connectors
+  parameter Modelica.Units.SI.Time tau=1 "Time constant for mixing";
 
+////////////////////////////////////////////////////////////////////
+  // Connectors
   Modelica.Blocks.Interfaces.RealOutput Ql_flow
     "Heat loss of tank (positive if heat flows from tank to ambient)"
     annotation (Placement(transformation(extent={{100,62},{120,82}})));
@@ -61,7 +60,7 @@
     "Heat port tank bottom (outside insulation). Leave unconnected for adiabatic condition"
     annotation (Placement(transformation(extent={{14,-80},{26,-68}})));
 
-  // Models
+// Models
   IBPSA.Fluid.MixingVolumes.MixingVolume[nSeg] vol(
     redeclare each package Medium = Medium,
     each energyDynamics=energyDynamics,
@@ -81,15 +80,15 @@
     T=Medium.T_default,
     p=Medium.p_default,
     X=Medium.X_default[1:Medium.nXi]) "Medium state at default properties";
-  parameter Modelica.SIunits.Length hSeg = hTan / nSeg
+  parameter Modelica.Units.SI.Length hSeg = hTan / nSeg
     "Height of a tank segment";
-  parameter Modelica.SIunits.Area ATan = VTan/hTan
+  parameter Modelica.Units.SI.Area ATan = VTan/hTan
     "Tank cross-sectional area (without insulation)";
-  parameter Modelica.SIunits.Length rTan = sqrt(ATan/Modelica.Constants.pi)
+  parameter Modelica.Units.SI.Length rTan = sqrt(ATan/Modelica.Constants.pi)
     "Tank diameter (without insulation)";
-  parameter Modelica.SIunits.ThermalConductance conFluSeg = ATan*Medium.thermalConductivity(sta_default)/hSeg
+  parameter Modelica.Units.SI.ThermalConductance conFluSeg = ATan*Medium.thermalConductivity(sta_default)/hSeg
     "Thermal conductance between fluid volumes";
-  parameter Modelica.SIunits.ThermalConductance conTopSeg = ATan*kIns/dIns
+  parameter Modelica.Units.SI.ThermalConductance conTopSeg = ATan*kIns/dIns
     "Thermal conductance from center of top (or bottom) volume through tank insulation at top (or bottom)";
 
   BaseClasses.Buoyancy buo(
@@ -138,7 +137,7 @@
       points={{-40,60},{6,60},{6,-6}},
       color={191,0,0}));
   for i in 1:nSeg-1 loop
-  // heat conduction between fluid nodes
+// heat conduction between fluid nodes
      connect(vol[i].heatPort, conFlu[i].port_a)    annotation (Line(points={{6,-6},{
             6,-6},{-60,-6},{-60,10},{-56,10},{-56,11}},    color={191,0,0}));
     connect(vol[i+1].heatPort, conFlu[i].port_b)    annotation (Line(points={{6,-6},{
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Storage/BaseClasses/ThirdOrderStratifier.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Storage/BaseClasses/ThirdOrderStratifier.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Storage/BaseClasses/ThirdOrderStratifier.mo"	2022-03-10 09:57:39.692144340 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Storage/BaseClasses/ThirdOrderStratifier.mo"	2022-03-10 09:58:07.316147840 +0000
@@ -7,7 +7,7 @@
       Modelica.Media.Interfaces.PartialMedium
     "Medium model" annotation (choicesAllMatching=true);
 
-  parameter Modelica.SIunits.MassFlowRate m_flow_small(min=0)
+  parameter Modelica.Units.SI.MassFlowRate m_flow_small(min=0)
     "Small mass flow rate for regularization of zero flow";
   parameter Integer nSeg(min=4) "Number of volume segments";
 
@@ -33,14 +33,14 @@
     annotation (Placement(transformation(extent={{-110,-10},{-90,10}})));
 
 protected
-  Modelica.SIunits.SpecificEnthalpy[nSeg + 1] hOut
+  Modelica.Units.SI.SpecificEnthalpy[nSeg + 1] hOut
     "Extended vector with new outlet enthalpies to reduce numerical dissipation (at the boundary between two volumes)";
-  Modelica.SIunits.SpecificEnthalpy[nSeg + 2] h
+  Modelica.Units.SI.SpecificEnthalpy[nSeg + 2] h
     "Extended vector with port enthalpies, needed to simplify loop";
-  Modelica.SIunits.HeatFlowRate Q_flow[nSeg]
+  Modelica.Units.SI.HeatFlowRate Q_flow[nSeg]
     "Heat exchange computed using upwind third order discretization scheme";
-  //    Modelica.SIunits.HeatFlowRate Q_flow_upWind
-  //     "Heat exchange computed using upwind third order discretization scheme"; //Used to test the energy conservation
+  //    Modelica.SIunits.HeatFlowRate Q_flow_upWind
+  //     "Heat exchange computed using upwind third order discretization scheme"; //Used to test the energy conservation
   Real sig
     "Sign used to implement the third order upwind scheme without triggering a state event";
   Real comSig
@@ -48,60 +48,45 @@
 
 equation
   assert(nSeg >= 4,
-  "Number of segments of the enhanced stratified tank should be no less than 4 (nSeg>=4).");
-
-  // assign zero flow conditions at port
+  "Number of segments of the enhanced stratified tank should be no less than 4 (nSeg>=4).");
+// assign zero flow conditions at port
   fluidPort[:].m_flow = zeros(nSeg + 2);
   fluidPort[:].h_outflow = zeros(nSeg + 2);
   fluidPort[:].Xi_outflow = zeros(nSeg + 2, Medium.nXi);
-  fluidPort[:].C_outflow = zeros(nSeg + 2, Medium.nC);
-
-  // assign extended enthalpy vectors
-  for i in 1:nSeg + 2 loop
-    h[i] = inStream(fluidPort[i].h_outflow);
-  end for;
-
-  // Value that transitions between 0 and 1 as the flow reverses.
-  sig = Modelica.Fluid.Utilities.regStep(
-    m_flow,
-    1,
-    0,
-    m_flow_small);
-             // at surface between port_a and vol1
-
-  comSig = 1 - sig;
-
-  // at surface between port_a and vol1
-  hOut[1] = sig*h[1] + comSig*h[2];
-  // at surface between vol[nSeg] and port_b
-  hOut[nSeg + 1] = sig*h[nSeg + 1] + comSig*h[nSeg + 2];
-
-  // Pros: These two equations can further reduce the temperature overshoot by using the upwind
-  // Cons: The minimum of nSeg hase to be 4 instead of 2.
-  hOut[2] = sig*h[2] + comSig*h[3];
-  // at surface between vol1 and vol2
-  hOut[nSeg] = sig*h[nSeg] + comSig*h[nSeg + 1];
-  // at surface between vol[nSeg-1] and vol[nSeg]
-
-  for i in 3:nSeg - 1 loop
-    // at surface between vol[i-1] and vol[i]
-    // QUICK method
-    hOut[i] = 0.5*(h[i] + h[i + 1]) - comSig*0.125*(h[i + 2] + h[i] - 2*h[i + 1])
-       - sig*0.125*(h[i - 1] + h[i + 1] - 2*h[i]);
-    //     hOut[i] = 0.5*(h[i]+h[i+1]); // Central difference method
-  end for;
-
-  for i in 1:nSeg loop
-    // difference between QUICK and UPWIND; index of H_flow is same as hOut
-    Q_flow[i] = m_flow*(hOut[i + 1] - hOut[i]) - (H_flow[i + 1] - H_flow[i]);
-  end for;
-
-  //   Q_flow_upWind = sum(Q_flow[i] for i in 1:nSeg); //Used to test the energy conservation
-
-  for i in 1:nSeg loop
-    // Add the difference back to the volume as heat flow. An under-relaxation is needed to reduce
-    // oscillations caused by high order method
-    heatPort[i].Q_flow = Q_flow[i]*alpha;
+  fluidPort[:].C_outflow = zeros(nSeg + 2, Medium.nC);
+// assign extended enthalpy vectors
+  for i in 1:nSeg + 2 loop
+    h[i] = inStream(fluidPort[i].h_outflow);
+  end for;
+// Value that transitions between 0 and 1 as the flow reverses.
+  sig = Modelica.Fluid.Utilities.regStep(m_flow, 1, 0, m_flow_small);
+// at surface between port_a and vol1
+  comSig = 1 - sig;
+// at surface between port_a and vol1
+  hOut[1] = sig * h[1] + comSig * h[2];
+// at surface between vol[nSeg] and port_b
+  hOut[nSeg + 1] = sig * h[nSeg + 1] + comSig * h[nSeg + 2];
+// Pros: These two equations can further reduce the temperature overshoot by using the upwind
+// Cons: The minimum of nSeg hase to be 4 instead of 2.
+  hOut[2] = sig * h[2] + comSig * h[3];
+// at surface between vol1 and vol2
+  hOut[nSeg] = sig * h[nSeg] + comSig * h[nSeg + 1];
+// at surface between vol[nSeg-1] and vol[nSeg]
+  for i in 3:nSeg - 1 loop
+// at surface between vol[i-1] and vol[i]
+// QUICK method
+    hOut[i] = 0.5 * (h[i] + h[i + 1]) - comSig * 0.125 * (h[i + 2] + h[i] - 2 * h[i + 1]) - sig * 0.125 * (h[i - 1] + h[i + 1] - 2 * h[i]);
+//     hOut[i] = 0.5*(h[i]+h[i+1]); // Central difference method
+  end for;
+  for i in 1:nSeg loop
+// difference between QUICK and UPWIND; index of H_flow is same as hOut
+    Q_flow[i] = m_flow * (hOut[i + 1] - hOut[i]) - (H_flow[i + 1] - H_flow[i]);
+  end for;
+//   Q_flow_upWind = sum(Q_flow[i] for i in 1:nSeg); //Used to test the energy conservation
+  for i in 1:nSeg loop
+// Add the difference back to the volume as heat flow. An under-relaxation is needed to reduce
+// oscillations caused by high order method
+    heatPort[i].Q_flow = Q_flow[i] * alpha;
   end for;
   annotation (Documentation(info="
 
      
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Storage/Examples/ExpansionVessel.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Storage/Examples/ExpansionVessel.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Storage/Examples/ExpansionVessel.mo"	2022-03-10 09:57:39.692144340 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Storage/Examples/ExpansionVessel.mo"	2022-03-10 09:58:07.284147836 +0000
@@ -2,7 +2,7 @@
 model ExpansionVessel "Test model for expansion vessel"
   extends Modelica.Icons.Example;
 
-// package Medium = Modelica.Media.Water.WaterIF97OnePhase_ph "Medium model";
+// package Medium = Modelica.Media.Water.WaterIF97OnePhase_ph "Medium model";
  package Medium = IBPSA.Media.Water "Medium model";
 
   IBPSA.Fluid.Storage.ExpansionVessel expVes(redeclare package Medium =
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Storage/Examples/Stratified.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Storage/Examples/Stratified.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Storage/Examples/Stratified.mo"	2022-03-10 09:57:39.692144340 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Storage/Examples/Stratified.mo"	2022-03-10 09:58:07.276147835 +0000
@@ -65,7 +65,7 @@
     "Pressure boundary condition"
                  annotation (Placement(transformation(extent={{20,60},{40,80}})));
   Modelica.Blocks.Sources.Sine sine(
-    freqHz=1/86400,
+    f =1/86400,
     amplitude=10,
     offset=273.15 + 20) annotation (Placement(transformation(extent={{-90,62},{
             -70,82}})));
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Storage/Examples/StratifiedEnhancedInternalHex.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Storage/Examples/StratifiedEnhancedInternalHex.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Storage/Examples/StratifiedEnhancedInternalHex.mo"	2022-03-10 09:57:39.692144340 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Storage/Examples/StratifiedEnhancedInternalHex.mo"	2022-03-10 09:58:07.252147832 +0000
@@ -6,10 +6,10 @@
   package MediumTan = IBPSA.Media.Water "Medium in the tank";
   package MediumHex = IBPSA.Media.Water "Medium in the heat exchanger";
 
- parameter Modelica.SIunits.PressureDifference dpHex_nominal=2500
+ parameter Modelica.Units.SI.PressureDifference dpHex_nominal=2500
     "Pressure drop across the heat exchanger at nominal conditions";
 
-  parameter Modelica.SIunits.MassFlowRate mHex_flow_nominal = 0.278
+  parameter Modelica.Units.SI.MassFlowRate mHex_flow_nominal = 0.278
     "Mass flow rate of heat exchanger";
 
   IBPSA.Fluid.Sources.Boundary_pT bouWat(redeclare package Medium =
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Storage/Examples/StratifiedUnloadAtMinimumTemperature.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Storage/Examples/StratifiedUnloadAtMinimumTemperature.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Storage/Examples/StratifiedUnloadAtMinimumTemperature.mo"	2022-03-10 09:57:39.692144340 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Storage/Examples/StratifiedUnloadAtMinimumTemperature.mo"	2022-03-10 09:58:07.228147830 +0000
@@ -4,9 +4,9 @@
   extends Modelica.Icons.Example;
   package Medium = IBPSA.Media.Water "Medium model";
 
-  parameter Modelica.SIunits.Volume VTan=3 "Tank volume";
+  parameter Modelica.Units.SI.Volume VTan=3 "Tank volume";
 
-  parameter Modelica.SIunits.MassFlowRate m_flow_nominal = 3*1000/3600
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = 3*1000/3600
     "Nominal mass flow rate";
 
   constant Integer nSeg=5 "Number of volume segments";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Storage/ExpansionVessel.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Storage/ExpansionVessel.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Storage/ExpansionVessel.mo"	2022-03-10 09:57:39.696144342 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Storage/ExpansionVessel.mo"	2022-03-10 09:58:07.192147826 +0000
@@ -4,28 +4,28 @@
     final energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
     final massDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
     final mSenFac=1);
- parameter Modelica.SIunits.Volume V_start(start=1)
+ parameter Modelica.Units.SI.Volume V_start(start=1)
     "Volume of liquid stored in the vessel at the start of the simulation";
- parameter Modelica.SIunits.Pressure p = Medium.p_default
+ parameter Modelica.Units.SI.Pressure p = Medium.p_default
     "Constant pressure of the expansion vessel";
 
   Modelica.Fluid.Interfaces.FluidPort_a port_a(
     redeclare package Medium = Medium) "Fluid port"
     annotation (Placement(transformation(extent={{-10,-110},{10,-90}})));
-  Modelica.SIunits.Mass m "Mass of liquid in the vessel";
+  Modelica.Units.SI.Mass m "Mass of liquid in the vessel";
 
 protected
   final parameter Medium.ThermodynamicState state_start = Medium.setState_pTX(
       T=T_start,
       p=p_start,
       X=X_start[1:Medium.nXi]) "Medium state at start values";
-  final parameter Modelica.SIunits.Density rho_start=Medium.density(
+  final parameter Modelica.Units.SI.Density rho_start=Medium.density(
    state=state_start) "Density, used to compute start and guess values";
 
-  Modelica.SIunits.Energy H "Internal energy of fluid";
-  Modelica.SIunits.Mass[Medium.nXi] mXi
+  Modelica.Units.SI.Energy H "Internal energy of fluid";
+  Modelica.Units.SI.Mass[Medium.nXi] mXi
     "Masses of independent components in the fluid";
-  Modelica.SIunits.Mass[Medium.nC] mC "Masses of trace substances in the fluid";
+  Modelica.Units.SI.Mass[Medium.nC] mC "Masses of trace substances in the fluid";
   Medium.ExtraProperty C[Medium.nC](nominal=C_nominal)
     "Trace substance mixture content";
 
@@ -37,15 +37,15 @@
   mC = m*C_start[1:Medium.nC];
 equation
   assert(m > 1.0E-8,
-    "Expansion vessel is undersized. You need to increase the value of the parameter V_start.");
-  // Conservation equations
-  der(m)   = port_a.m_flow;
+    "Expansion vessel is undersized. You need to increase the value of the parameter V_start.");
+// Conservation equations
+  der(m) = port_a.m_flow;
   der(H)   = port_a.m_flow * actualStream(port_a.h_outflow);
   der(mXi) = port_a.m_flow * actualStream(port_a.Xi_outflow);
-  der(mC)  = port_a.m_flow * actualStream(port_a.C_outflow);
-  // Properties of outgoing flow.
-  // The port pressure is set to a constant value.
-  port_a.p          = p_start;
+  der(mC)  = port_a.m_flow * actualStream(port_a.C_outflow);
+// Properties of outgoing flow.
+// The port pressure is set to a constant value.
+  port_a.p = p_start;
   m*port_a.h_outflow  = H;
   m*port_a.Xi_outflow = mXi;
   m*port_a.C_outflow  = mC;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Storage/StratifiedEnhancedInternalHex.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Storage/StratifiedEnhancedInternalHex.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Storage/StratifiedEnhancedInternalHex.mo"	2022-03-10 09:57:39.696144342 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Storage/StratifiedEnhancedInternalHex.mo"	2022-03-10 09:58:07.128147818 +0000
@@ -7,11 +7,11 @@
       Modelica.Media.Interfaces.PartialMedium "Medium in the heat exchanger"
     annotation(Dialog(tab="General", group="Heat exchanger"));
 
-  parameter Modelica.SIunits.Height hHex_a
+  parameter Modelica.Units.SI.Height hHex_a
     "Height of portHex_a of the heat exchanger, measured from tank bottom"
     annotation(Dialog(tab="General", group="Heat exchanger"));
 
-  parameter Modelica.SIunits.Height hHex_b
+  parameter Modelica.Units.SI.Height hHex_b
     "Height of portHex_b of the heat exchanger, measured from tank bottom"
     annotation(Dialog(tab="General", group="Heat exchanger"));
 
@@ -19,28 +19,28 @@
     "Number of heat exchanger segments in each tank segment"
     annotation(Dialog(tab="General", group="Heat exchanger"));
 
-  parameter Modelica.SIunits.Diameter dExtHex = 0.025
+  parameter Modelica.Units.SI.Diameter dExtHex = 0.025
     "Exterior diameter of the heat exchanger pipe"
     annotation(Dialog(group="Heat exchanger"));
 
-  parameter Modelica.SIunits.HeatFlowRate Q_flow_nominal
+  parameter Modelica.Units.SI.HeatFlowRate Q_flow_nominal
     "Heat transfer at nominal conditions"
     annotation(Dialog(tab="General", group="Heat exchanger"));
-  parameter Modelica.SIunits.Temperature TTan_nominal
+  parameter Modelica.Units.SI.Temperature TTan_nominal
     "Temperature of fluid inside the tank at nominal heat transfer conditions"
     annotation(Dialog(tab="General", group="Heat exchanger"));
-  parameter Modelica.SIunits.Temperature THex_nominal
+  parameter Modelica.Units.SI.Temperature THex_nominal
     "Temperature of fluid inside the heat exchanger at nominal heat transfer conditions"
     annotation(Dialog(tab="General", group="Heat exchanger"));
   parameter Real r_nominal(min=0, max=1)=0.5
     "Ratio between coil inside and outside convective heat transfer at nominal heat transfer conditions"
           annotation(Dialog(tab="General", group="Heat exchanger"));
 
-  parameter Modelica.SIunits.MassFlowRate mHex_flow_nominal
+  parameter Modelica.Units.SI.MassFlowRate mHex_flow_nominal
     "Nominal mass flow rate through the heat exchanger"
     annotation(Dialog(group="Heat exchanger"));
 
-  parameter Modelica.SIunits.PressureDifference dpHex_nominal(displayUnit="Pa") = 2500
+  parameter Modelica.Units.SI.PressureDifference dpHex_nominal(displayUnit="Pa") = 2500
     "Pressure drop across the heat exchanger at nominal conditions"
     annotation(Dialog(group="Heat exchanger"));
 
@@ -71,25 +71,25 @@
     "Formulation of energy balance for heat exchanger solid mass"
     annotation(Evaluate=true, Dialog(tab = "Dynamics heat exchanger", group="Equations"));
 
-  parameter Modelica.SIunits.Length lHex=
+  parameter Modelica.Units.SI.Length lHex=
     rTan*abs(segHex_a-segHex_b)*Modelica.Constants.pi
     "Approximate length of the heat exchanger"
      annotation(Dialog(tab = "Dynamics heat exchanger", group="Equations"));
 
-  parameter Modelica.SIunits.Area ACroHex=
+  parameter Modelica.Units.SI.Area ACroHex=
     (dExtHex^2-(0.8*dExtHex)^2)*Modelica.Constants.pi/4
     "Cross sectional area of the heat exchanger"
     annotation(Dialog(tab = "Dynamics heat exchanger", group="Equations"));
 
-  parameter Modelica.SIunits.SpecificHeatCapacity cHex=490
+  parameter Modelica.Units.SI.SpecificHeatCapacity cHex=490
     "Specific heat capacity of the heat exchanger material"
     annotation(Dialog(tab = "Dynamics heat exchanger", group="Equations"));
 
-  parameter Modelica.SIunits.Density dHex=8000
+  parameter Modelica.Units.SI.Density dHex=8000
     "Density of the heat exchanger material"
     annotation(Dialog(tab = "Dynamics heat exchanger", group="Equations"));
 
-  parameter Modelica.SIunits.HeatCapacity CHex=
+  parameter Modelica.Units.SI.HeatCapacity CHex=
     ACroHex*lHex*dHex*cHex
     "Capacitance of the heat exchanger without the fluid"
     annotation(Dialog(tab = "Dynamics heat exchanger", group="Equations"));
@@ -138,7 +138,7 @@
         rotation=180,
         origin={-87,32})));
 
-  Modelica.SIunits.HeatFlowRate QHex_flow = -sum(indTanHex.port.Q_flow)
+  Modelica.Units.SI.HeatFlowRate QHex_flow = -sum(indTanHex.port.Q_flow)
     "Heat transferred from the heat exchanger to the tank";
 protected
   final parameter Integer segHex_a = nSeg-integer(hHex_a/segHeight)
@@ -149,13 +149,13 @@
     "Tank segment in which port b1 of the heat exchanger is located in"
     annotation(Evaluate=true, Dialog(group="Heat exchanger"));
 
-  final parameter Modelica.SIunits.Height segHeight = hTan/nSeg
+  final parameter Modelica.Units.SI.Height segHeight = hTan/nSeg
     "Height of each tank segment (relative to bottom of same segment)";
 
-  final parameter Modelica.SIunits.Length dHHex = abs(hHex_a-hHex_b)
+  final parameter Modelica.Units.SI.Length dHHex = abs(hHex_a-hHex_b)
     "Vertical distance between the heat exchanger inlet and outlet";
 
-  final parameter Modelica.SIunits.Volume volHexFlu=
+  final parameter Modelica.Units.SI.Volume volHexFlu=
     Modelica.Constants.pi * (0.8*dExtHex)^2/4 *lHex
     "Volume of the heat exchanger";
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Storage/Validation/HeatExchangerDynamics.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Storage/Validation/HeatExchangerDynamics.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Storage/Validation/HeatExchangerDynamics.mo"	2022-03-10 09:57:39.696144342 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Storage/Validation/HeatExchangerDynamics.mo"	2022-03-10 09:58:07.028147805 +0000
@@ -7,9 +7,9 @@
 
   constant Integer nSeg = 7 "Number of segments in tank";
 
-  parameter Modelica.SIunits.HeatFlowRate QHex_flow_nominal = 2000
+  parameter Modelica.Units.SI.HeatFlowRate QHex_flow_nominal = 2000
     "Design heat flow rate of heat exchanger";
-  parameter Modelica.SIunits.MassFlowRate m_flow_nominal= QHex_flow_nominal/4200/4;
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal= QHex_flow_nominal/4200/4;
 
   IBPSA.Fluid.Sources.Boundary_pT watInTan(
     redeclare package Medium = Medium,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Storage/Validation/HeatExchangerLocation.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Storage/Validation/HeatExchangerLocation.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Storage/Validation/HeatExchangerLocation.mo"	2022-03-10 09:57:39.696144342 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Storage/Validation/HeatExchangerLocation.mo"	2022-03-10 09:58:07.000147800 +0000
@@ -5,9 +5,9 @@
 
   package Medium = IBPSA.Media.Water "Medium model";
 
-  parameter Modelica.SIunits.HeatFlowRate QHex_flow_nominal = 6000
+  parameter Modelica.Units.SI.HeatFlowRate QHex_flow_nominal = 6000
     "Design heat flow rate of heat exchanger";
-  parameter Modelica.SIunits.MassFlowRate m_flow_nominal= QHex_flow_nominal/4200/4;
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal= QHex_flow_nominal/4200/4;
 
   IBPSA.Fluid.Sources.Boundary_pT watInTan(
     redeclare package Medium = Medium,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Storage/Validation/StratifiedLoadingUnloading.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Storage/Validation/StratifiedLoadingUnloading.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Storage/Validation/StratifiedLoadingUnloading.mo"	2022-03-10 09:57:39.696144342 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Fluid/Storage/Validation/StratifiedLoadingUnloading.mo"	2022-03-10 09:58:06.968147796 +0000
@@ -5,7 +5,7 @@
  package Medium = IBPSA.Media.Water "Medium model";
  constant Integer nSeg = 7 "Number of segments in tank";
 
- parameter Modelica.SIunits.MassFlowRate m_flow_nominal= 1*1000/3600/4;
+ parameter Modelica.Units.SI.MassFlowRate m_flow_nominal= 1*1000/3600/4;
 
   IBPSA.Fluid.Sources.Boundary_pT sou_1(
     p=300000 + 5000,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Air.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Air.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Air.mo"	2022-03-10 09:57:39.696144342 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Air.mo"	2022-03-10 09:58:06.900147789 +0000
@@ -24,9 +24,10 @@
     "Pressure for which fluid density is defined";
   constant Density dStp = 1.2 "Fluid density at pressure pStp";
 
-  // Redeclare ThermodynamicState to avoid the warning
-  // "Base class ThermodynamicState is replaceable"
-  // during model check
+// Redeclare ThermodynamicState to avoid the warning
+  // "Base class ThermodynamicState is replaceable"
+  // during model check
+
   redeclare record extends ThermodynamicState
     "ThermodynamicState record for moist air"
   end ThermodynamicState;
@@ -51,12 +52,12 @@
     final standardOrderComponents=true) "Base properties"
 
   protected
-    constant Modelica.SIunits.MolarMass[2] MMX = {steam.MM,dryair.MM}
+    constant Modelica.Units.SI.MolarMass[2] MMX = {steam.MM,dryair.MM}
       "Molar masses of components";
 
     MassFraction X_steam "Mass fraction of steam water";
     MassFraction X_air "Mass fraction of air";
-    Modelica.SIunits.TemperatureDifference dT(start=T_default-reference_T)
+    Modelica.Units.SI.TemperatureDifference dT(start=T_default-reference_T)
       "Temperature difference used to compute enthalpy";
   equation
     assert(T >= 200.0 and T <= 423.15, "
@@ -67,24 +68,23 @@
 
     MM = 1/(Xi[Water]/MMX[Water]+(1.0-Xi[Water])/MMX[Air]);
 
-    X_steam  = Xi[Water]; // There is no liquid in this medium model
-    X_air    = 1-Xi[Water];
+    X_steam  = Xi[Water];
+// There is no liquid in this medium model
+      X_air = 1 - Xi[Water];
 
     dT = T - reference_T;
     h = dT*dryair.cp * X_air +
-       (dT * steam.cp + h_fg) * X_steam;
-    R = dryair.R*X_air + steam.R*X_steam;
-
-    // Equation for ideal gas, from h=u+p*v and R*T=p*v, from which follows that  u = h-R*T.
-    // u = h-R*T;
-    // However, in this medium, the gas law is d/dStp=p/pStp, from which follows using h=u+pv that
-    // u= h-p*v = h-p/d = h-pStp/dStp
-    u = h-pStp/dStp;
-
-    // In this medium model, the density depends only
-    // on temperature, but not on pressure.
-    //  d = p/(R*T);
-    d/dStp = p/pStp;
+       (dT * steam.cp + h_fg) * X_steam;
+  R_s = dryair.R * X_air + steam.R * X_steam;
+// Equation for ideal gas, from h=u+p*v and R*T=p*v, from which follows that  u = h-R*T.
+// u = h-R*T;
+// However, in this medium, the gas law is d/dStp=p/pStp, from which follows using h=u+pv that
+// u= h-p*v = h-p/d = h-pStp/dStp
+      u = h - pStp / dStp;
+// In this medium model, the density depends only
+// on temperature, but not on pressure.
+//  d = p/(R*T);
+      d / dStp = p / pStp;
 
     state.p = p;
     state.T = T;
@@ -199,13 +199,14 @@
     "Return ideal gas constant as a function from thermodynamic state, only valid for phi<1"
 
 algorithm
-    R := dryair.R*(1 - state.X[Water]) + steam.R*state.X[Water];
+    R_s := dryair.R*(1 - state.X[Water]) + steam.R*state.X[Water];
   annotation (
     smoothOrder=2,
     Inline=true,
     Documentation(info="
 The ideal gas constant for moist air is computed from thermodynamic state assuming that all water is in the gas phase.
-"));
+"));
+
 end gasConstant;
 
 redeclare function extends pressure
@@ -302,7 +303,8 @@
     "Return the specific entropy, only valid for phi<1"
 
   protected
-    Modelica.SIunits.MoleFraction[2] Y "Molar fraction";
+    Modelica.Units.SI.MoleFraction[2] Y "Molar fraction";
+
 algorithm
     Y := massToMoleFractions(
          state.X, {steam.MM,dryair.MM});
@@ -374,7 +376,8 @@
 First implementation.
 
 
    
-"));
+"));
+
 end specificEntropy;
 
 redeclare function extends density_derp_T
@@ -478,7 +481,7 @@
   output ThermodynamicState state "Thermodynamic state";
 
 algorithm
-    // Note that d/dStp = p/pStp, hence p = d*pStp/dStp
+// Note that d/dStp = p/pStp, hence p = d*pStp/dStp
     state := if size(X, 1) == nX then
                ThermodynamicState(p=d*pStp/dStp, T=T, X=X)
              else
@@ -493,7 +496,8 @@
 The thermodynamic state record
     is computed from density d, temperature T and composition X.
 
    
-"));
+"));
+
 end setState_dTX;
 
 redeclare function extends setState_phX
@@ -531,17 +535,18 @@
 redeclare function extends setState_psX
     "Return the thermodynamic state as function of p, s and composition X or Xi"
   protected
-    Modelica.SIunits.MassFraction[2] X_int=
+    Modelica.Units.SI.MassFraction[2] X_int=
       if size(X, 1) == nX then X else cat(1, X, {1 - sum(X)}) "Mass fraction";
-    Modelica.SIunits.MoleFraction[2] Y "Molar fraction";
-    Modelica.SIunits.Temperature T "Temperature";
-algorithm
+    Modelica.Units.SI.MoleFraction[2] Y "Molar fraction";
+    Modelica.Units.SI.Temperature T "Temperature";
+
+  algorithm
    Y := massToMoleFractions(
          X_int, {steam.MM,dryair.MM});
-    // The next line is obtained from symbolic solving the
-    // specificEntropy function for T.
-    // In this formulation, we can set T to any value when calling
-    // specificHeatCapacityCp as cp does not depend on T.
+// The next line is obtained from symbolic solving the
+// specificEntropy function for T.
+// In this formulation, we can set T to any value when calling
+// specificHeatCapacityCp as cp does not depend on T.
     T := 273.15 * Modelica.Math.exp((s + Modelica.Constants.R *
            sum(X_int[i]/MMX[i]*
              Modelica.Math.log(max(Y[i], Modelica.Constants.eps)) for i in 1:2))
@@ -573,7 +578,8 @@
 First implementation.
 
    • 
 

-"));
+"));
+
 end setState_psX;
 
 redeclare replaceable function extends specificEnthalpy
@@ -588,10 +594,10 @@
 
 redeclare replaceable function specificEnthalpy_pTX "Specific enthalpy"
   extends Modelica.Icons.Function;
-  input Modelica.SIunits.Pressure p "Pressure";
-  input Modelica.SIunits.Temperature T "Temperature";
-  input Modelica.SIunits.MassFraction X[:] "Mass fractions of moist air";
-  output Modelica.SIunits.SpecificEnthalpy h "Specific enthalpy at p, T, X";
+  input Modelica.Units.SI.Pressure p "Pressure";
+  input Modelica.Units.SI.Temperature T "Temperature";
+  input Modelica.Units.SI.MassFraction X[:] "Mass fractions of moist air";
+  output Modelica.Units.SI.SpecificEnthalpy h "Specific enthalpy at p, T, X";
 
 algorithm
   h := specificEnthalpy(setState_pTX(p, T, X));
@@ -612,7 +618,8 @@
 issue 227.
 
 
-"));
+"));
+
 end specificEnthalpy_pTX;
 
 redeclare replaceable function extends specificGibbsEnergy
@@ -731,28 +738,29 @@
 redeclare function extends thermalConductivity
     "Thermal conductivity of dry air as a polynomial in the temperature"
 algorithm
-  lambda := Modelica.Media.Incompressible.TableBased.Polynomials_Temp.evaluate(
-      {(-4.8737307422969E-008), 7.67803133753502E-005, 0.0241814385504202},
-   Modelica.SIunits.Conversions.to_degC(state.T));
-annotation(LateInline=true);
+  lambda := Modelica.Math.Polynomials.evaluate({-4.8737307422969E-008, 7.67803133753502E-005, 0.0241814385504202}, Modelica.Units.Conversions.to_degC(state.T));
+
+annotation(LateInline=true);
+
 end thermalConductivity;
-//////////////////////////////////////////////////////////////////////
-// Protected classes.
-// These classes are only of use within this medium model.
-// Models generally have no need to access them.
-// Therefore, they are made protected. This also allows to redeclare the
-// medium model with another medium model that does not provide an
-// implementation of these classes.
+
+  //////////////////////////////////////////////////////////////////////
+  // Protected classes.
+  // These classes are only of use within this medium model.
+  // Models generally have no need to access them.
+  // Therefore, they are made protected. This also allows to redeclare the
+  // medium model with another medium model that does not provide an
+  // implementation of these classes.
 protected
   record GasProperties
     "Coefficient data record for properties of perfect gases"
     extends Modelica.Icons.Record;
 
-    Modelica.SIunits.MolarMass MM "Molar mass";
-    Modelica.SIunits.SpecificHeatCapacity R "Gas constant";
-    Modelica.SIunits.SpecificHeatCapacity cp
+    Modelica.Units.SI.MolarMass MM "Molar mass";
+    Modelica.Units.SI.SpecificHeatCapacity R "Gas constant";
+    Modelica.Units.SI.SpecificHeatCapacity cp
       "Specific heat capacity at constant pressure";
-    Modelica.SIunits.SpecificHeatCapacity cv = cp-R
+    Modelica.Units.SI.SpecificHeatCapacity cv = cp-R
       "Specific heat capacity at constant volume";
     annotation (
       preferredView="info",
@@ -778,28 +786,28 @@
   // In the assignments below, we compute cv as OpenModelica
   // cannot evaluate cv=cp-R as defined in GasProperties.
   constant GasProperties dryair(
-    R =    Modelica.Media.IdealGases.Common.SingleGasesData.Air.R,
+    R =    Modelica.Media.IdealGases.Common.SingleGasesData.Air.R_s,
     MM =   Modelica.Media.IdealGases.Common.SingleGasesData.Air.MM,
     cp=IBPSA.Utilities.Psychrometrics.Constants.cpAir,
     cv=IBPSA.Utilities.Psychrometrics.Constants.cpAir
-             -Modelica.Media.IdealGases.Common.SingleGasesData.Air.R)
+             - Modelica.Media.IdealGases.Common.SingleGasesData.Air.R_s)
     "Dry air properties";
   constant GasProperties steam(
-    R =    Modelica.Media.IdealGases.Common.SingleGasesData.H2O.R,
+    R =    Modelica.Media.IdealGases.Common.SingleGasesData.H2O.R_s,
     MM =   Modelica.Media.IdealGases.Common.SingleGasesData.H2O.MM,
     cp=IBPSA.Utilities.Psychrometrics.Constants.cpSte,
     cv=IBPSA.Utilities.Psychrometrics.Constants.cpSte
-             -Modelica.Media.IdealGases.Common.SingleGasesData.H2O.R)
+             - Modelica.Media.IdealGases.Common.SingleGasesData.H2O.R_s)
     "Steam properties";
 
   constant Real k_mair =  steam.MM/dryair.MM "Ratio of molar weights";
 
-  constant Modelica.SIunits.MolarMass[2] MMX={steam.MM,dryair.MM}
+  constant Modelica.Units.SI.MolarMass[2] MMX={steam.MM,dryair.MM}
     "Molar masses of components";
 
-  constant Modelica.SIunits.SpecificEnergy h_fg=IBPSA.Utilities.Psychrometrics.Constants.h_fg
+  constant Modelica.Units.SI.SpecificEnergy h_fg=IBPSA.Utilities.Psychrometrics.Constants.h_fg
     "Latent heat of evaporation of water";
-  constant Modelica.SIunits.SpecificHeatCapacity cpWatLiq=IBPSA.Utilities.Psychrometrics.Constants.cpWatLiq
+  constant Modelica.Units.SI.SpecificHeatCapacity cpWatLiq=IBPSA.Utilities.Psychrometrics.Constants.cpWatLiq
     "Specific heat capacity of liquid water";
 
 replaceable function der_enthalpyOfLiquid
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Antifreeze/BaseClasses/PropertyCoefficients.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Antifreeze/BaseClasses/PropertyCoefficients.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Antifreeze/BaseClasses/PropertyCoefficients.mo"	2022-03-10 09:57:39.696144342 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Antifreeze/BaseClasses/PropertyCoefficients.mo"	2022-03-10 09:58:06.796147775 +0000
@@ -3,8 +3,8 @@
   "Polynomial coefficients to evaluate fluid properties"
   extends Modelica.Icons.Record;
 
-  Modelica.SIunits.MassFraction X_a_ref "Reference mass fraction";
-  Modelica.SIunits.Temperature T_ref "Reference temperature";
+  Modelica.Units.SI.MassFraction X_a_ref "Reference mass fraction";
+  Modelica.Units.SI.Temperature T_ref "Reference temperature";
   Integer nX_a "Order of polynomial in x";
   Integer nT[nX_a] "Order of polynomial in y";
   Integer nTot "Total number of coefficients";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Antifreeze/PropyleneGlycolWater.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Antifreeze/PropyleneGlycolWater.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Antifreeze/PropyleneGlycolWater.mo"	2022-03-10 09:57:39.696144342 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Antifreeze/PropyleneGlycolWater.mo"	2022-03-10 09:58:06.792147775 +0000
@@ -12,7 +12,7 @@
     final lambda_const=thermalConductivity_TX_a(T = property_T, X_a = X_a),
     a_const=1484,
     final T_min=fusionTemperature_TX_a(T = property_T, X_a = X_a),
-    T_max=Modelica.SIunits.Conversions.from_degC(100),
+    T_max=Modelica.Units.Conversions.from_degC(100),
     T0=273.15,
     MM_const=(X_a/simplePropyleneGlycolWaterConstants[1].molarMass + (1
          - X_a)/0.018015268)^(-1),
@@ -25,9 +25,9 @@
     Temperature(start=T_default),
     Density(start=d_const));
 
-  constant Modelica.SIunits.Temperature property_T
+  constant Modelica.Units.SI.Temperature property_T
     "Temperature for evaluation of constant fluid properties";
-  constant Modelica.SIunits.MassFraction X_a
+  constant Modelica.Units.SI.MassFraction X_a
     "Mass fraction of propylene glycol in water";
 
   redeclare model BaseProperties "Base properties"
@@ -39,14 +39,14 @@
     InputMassFraction[nXi] Xi=fill(0, 0)
       "Structurally independent mass fractions";
     InputSpecificEnthalpy h "Specific enthalpy of medium";
-    Modelica.SIunits.SpecificInternalEnergy u
+    Modelica.Units.SI.SpecificInternalEnergy u
       "Specific internal energy of medium";
-    Modelica.SIunits.Density d=d_const "Density of medium";
-    Modelica.SIunits.MassFraction[nX] X={1}
+    Modelica.Units.SI.Density d=d_const "Density of medium";
+    Modelica.Units.SI.MassFraction[nX] X={1}
       "Mass fractions (= (component mass)/total mass  m_i/m)";
-    final Modelica.SIunits.SpecificHeatCapacity R=0
+    final Modelica.Units.SI.SpecificHeatCapacity R=0
       "Gas constant (of mixture if applicable)";
-    final Modelica.SIunits.MolarMass MM=MM_const
+    final Modelica.Units.SI.MolarMass MM=MM_const
       "Molar mass (of mixture or single fluid)";
     ThermodynamicState state
       "Thermodynamic state record for optional functions";
@@ -55,21 +55,21 @@
       annotation(Evaluate=true, Dialog(tab="Advanced"));
     final parameter Boolean standardOrderComponents=true
       "If true, and reducedX = true, the last element of X will be computed from the other ones";
-    Modelica.SIunits.Conversions.NonSIunits.Temperature_degC T_degC=
-        Modelica.SIunits.Conversions.to_degC(T)
+
+    Modelica.Units.NonSI.Temperature_degC T_degC=
+        Modelica.Units.Conversions.to_degC(T)
       "Temperature of medium in [degC]";
-    Modelica.SIunits.Conversions.NonSIunits.Pressure_bar p_bar=
-        Modelica.SIunits.Conversions.to_bar(p)
+    Modelica.Units.NonSI.Pressure_bar p_bar=
+        Modelica.Units.Conversions.to_bar(p)
       "Absolute pressure of medium in [bar]";
 
     // Local connector definition, used for equation balancing check
-    connector InputAbsolutePressure = input Modelica.SIunits.AbsolutePressure
+    connector InputAbsolutePressure = input Modelica.Units.SI.AbsolutePressure
       "Pressure as input signal connector";
-    connector InputSpecificEnthalpy = input Modelica.SIunits.SpecificEnthalpy
+    connector InputSpecificEnthalpy = input Modelica.Units.SI.SpecificEnthalpy
       "Specific enthalpy as input signal connector";
-    connector InputMassFraction = input Modelica.SIunits.MassFraction
+    connector InputMassFraction = input Modelica.Units.SI.MassFraction
       "Mass fraction as input signal connector";
-
   equation
     assert(T >= T_min and T <= T_max, "
 Temperature T (= " + String(T) + " K) is not
@@ -101,12 +101,12 @@
 "));
   end BaseProperties;
 protected
-  constant Modelica.SIunits.MassFraction X_a_min=0.
+  constant Modelica.Units.SI.MassFraction X_a_min=0.
     "Minimum allowed mass fraction of propylene glycol in water";
-  constant Modelica.SIunits.MassFraction X_a_max=0.6
+  constant Modelica.Units.SI.MassFraction X_a_max=0.6
     "Maximum allowed mass fraction of propylene glycol in water";
 
-  // Fluid constants based on pure Propylene Glycol
+// Fluid constants based on pure Propylene Glycol
   constant Modelica.Media.Interfaces.Types.Basic.FluidConstants[1]
     simplePropyleneGlycolWaterConstants(
     each chemicalFormula="C3H8O2",
@@ -118,7 +118,7 @@
   // Coefficients for evaluation of physical properties
   constant IBPSA.Media.Antifreeze.BaseClasses.PropertyCoefficients proCoe(
     X_a_ref=0.307031,
-    T_ref=Modelica.SIunits.Conversions.from_degC(32.7083),
+    T_ref=Modelica.Units.Conversions.from_degC(32.7083),
     nX_a=6,
     nT={4,4,4,3,2,1},
     nTot=18,
@@ -142,9 +142,9 @@
   replaceable function density_TX_a
     "Evaluate density of antifreeze-water mixture"
     extends Modelica.Icons.Function;
-    input Modelica.SIunits.Temperature T "Temperature of antifreeze-water mixture";
-    input Modelica.SIunits.MassFraction X_a "Mass fraction of antifreeze";
-    output Modelica.SIunits.Density d "Density of antifreeze-water mixture";
+    input Modelica.Units.SI.Temperature T "Temperature of antifreeze-water mixture";
+    input Modelica.Units.SI.MassFraction X_a "Mass fraction of antifreeze";
+    output Modelica.Units.SI.Density d "Density of antifreeze-water mixture";
   algorithm
     d :=polynomialProperty(
         X_a,
@@ -180,9 +180,9 @@
   replaceable function dynamicViscosity_TX_a
     "Evaluate dynamic viscosity of antifreeze-water mixture"
       extends Modelica.Icons.Function;
-    input Modelica.SIunits.Temperature T "Temperature of antifreeze-water mixture";
-    input Modelica.SIunits.MassFraction X_a "Mass fraction of antifreeze";
-    output Modelica.SIunits.DynamicViscosity eta "Dynamic Viscosity of antifreeze-water mixture";
+    input Modelica.Units.SI.Temperature T "Temperature of antifreeze-water mixture";
+    input Modelica.Units.SI.MassFraction X_a "Mass fraction of antifreeze";
+    output Modelica.Units.SI.DynamicViscosity eta "Dynamic Viscosity of antifreeze-water mixture";
   algorithm
     eta :=1e-3*exp(polynomialProperty(
         X_a,
@@ -217,11 +217,11 @@
   replaceable function fusionTemperature_TX_a
     "Evaluate temperature of fusion of antifreeze-water mixture"
       extends Modelica.Icons.Function;
-    input Modelica.SIunits.Temperature T "Temperature of antifreeze-water mixture";
-    input Modelica.SIunits.MassFraction X_a "Mass fraction of antifreeze";
-    output Modelica.SIunits.Temperature Tf "Temperature of fusion of antifreeze-water mixture";
+    input Modelica.Units.SI.Temperature T "Temperature of antifreeze-water mixture";
+    input Modelica.Units.SI.MassFraction X_a "Mass fraction of antifreeze";
+    output Modelica.Units.SI.Temperature Tf "Temperature of fusion of antifreeze-water mixture";
   algorithm
-    Tf :=Modelica.SIunits.Conversions.from_degC(polynomialProperty(
+    Tf :=Modelica.Units.Conversions.from_degC(polynomialProperty(
         X_a,
         T,
         proCoe.a_Tf));
@@ -319,9 +319,9 @@
   replaceable function specificHeatCapacityCp_TX_a
     "Evaluate specific heat capacity of antifreeze-water mixture"
       extends Modelica.Icons.Function;
-    input Modelica.SIunits.Temperature T "Temperature of antifreeze-water mixture";
-    input Modelica.SIunits.MassFraction X_a "Mass fraction of antifreeze";
-    output Modelica.SIunits.SpecificHeatCapacity cp "Specific heat capacity of antifreeze-water mixture";
+    input Modelica.Units.SI.Temperature T "Temperature of antifreeze-water mixture";
+    input Modelica.Units.SI.MassFraction X_a "Mass fraction of antifreeze";
+    output Modelica.Units.SI.SpecificHeatCapacity cp "Specific heat capacity of antifreeze-water mixture";
   algorithm
     cp :=polynomialProperty(
         X_a,
@@ -356,9 +356,9 @@
   replaceable function thermalConductivity_TX_a
     "Evaluate thermal conductivity of antifreeze-water mixture"
       extends Modelica.Icons.Function;
-    input Modelica.SIunits.Temperature T "Temperature of antifreeze-water mixture";
-    input Modelica.SIunits.MassFraction X_a "Mass fraction of antifreeze";
-    output Modelica.SIunits.ThermalConductivity lambda "Thermal conductivity of antifreeze-water mixture";
+    input Modelica.Units.SI.Temperature T "Temperature of antifreeze-water mixture";
+    input Modelica.Units.SI.MassFraction X_a "Mass fraction of antifreeze";
+    output Modelica.Units.SI.ThermalConductivity lambda "Thermal conductivity of antifreeze-water mixture";
   algorithm
     lambda :=polynomialProperty(
         X_a,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Antifreeze/Validation/BaseClasses/FluidProperties.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Antifreeze/Validation/BaseClasses/FluidProperties.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Antifreeze/Validation/BaseClasses/FluidProperties.mo"	2022-03-10 09:57:39.696144342 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Antifreeze/Validation/BaseClasses/FluidProperties.mo"	2022-03-10 09:58:06.728147766 +0000
@@ -8,30 +8,30 @@
 
   parameter Integer nX_a
     "Number of mass fractions to evaluate fluid properties";
-  parameter Modelica.SIunits.MassFraction X_a[nX_a] "Mass fraction of additive";
-  parameter Modelica.SIunits.Temperature T_min
+  parameter Modelica.Units.SI.MassFraction X_a[nX_a] "Mass fraction of additive";
+  parameter Modelica.Units.SI.Temperature T_min
     "Minimum temperature of mixture";
-  parameter Modelica.SIunits.Temperature T_max
+  parameter Modelica.Units.SI.Temperature T_max
     "Maximum temperature of mixture";
-  parameter Modelica.SIunits.Temperature reference_T = 293.15
+  parameter Modelica.Units.SI.Temperature reference_T = 293.15
     "Reference temperature";
-  Modelica.SIunits.Temperature Tf[nX_a] "Fluid temperature";
-  Modelica.SIunits.Density d[nX_a] "Density of fluid mixture";
-  Modelica.SIunits.SpecificHeatCapacity cp[nX_a] "Specific heat capacity of fluid mixture";
-  Modelica.SIunits.ThermalConductivity lambda[nX_a] "Density of fluid mixture";
-  Modelica.SIunits.DynamicViscosity eta[nX_a] "Dynamic viscosity of fluid mixture";
-  Modelica.SIunits.Temperature T "Temperature of fluid mixture";
-  Modelica.SIunits.Conversions.NonSIunits.Temperature_degC T_degC "Celsius temperature";
+  Modelica.Units.SI.Temperature Tf[nX_a] "Fluid temperature";
+  Modelica.Units.SI.Density d[nX_a] "Density of fluid mixture";
+  Modelica.Units.SI.SpecificHeatCapacity cp[nX_a] "Specific heat capacity of fluid mixture";
+  Modelica.Units.SI.ThermalConductivity lambda[nX_a] "Density of fluid mixture";
+  Modelica.Units.SI.DynamicViscosity eta[nX_a] "Dynamic viscosity of fluid mixture";
+  Modelica.Units.SI.Temperature T "Temperature of fluid mixture";
+  Modelica.Units.NonSI.Temperature_degC T_degC "Celsius temperature";
 
 protected
-  parameter Modelica.SIunits.Time dt = 1
+  parameter Modelica.Units.SI.Time dt = 1
     "Simulation length";
   parameter Real convT(unit="K/s") = (T_max-T_min)/dt
     "Rate of temperature change";
 
 equation
   T = T_min + convT*time;
-  T_degC = Modelica.SIunits.Conversions.to_degC(T);
+  T_degC = Modelica.Units.Conversions.to_degC(T);
   for i in 1:nX_a loop
     Tf[i] =Medium.testFusionTemperature_TX_a(T=T, X_a=X_a[i]);
     d[i] =if T >= Tf[i] then Medium.testDensity_TX_a(T=T, X_a=X_a[i]) else 0.;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Antifreeze/Validation/BaseClasses/PropyleneGlycolWater.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Antifreeze/Validation/BaseClasses/PropyleneGlycolWater.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Antifreeze/Validation/BaseClasses/PropyleneGlycolWater.mo"	2022-03-10 09:57:39.696144342 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Antifreeze/Validation/BaseClasses/PropyleneGlycolWater.mo"	2022-03-10 09:58:06.708147763 +0000
@@ -6,9 +6,9 @@
     replaceable function testDensity_TX_a
     "Evaluate density of antifreeze-water mixture"
     extends Modelica.Icons.Function;
-    input Modelica.SIunits.Temperature T "Temperature of antifreeze-water mixture";
-    input Modelica.SIunits.MassFraction X_a "Mass fraction of antifreeze";
-    output Modelica.SIunits.Density d "Density of antifreeze-water mixture";
+    input Modelica.Units.SI.Temperature T "Temperature of antifreeze-water mixture";
+    input Modelica.Units.SI.MassFraction X_a "Mass fraction of antifreeze";
+    output Modelica.Units.SI.Density d "Density of antifreeze-water mixture";
     algorithm
     d := density_TX_a(T = T, X_a = X_a);
 
@@ -34,9 +34,9 @@
   function testDynamicViscosity_TX_a
     "Evaluate dynamic viscosity of antifreeze-water mixture"
       extends Modelica.Icons.Function;
-    input Modelica.SIunits.Temperature T "Temperature of antifreeze-water mixture";
-    input Modelica.SIunits.MassFraction X_a "Mass fraction of antifreeze";
-    output Modelica.SIunits.DynamicViscosity eta "Dynamic Viscosity of antifreeze-water mixture";
+    input Modelica.Units.SI.Temperature T "Temperature of antifreeze-water mixture";
+    input Modelica.Units.SI.MassFraction X_a "Mass fraction of antifreeze";
+    output Modelica.Units.SI.DynamicViscosity eta "Dynamic Viscosity of antifreeze-water mixture";
   algorithm
     eta := dynamicViscosity_TX_a(T = T, X_a = X_a);
 
@@ -62,9 +62,9 @@
   function testFusionTemperature_TX_a
     "Evaluate temperature of fusion of antifreeze-water mixture"
       extends Modelica.Icons.Function;
-    input Modelica.SIunits.Temperature T "Temperature of antifreeze-water mixture";
-    input Modelica.SIunits.MassFraction X_a "Mass fraction of antifreeze";
-    output Modelica.SIunits.Temperature Tf "Temperature of fusion of antifreeze-water mixture";
+    input Modelica.Units.SI.Temperature T "Temperature of antifreeze-water mixture";
+    input Modelica.Units.SI.MassFraction X_a "Mass fraction of antifreeze";
+    output Modelica.Units.SI.Temperature Tf "Temperature of fusion of antifreeze-water mixture";
   algorithm
     Tf := fusionTemperature_TX_a(T = T, X_a = X_a);
 
@@ -90,9 +90,9 @@
   function testSpecificHeatCapacityCp_TX_a
     "Evaluate specific heat capacity of antifreeze-water mixture"
       extends Modelica.Icons.Function;
-    input Modelica.SIunits.Temperature T "Temperature of antifreeze-water mixture";
-    input Modelica.SIunits.MassFraction X_a "Mass fraction of antifreeze";
-    output Modelica.SIunits.SpecificHeatCapacity cp "Specific heat capacity of antifreeze-water mixture";
+    input Modelica.Units.SI.Temperature T "Temperature of antifreeze-water mixture";
+    input Modelica.Units.SI.MassFraction X_a "Mass fraction of antifreeze";
+    output Modelica.Units.SI.SpecificHeatCapacity cp "Specific heat capacity of antifreeze-water mixture";
   algorithm
     cp := specificHeatCapacityCp_TX_a(T = T, X_a = X_a);
 
@@ -118,9 +118,9 @@
   function testThermalConductivity_TX_a
     "Evaluate thermal conductivity of antifreeze-water mixture"
       extends Modelica.Icons.Function;
-    input Modelica.SIunits.Temperature T "Temperature of antifreeze-water mixture";
-    input Modelica.SIunits.MassFraction X_a "Mass fraction of antifreeze";
-    output Modelica.SIunits.ThermalConductivity lambda "Thermal conductivity of antifreeze-water mixture";
+    input Modelica.Units.SI.Temperature T "Temperature of antifreeze-water mixture";
+    input Modelica.Units.SI.MassFraction X_a "Mass fraction of antifreeze";
+    output Modelica.Units.SI.ThermalConductivity lambda "Thermal conductivity of antifreeze-water mixture";
   algorithm
     lambda := thermalConductivity_TX_a(T = T, X_a = X_a);
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Examples/AirDerivativeCheck.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Examples/AirDerivativeCheck.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Examples/AirDerivativeCheck.mo"	2022-03-10 09:57:39.696144342 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Examples/AirDerivativeCheck.mo"	2022-03-10 09:58:06.560147746 +0000
@@ -3,19 +3,19 @@
   extends Modelica.Icons.Example;
 
    package Medium = IBPSA.Media.Air;
-    Modelica.SIunits.Temperature T "Temperature";
-    Modelica.SIunits.MassFraction X[1] "Water vapor mass fraction";
+    Modelica.Units.SI.Temperature T "Temperature";
+    Modelica.Units.SI.MassFraction X[1] "Water vapor mass fraction";
 
-    Modelica.SIunits.SpecificEnthalpy hLiqSym "Liquid phase enthalpy";
-    Modelica.SIunits.SpecificEnthalpy hLiqCod "Liquid phase enthalpy";
-    Modelica.SIunits.SpecificEnthalpy hSteSym "Water vapor enthalpy";
-    Modelica.SIunits.SpecificEnthalpy hSteCod "Water vapor enthalpy";
-    Modelica.SIunits.SpecificEnthalpy hAirSym "Dry air enthalpy";
-    Modelica.SIunits.SpecificEnthalpy hAirCod "Dry air enthalpy";
-    Modelica.SIunits.SpecificHeatCapacity cpSym "Specific heat capacity";
-    Modelica.SIunits.SpecificHeatCapacity cpCod "Specific heat capacity";
-    Modelica.SIunits.SpecificHeatCapacity cvSym "Specific heat capacity";
-    Modelica.SIunits.SpecificHeatCapacity cvCod "Specific heat capacity";
+    Modelica.Units.SI.SpecificEnthalpy hLiqSym "Liquid phase enthalpy";
+    Modelica.Units.SI.SpecificEnthalpy hLiqCod "Liquid phase enthalpy";
+    Modelica.Units.SI.SpecificEnthalpy hSteSym "Water vapor enthalpy";
+    Modelica.Units.SI.SpecificEnthalpy hSteCod "Water vapor enthalpy";
+    Modelica.Units.SI.SpecificEnthalpy hAirSym "Dry air enthalpy";
+    Modelica.Units.SI.SpecificEnthalpy hAirCod "Dry air enthalpy";
+    Modelica.Units.SI.SpecificHeatCapacity cpSym "Specific heat capacity";
+    Modelica.Units.SI.SpecificHeatCapacity cpCod "Specific heat capacity";
+    Modelica.Units.SI.SpecificHeatCapacity cvSym "Specific heat capacity";
+    Modelica.Units.SI.SpecificHeatCapacity cvCod "Specific heat capacity";
     constant Real convT(unit="K/s3") = 270
     "Conversion factor to satisfy unit check";
     constant Real convX(unit="1/s3") = 0.01
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Examples/AirProperties.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Examples/AirProperties.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Examples/AirProperties.mo"	2022-03-10 09:57:39.696144342 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Examples/AirProperties.mo"	2022-03-10 09:58:06.544147743 +0000
@@ -7,10 +7,10 @@
     TMin=273.15 - 30,
     TMax=273.15 + 60);
 
-  Modelica.SIunits.SpecificEnthalpy hLiq "Specific enthalpy of liquid";
+  Modelica.Units.SI.SpecificEnthalpy hLiq "Specific enthalpy of liquid";
 
 equation
-  // Check the implementation of the base properties
+// Check the implementation of the base properties
   basPro.state.p=p;
   basPro.state.T=T;
   basPro.state.X[1]=X[1];
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Examples/BaseClasses/FluidProperties.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Examples/BaseClasses/FluidProperties.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Examples/BaseClasses/FluidProperties.mo"	2022-03-10 09:57:39.696144342 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Examples/BaseClasses/FluidProperties.mo"	2022-03-10 09:58:06.508147739 +0000
@@ -5,49 +5,49 @@
   replaceable package Medium =
       Modelica.Media.Interfaces.PartialMedium;
 
-  parameter Modelica.SIunits.Temperature TMin
+  parameter Modelica.Units.SI.Temperature TMin
     "Minimum temperature for the simulation";
-  parameter Modelica.SIunits.Temperature TMax
+  parameter Modelica.Units.SI.Temperature TMax
     "Maximum temperature for the simulation";
-  parameter Modelica.SIunits.Pressure p = Medium.p_default "Pressure";
-  parameter Modelica.SIunits.MassFraction X[Medium.nX]=
+  parameter Modelica.Units.SI.Pressure p = Medium.p_default "Pressure";
+  parameter Modelica.Units.SI.MassFraction X[Medium.nX]=
     Medium.X_default "Mass fraction";
   Medium.Temperature T "Temperature";
-  Modelica.SIunits.Conversions.NonSIunits.Temperature_degC T_degC
+  Modelica.Units.NonSI.Temperature_degC T_degC
     "Celsius temperature";
 
   Medium.ThermodynamicState state_pTX "Medium state";
   Medium.ThermodynamicState state_phX "Medium state";
   Medium.ThermodynamicState state_psX "Medium state";
 
-  Modelica.SIunits.Density d "Density";
-  Modelica.SIunits.DynamicViscosity eta "Dynamic viscosity";
-  Modelica.SIunits.SpecificEnthalpy h "Specific enthalpy";
-  Modelica.SIunits.SpecificInternalEnergy u "Specific internal energy";
-  Modelica.SIunits.SpecificEntropy s "Specific entropy";
-  Modelica.SIunits.SpecificEnergy g "Specific Gibbs energy";
-  Modelica.SIunits.SpecificEnergy f "Specific Helmholtz energy";
+  Modelica.Units.SI.Density d "Density";
+  Modelica.Units.SI.DynamicViscosity eta "Dynamic viscosity";
+  Modelica.Units.SI.SpecificEnthalpy h "Specific enthalpy";
+  Modelica.Units.SI.SpecificInternalEnergy u "Specific internal energy";
+  Modelica.Units.SI.SpecificEntropy s "Specific entropy";
+  Modelica.Units.SI.SpecificEnergy g "Specific Gibbs energy";
+  Modelica.Units.SI.SpecificEnergy f "Specific Helmholtz energy";
 
-  Modelica.SIunits.SpecificEnthalpy hIse "Isentropic enthalpy";
+  Modelica.Units.SI.SpecificEnthalpy hIse "Isentropic enthalpy";
 
   Modelica.Media.Interfaces.Types.IsobaricExpansionCoefficient beta
     "Isobaric expansion coefficient";
-  Modelica.SIunits.IsothermalCompressibility kappa "Isothermal compressibility";
+  Modelica.Units.SI.IsothermalCompressibility kappa "Isothermal compressibility";
 
   Modelica.Media.Interfaces.Types.DerDensityByPressure ddpT
     "Density derivative w.r.t. pressure";
   Modelica.Media.Interfaces.Types.DerDensityByTemperature ddTp
     "Density derivative w.r.t. temperature";
-  Modelica.SIunits.Density[Medium.nX] dddX
+  Modelica.Units.SI.Density[Medium.nX] dddX
     "Density derivative w.r.t. mass fraction";
 
-  Modelica.SIunits.SpecificHeatCapacity cp "Specific heat capacity";
-  Modelica.SIunits.SpecificHeatCapacity cv "Specific heat capacity";
-  Modelica.SIunits.ThermalConductivity lambda "Thermal conductivity";
+  Modelica.Units.SI.SpecificHeatCapacity cp "Specific heat capacity";
+  Modelica.Units.SI.SpecificHeatCapacity cv "Specific heat capacity";
+  Modelica.Units.SI.ThermalConductivity lambda "Thermal conductivity";
 
-  Modelica.SIunits.AbsolutePressure pMed "Pressure";
+  Modelica.Units.SI.AbsolutePressure pMed "Pressure";
   Medium.Temperature TMed "Temperature";
-  Modelica.SIunits.MolarMass MM "Mixture molar mass";
+  Modelica.Units.SI.MolarMass MM "Mixture molar mass";
 
   Medium.BaseProperties basPro "Medium base properties";
 protected
@@ -64,20 +64,18 @@
     assert(abs(Medium.pressure(state1)-Medium.pressure(state2))
        < 1e-8, "Error in pressure of " + message);
   end checkState;
-equation
-    // Compute temperatures that are used as input to the functions
-    T = TMin + conv*time * (TMax-TMin);
-    T_degC = Modelica.SIunits.Conversions.to_degC(T);
-
-    // Check setting the states
-    state_pTX = Medium.setState_pTX(p=p, T=T, X=X);
+equation
+// Compute temperatures that are used as input to the functions
+  T = TMin + conv * time * (TMax - TMin);
+  T_degC = Modelica.Units.Conversions.to_degC(T);
+// Check setting the states
+  state_pTX = Medium.setState_pTX(p = p, T = T, X = X);
     state_phX = Medium.setState_phX(p=p, h=h, X=X);
     state_psX = Medium.setState_psX(p=p, s=s, X=X);
     checkState(state_pTX, state_phX, "state_phX");
-    checkState(state_pTX, state_psX, "state_psX");
-
-    // Check the implementation of the functions
-    d = Medium.density(state_pTX);
+    checkState(state_pTX, state_psX, "state_psX");
+// Check the implementation of the functions
+  d = Medium.density(state_pTX);
     eta = Medium.dynamicViscosity(state_pTX);
     h = Medium.specificEnthalpy(state_pTX);
 
@@ -100,9 +98,9 @@
     assert(abs(p-pMed) < 1e-8, "Error in pressure computation.");
     TMed = Medium.temperature(state_pTX);
     assert(abs(T-TMed) < 1e-8, "Error in temperature computation.");
-    MM = Medium.molarMass(state_pTX);
-    // Check the implementation of the base properties
-    assert(abs(h-basPro.h) < 1e-8, "Error in enthalpy computation in BaseProperties.");
+    MM = Medium.molarMass(state_pTX);
+// Check the implementation of the base properties
+  assert(abs(h - basPro.h) < 1e-8, "Error in enthalpy computation in BaseProperties.");
     assert(abs(u-basPro.u) < 1e-8, "Error in internal energy computation in BaseProperties.");
 
    annotation (
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Examples/BaseClasses/TestTemperatureEnthalpyInversion.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Examples/BaseClasses/TestTemperatureEnthalpyInversion.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Examples/BaseClasses/TestTemperatureEnthalpyInversion.mo"	2022-03-10 09:57:39.696144342 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Examples/BaseClasses/TestTemperatureEnthalpyInversion.mo"	2022-03-10 09:58:06.488147735 +0000
@@ -3,9 +3,9 @@
   "Model to check computation of h(T) and its inverse"
    replaceable package Medium =
         Modelica.Media.Interfaces.PartialMedium;
-     parameter Modelica.SIunits.Temperature T0=273.15+20 "Temperature";
-     Modelica.SIunits.Temperature T "Temperature";
-     Modelica.SIunits.SpecificEnthalpy h "Enthalpy";
+     parameter Modelica.Units.SI.Temperature T0=273.15+20 "Temperature";
+     Modelica.Units.SI.Temperature T "Temperature";
+     Modelica.Units.SI.SpecificEnthalpy h "Enthalpy";
      Medium.MassFraction Xi[:] = Medium.reference_X "Mass fraction";
 equation
     h = Medium.specificEnthalpy_pTX(p=101325, T=T0, X=Xi);
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Examples/PropyleneGlycolWaterDerivativeCheck.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Examples/PropyleneGlycolWaterDerivativeCheck.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Examples/PropyleneGlycolWaterDerivativeCheck.mo"	2022-03-10 09:57:39.696144342 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Examples/PropyleneGlycolWaterDerivativeCheck.mo"	2022-03-10 09:58:06.480147735 +0000
@@ -6,13 +6,13 @@
    package Medium = IBPSA.Media.Antifreeze.PropyleneGlycolWater (X_a=0.60,
         property_T=293.15);
 
-    Modelica.SIunits.Temperature T "Temperature";
-    Modelica.SIunits.SpecificEnthalpy hLiqSym "Liquid phase enthalpy";
-    Modelica.SIunits.SpecificEnthalpy hLiqCod "Liquid phase enthalpy";
-    Modelica.SIunits.SpecificHeatCapacity cpSym "Specific heat capacity";
-    Modelica.SIunits.SpecificHeatCapacity cpCod "Specific heat capacity";
-    Modelica.SIunits.SpecificHeatCapacity cvSym "Specific heat capacity";
-    Modelica.SIunits.SpecificHeatCapacity cvCod "Specific heat capacity";
+    Modelica.Units.SI.Temperature T "Temperature";
+    Modelica.Units.SI.SpecificEnthalpy hLiqSym "Liquid phase enthalpy";
+    Modelica.Units.SI.SpecificEnthalpy hLiqCod "Liquid phase enthalpy";
+    Modelica.Units.SI.SpecificHeatCapacity cpSym "Specific heat capacity";
+    Modelica.Units.SI.SpecificHeatCapacity cpCod "Specific heat capacity";
+    Modelica.Units.SI.SpecificHeatCapacity cvSym "Specific heat capacity";
+    Modelica.Units.SI.SpecificHeatCapacity cvCod "Specific heat capacity";
     constant Real convT(unit="K/s3") = 100
       "Conversion factor to satisfy unit check";
 initial equation
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Examples/PropyleneGlycolWaterProperties.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Examples/PropyleneGlycolWaterProperties.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Examples/PropyleneGlycolWaterProperties.mo"	2022-03-10 09:57:39.696144342 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Examples/PropyleneGlycolWaterProperties.mo"	2022-03-10 09:58:06.468147733 +0000
@@ -9,7 +9,7 @@
     TMin=273.15,
     TMax=373.15);
 equation
-  // Check the implementation of the base properties
+// Check the implementation of the base properties
   basPro.state.p=p;
   basPro.state.T=T;
    annotation(experiment(Tolerance=1e-6, StopTime=1.0),
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Examples/WaterDerivativeCheck.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Examples/WaterDerivativeCheck.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Examples/WaterDerivativeCheck.mo"	2022-03-10 09:57:39.696144342 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Examples/WaterDerivativeCheck.mo"	2022-03-10 09:58:06.444147730 +0000
@@ -4,13 +4,13 @@
 
    package Medium = IBPSA.Media.Water;
 
-    Modelica.SIunits.Temperature T "Temperature";
-    Modelica.SIunits.SpecificEnthalpy hLiqSym "Liquid phase enthalpy";
-    Modelica.SIunits.SpecificEnthalpy hLiqCod "Liquid phase enthalpy";
-    Modelica.SIunits.SpecificHeatCapacity cpSym "Specific heat capacity";
-    Modelica.SIunits.SpecificHeatCapacity cpCod "Specific heat capacity";
-    Modelica.SIunits.SpecificHeatCapacity cvSym "Specific heat capacity";
-    Modelica.SIunits.SpecificHeatCapacity cvCod "Specific heat capacity";
+    Modelica.Units.SI.Temperature T "Temperature";
+    Modelica.Units.SI.SpecificEnthalpy hLiqSym "Liquid phase enthalpy";
+    Modelica.Units.SI.SpecificEnthalpy hLiqCod "Liquid phase enthalpy";
+    Modelica.Units.SI.SpecificHeatCapacity cpSym "Specific heat capacity";
+    Modelica.Units.SI.SpecificHeatCapacity cpCod "Specific heat capacity";
+    Modelica.Units.SI.SpecificHeatCapacity cvSym "Specific heat capacity";
+    Modelica.Units.SI.SpecificHeatCapacity cvCod "Specific heat capacity";
     constant Real convT(unit="K/s3") = 270
     "Conversion factor to satisfy unit check";
 initial equation
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Examples/WaterProperties.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Examples/WaterProperties.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Examples/WaterProperties.mo"	2022-03-10 09:57:39.696144342 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Examples/WaterProperties.mo"	2022-03-10 09:58:06.436147729 +0000
@@ -7,7 +7,7 @@
     TMin=273.15,
     TMax=373.15);
 equation
-  // Check the implementation of the base properties
+// Check the implementation of the base properties
   basPro.state.p=p;
   basPro.state.T=T;
    annotation(experiment(Tolerance=1e-6, StopTime=1.0),
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Refrigerants/R410A/dPressureVap_dSpecificVolume_Tv.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Refrigerants/R410A/dPressureVap_dSpecificVolume_Tv.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Refrigerants/R410A/dPressureVap_dSpecificVolume_Tv.mo"	2022-03-10 09:57:39.696144342 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Refrigerants/R410A/dPressureVap_dSpecificVolume_Tv.mo"	2022-03-10 09:58:06.376147722 +0000
@@ -2,16 +2,16 @@
 function dPressureVap_dSpecificVolume_Tv
   "Derivative of the Martin-Hou equation of state with regards to specific volume"
 
-  input Modelica.SIunits.Temperature T
+  input Modelica.Units.SI.Temperature T
     "Temperature of refrigerant";
-  input Modelica.SIunits.SpecificVolume v
+  input Modelica.Units.SI.SpecificVolume v
     "Specific volume of refrigerant";
   output Real dpdv(
     final unit="Pa.kg/m3")
      "Derivative of pressure with regards to specific volume";
 
 protected
-  Modelica.SIunits.SpecificEntropy R = 114.55
+  Modelica.Units.SI.SpecificEntropy R = 114.55
     "Refrigerant gas constant for Martin-Hou equation of state";
 
   Real A[:] = {-1.721781e2, 2.381558e-1, -4.329207e-4, -6.241072e-7}
@@ -29,10 +29,10 @@
   Real k = 5.75
     "Coefficient K for Martin-Hou equation of state";
 
-  Modelica.SIunits.Temperature TCri = 345.25
+  Modelica.Units.SI.Temperature TCri = 345.25
     "Critical temperature of refrigerant";
 
-  Modelica.SIunits.SpecificVolume v_abs
+  Modelica.Units.SI.SpecificVolume v_abs
     "Smoothed specific volume";
 
   parameter Integer n = size(A, 1);
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Refrigerants/R410A/dPressureVap_dTemperature_Tv.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Refrigerants/R410A/dPressureVap_dTemperature_Tv.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Refrigerants/R410A/dPressureVap_dTemperature_Tv.mo"	2022-03-10 09:57:39.696144342 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Refrigerants/R410A/dPressureVap_dTemperature_Tv.mo"	2022-03-10 09:58:06.300147713 +0000
@@ -2,16 +2,16 @@
 function dPressureVap_dTemperature_Tv
   "Derivative of the Martin-Hou equation of state with regards to temperature"
 
-  input Modelica.SIunits.Temperature T
+  input Modelica.Units.SI.Temperature T
     "Temperature of refrigerant";
-  input Modelica.SIunits.SpecificVolume v
+  input Modelica.Units.SI.SpecificVolume v
     "Specific volume of refrigerant";
   output Real dpdT(
     final unit="Pa/K")
      "Derivative of pressure with regards to temperature";
 
 protected
-  Modelica.SIunits.SpecificEntropy R = 114.55
+  Modelica.Units.SI.SpecificEntropy R = 114.55
     "Refrigerant gas constant for Martin-Hou equation of state";
 
   Real A[:] = {-1.721781e2, 2.381558e-1, -4.329207e-4, -6.241072e-7}
@@ -29,10 +29,10 @@
   Real k = 5.75
     "Coefficient K for Martin-Hou equation of state";
 
-  Modelica.SIunits.Temperature TCri = 345.25
+  Modelica.Units.SI.Temperature TCri = 345.25
     "Critical temperature of refrigerant";
 
-  Modelica.SIunits.SpecificVolume v_abs
+  Modelica.Units.SI.SpecificVolume v_abs
     "Smoothed specific volume";
 
   parameter Integer n = size(A, 1);
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Refrigerants/R410A/dSpecificVolumeVap_pT.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Refrigerants/R410A/dSpecificVolumeVap_pT.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Refrigerants/R410A/dSpecificVolumeVap_pT.mo"	2022-03-10 09:57:39.696144342 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Refrigerants/R410A/dSpecificVolumeVap_pT.mo"	2022-03-10 09:58:06.288147711 +0000
@@ -1,9 +1,9 @@
 within BuildSysPro.IBPSA.Media.Refrigerants.R410A;
 function dSpecificVolumeVap_pT
   "Function that calculates the Jacobian of specific volume R410A vapor based on pressure and temperature"
-  input Modelica.SIunits.AbsolutePressure p
+  input Modelica.Units.SI.AbsolutePressure p
     "Pressure of refrigerant vapor";
-  input Modelica.SIunits.Temperature T
+  input Modelica.Units.SI.Temperature T
     "Temperature of refrigerant";
   input Real dp(
     final unit="Pa/s")
@@ -24,9 +24,9 @@
     final unit="Pa.kg/m3")
      "Derivative of pressure with regards to specific volume";
 
-  Modelica.SIunits.SpecificVolume v
-    "Specific volume of refrigerant";
 
+  Modelica.Units.SI.SpecificVolume v
+    "Specific volume of refrigerant";
 algorithm
 
   v := IBPSA.Media.Refrigerants.R410A.specificVolumeVap_pT(p, T);
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Refrigerants/R410A/enthalpySatLiq_T.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Refrigerants/R410A/enthalpySatLiq_T.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Refrigerants/R410A/enthalpySatLiq_T.mo"	2022-03-10 09:57:39.696144342 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Refrigerants/R410A/enthalpySatLiq_T.mo"	2022-03-10 09:58:06.276147710 +0000
@@ -1,9 +1,9 @@
 within BuildSysPro.IBPSA.Media.Refrigerants.R410A;
 function enthalpySatLiq_T
   "Function that calculates the enthalpy of saturated liquid R410A based on temperature"
-  input Modelica.SIunits.Temperature T
+  input Modelica.Units.SI.Temperature T
     "Temperature of refrigerant";
-  output Modelica.SIunits.SpecificEnthalpy h
+  output Modelica.Units.SI.SpecificEnthalpy h
     "Specific enthalpy of saturated liquid refrigerant";
 
 protected
@@ -13,20 +13,17 @@
   final Real x0 = 0.5541498
     "x0 for saturation pressure of liquid refrigerant";
 
-  final Modelica.SIunits.Temperature TCri = 345.25
+  final Modelica.Units.SI.Temperature TCri = 345.25
     "Critical temperature of refrigerant";
 
   Real x
     "Independent variable";
 
-algorithm
-  // Independent variable
-  x := IBPSA.Utilities.Math.Functions.smoothMax(
-            1 - T/TCri,
-            1e-4,
-            5e-3)^(1/3) - x0;
-  // Pressure of saturated liquid refrigerant
-  h := 1000*IBPSA.Utilities.Math.Functions.polynomial(a=a, x=x);
+algorithm
+// Independent variable
+  x := IBPSA.Utilities.Math.Functions.smoothMax(1 - T / TCri, 1e-4, 5e-3) ^ (1 / 3) - x0;
+// Pressure of saturated liquid refrigerant
+  h := 1000 * IBPSA.Utilities.Math.Functions.polynomial(a = a, x = x);
 
 annotation (smoothOrder=1,
 preferredView="info",Documentation(info="
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Refrigerants/R410A/enthalpySatVap_T.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Refrigerants/R410A/enthalpySatVap_T.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Refrigerants/R410A/enthalpySatVap_T.mo"	2022-03-10 09:57:39.696144342 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Refrigerants/R410A/enthalpySatVap_T.mo"	2022-03-10 09:58:06.252147706 +0000
@@ -1,9 +1,9 @@
 within BuildSysPro.IBPSA.Media.Refrigerants.R410A;
 function enthalpySatVap_T
   "Function that calculates the specific enthalpy of saturated R410A vapor based on temperature"
-  input Modelica.SIunits.Temperature T
+  input Modelica.Units.SI.Temperature T
     "Temperature of refrigerant";
-  output Modelica.SIunits.SpecificEnthalpy h
+  output Modelica.Units.SI.SpecificEnthalpy h
     "Specific enthalpy of saturated liquid refrigerant";
 
 protected
@@ -13,20 +13,17 @@
   final Real x0 = 0
     "x0 for saturation pressure of liquid refrigerant";
 
-  final Modelica.SIunits.Temperature TCri = 345.25
+  final Modelica.Units.SI.Temperature TCri = 345.25
     "Critical temperature of refrigerant";
 
   Real x
     "Independent variable";
 
-algorithm
-  // Independent variable
-  x := IBPSA.Utilities.Math.Functions.smoothMax(
-            1 - T/TCri,
-            1e-4,
-            5e-3)^(1/3) - x0;
-  // Pressure of saturated liquid refrigerant
-  h := 1000*IBPSA.Utilities.Math.Functions.polynomial(a=a, x=x);
+algorithm
+// Independent variable
+  x := IBPSA.Utilities.Math.Functions.smoothMax(1 - T / TCri, 1e-4, 5e-3) ^ (1 / 3) - x0;
+// Pressure of saturated liquid refrigerant
+  h := 1000 * IBPSA.Utilities.Math.Functions.polynomial(a = a, x = x);
 
 annotation (smoothOrder=1,
 preferredView="info",Documentation(info="
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Refrigerants/R410A/isentropicExponentVap_Tv.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Refrigerants/R410A/isentropicExponentVap_Tv.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Refrigerants/R410A/isentropicExponentVap_Tv.mo"	2022-03-10 09:57:39.696144342 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Refrigerants/R410A/isentropicExponentVap_Tv.mo"	2022-03-10 09:58:06.240147704 +0000
@@ -1,22 +1,22 @@
 within BuildSysPro.IBPSA.Media.Refrigerants.R410A;
 function isentropicExponentVap_Tv
   "Function that calculates the isentropic exponent of R410A vapor based on temperature and specific volume"
-  input Modelica.SIunits.Temperature T
+  input Modelica.Units.SI.Temperature T
     "Temperature of refrigerant";
-  input Modelica.SIunits.SpecificVolume v
+  input Modelica.Units.SI.SpecificVolume v
     "Specific volume of refrigerant";
-  output Modelica.SIunits.IsentropicExponent k
+  output Modelica.Units.SI.IsentropicExponent k
     "Specific isobaric heat capacity";
 
 protected
-  Modelica.SIunits.SpecificHeatCapacity cp
+  Modelica.Units.SI.SpecificHeatCapacity cp
     "Specific isobaric heat capacity";
 
-  Modelica.SIunits.SpecificHeatCapacity cv
+  Modelica.Units.SI.SpecificHeatCapacity cv
     "Specific isochoric heat capacity";
 
 algorithm
-  // Evaluate the specific isobaric and isochoric heat capacities
+// Evaluate the specific isobaric and isochoric heat capacities
   cp :=
     IBPSA.Media.Refrigerants.R410A.specificIsobaricHeatCapacityVap_Tv(T,
     v);
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Refrigerants/R410A/package.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Refrigerants/R410A/package.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Refrigerants/R410A/package.mo"	2022-03-10 09:57:39.696144342 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Refrigerants/R410A/package.mo"	2022-03-10 09:58:06.396147725 +0000
@@ -2,16 +2,16 @@
 package R410A "Refrigerant R410A"
   extends Modelica.Icons.VariantsPackage;
 
-  final constant Modelica.SIunits.SpecificEntropy R = 114.55
+  final constant Modelica.Units.SI.SpecificEntropy R = 114.55
     "Gas constant for use in Martin-Hou equation of state";
 
-  final constant Modelica.SIunits.Temperature TCri = 345.25
+  final constant Modelica.Units.SI.Temperature TCri = 345.25
     "Critical temperature";
 
-  final constant Modelica.SIunits.Temperature T_min = 173.15
+  final constant Modelica.Units.SI.Temperature T_min = 173.15
     "Minimum temperature for correlated properties";
 
-  final constant Modelica.SIunits.AbsolutePressure pCri = 4926.1e3
+  final constant Modelica.Units.SI.AbsolutePressure pCri = 4926.1e3
     "Critical pressure";
 
 annotation (preferredView="info",Documentation(info="
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Refrigerants/R410A/pressureSatVap_T.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Refrigerants/R410A/pressureSatVap_T.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Refrigerants/R410A/pressureSatVap_T.mo"	2022-03-10 09:57:39.696144342 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Refrigerants/R410A/pressureSatVap_T.mo"	2022-03-10 09:58:06.224147703 +0000
@@ -1,9 +1,9 @@
 within BuildSysPro.IBPSA.Media.Refrigerants.R410A;
 function pressureSatVap_T
   "Function that calculates the pressure of saturated R410A vapor based on temperature"
-  input Modelica.SIunits.Temperature T
+  input Modelica.Units.SI.Temperature T
     "Temperature of refrigerant";
-  output Modelica.SIunits.AbsolutePressure p
+  output Modelica.Units.SI.AbsolutePressure p
     "Pressure of saturated refrigerant vapor";
 
 protected
@@ -13,24 +13,20 @@
   final Real x0 = 0.2086902
     "x0 for saturation pressure of refrigerant vapor";
 
-  final Modelica.SIunits.Temperature TCri = 345.25
+  final Modelica.Units.SI.Temperature TCri = 345.25
     "Critical temperature of refrigerant";
 
-  final Modelica.SIunits.AbsolutePressure pCri = 4925.1e3
+  final Modelica.Units.SI.AbsolutePressure pCri = 4925.1e3
     "Critical pressure of refrigerant";
 
   Real x
     "Independent variable";
 
-algorithm
-  // Independent variable
-  x := IBPSA.Utilities.Math.Functions.smoothMax(
-            1 - T/TCri,
-            1e-4,
-            5e-3) - x0;
-  // Pressure of saturated refrigerant vapor
-  p := pCri*Modelica.Math.exp(TCri/T*
-    IBPSA.Utilities.Math.Functions.polynomial(a=a, x=x));
+algorithm
+// Independent variable
+  x := IBPSA.Utilities.Math.Functions.smoothMax(1 - T / TCri, 1e-4, 5e-3) - x0;
+// Pressure of saturated refrigerant vapor
+  p := pCri * Modelica.Math.exp(TCri / T * IBPSA.Utilities.Math.Functions.polynomial(a = a, x = x));
 
 annotation (smoothOrder=1,
 preferredView="info",Documentation(info="
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Refrigerants/R410A/pressureVap_Tv.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Refrigerants/R410A/pressureVap_Tv.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Refrigerants/R410A/pressureVap_Tv.mo"	2022-03-10 09:57:39.696144342 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Refrigerants/R410A/pressureVap_Tv.mo"	2022-03-10 09:58:06.208147700 +0000
@@ -1,15 +1,15 @@
 within BuildSysPro.IBPSA.Media.Refrigerants.R410A;
 function pressureVap_Tv
 "Function that calculates the pressure R410A vapor based on temperature and specific volume"
-input Modelica.SIunits.Temperature T
+input Modelica.Units.SI.Temperature T
    "Temperature of refrigerant";
-input Modelica.SIunits.SpecificVolume v
+input Modelica.Units.SI.SpecificVolume v
    "Specific volume of refrigerant";
-output Modelica.SIunits.AbsolutePressure p
+output Modelica.Units.SI.AbsolutePressure p
    "Pressure of refrigerant vapor";
 
 protected
-  Modelica.SIunits.SpecificEntropy R = 114.55
+  Modelica.Units.SI.SpecificEntropy R = 114.55
     "Refrigerant gas constant for Martin-Hou equation of state";
 
   Real A[:] = {-1.721781e2, 2.381558e-1, -4.329207e-4, -6.241072e-7}
@@ -27,10 +27,10 @@
   Real k = 5.75
     "Coefficient K for Martin-Hou equation of state";
 
-  Modelica.SIunits.Temperature TCri = 345.25
+  Modelica.Units.SI.Temperature TCri = 345.25
     "Critical temperature of refrigerant";
 
-  Modelica.SIunits.SpecificVolume v_abs
+  Modelica.Units.SI.SpecificVolume v_abs
     "Smoothed specific volume";
 
   parameter Integer n = size(A, 1);
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Refrigerants/R410A/specificIsobaricHeatCapacityVap_Tv.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Refrigerants/R410A/specificIsobaricHeatCapacityVap_Tv.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Refrigerants/R410A/specificIsobaricHeatCapacityVap_Tv.mo"	2022-03-10 09:57:39.696144342 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Refrigerants/R410A/specificIsobaricHeatCapacityVap_Tv.mo"	2022-03-10 09:58:06.192147699 +0000
@@ -1,15 +1,15 @@
 within BuildSysPro.IBPSA.Media.Refrigerants.R410A;
 function specificIsobaricHeatCapacityVap_Tv
   "Function that calculates the specific isobaric heat capacity of R410A vapor based on temperature and specific volume"
-  input Modelica.SIunits.Temperature T
+  input Modelica.Units.SI.Temperature T
     "Temperature of refrigerant";
-  input Modelica.SIunits.SpecificVolume v
+  input Modelica.Units.SI.SpecificVolume v
     "Specific volume of refrigerant";
-  output Modelica.SIunits.SpecificHeatCapacity cp
+  output Modelica.Units.SI.SpecificHeatCapacity cp
     "Specific isobaric heat capacity";
 
 protected
-  Modelica.SIunits.SpecificEntropy R = 114.55
+  Modelica.Units.SI.SpecificEntropy R = 114.55
     "Refrigerant gas constant for Martin-Hou equation of state";
 
   Real A[:] = {-1.721781e2, 2.381558e-1, -4.329207e-4, -6.241072e-7}
@@ -33,10 +33,10 @@
   Real dpdv
     "First derivative w.r.t. specific volume of the Martin-Hou equation";
 
-  Modelica.SIunits.SpecificHeatCapacity cv
+  Modelica.Units.SI.SpecificHeatCapacity cv
     "Specific isochoric heat capacity";
 
-  Modelica.SIunits.Temperature TCri = 345.25
+  Modelica.Units.SI.Temperature TCri = 345.25
     "Critical temperature of refrigerant";
 
   parameter Integer n = size(A, 1);
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Refrigerants/R410A/specificIsochoricHeatCapacityVap_Tv.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Refrigerants/R410A/specificIsochoricHeatCapacityVap_Tv.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Refrigerants/R410A/specificIsochoricHeatCapacityVap_Tv.mo"	2022-03-10 09:57:39.696144342 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Refrigerants/R410A/specificIsochoricHeatCapacityVap_Tv.mo"	2022-03-10 09:58:06.156147694 +0000
@@ -2,15 +2,15 @@
 function specificIsochoricHeatCapacityVap_Tv
   "Function that calculates the specific isochoric heat capacity of R410A vapor
   based on temperature and specific volume"
-  input Modelica.SIunits.Temperature T
+  input Modelica.Units.SI.Temperature T
     "Temperature of refrigerant";
-  input Modelica.SIunits.SpecificVolume v
+  input Modelica.Units.SI.SpecificVolume v
     "Specific volume of refrigerant";
-  output Modelica.SIunits.SpecificHeatCapacity cv
+  output Modelica.Units.SI.SpecificHeatCapacity cv
     "Specific isochoric heat capacity";
 
 protected
-  Modelica.SIunits.SpecificEntropy R = 114.55
+  Modelica.Units.SI.SpecificEntropy R = 114.55
     "Refrigerant gas constant for Martin-Hou equation of state";
 
   Real A[:] = {-1.721781e2, 2.381558e-1, -4.329207e-4, -6.241072e-7}
@@ -34,23 +34,22 @@
   Real integral_of_d2pdT2
     "Integral over v of the second derivative w.r.t. temperature of the Martin-Hou equation";
 
-  Modelica.SIunits.SpecificHeatCapacity cpo
+  Modelica.Units.SI.SpecificHeatCapacity cpo
     "Ideal gas specific isobaric heat capacity";
 
-  Modelica.SIunits.SpecificHeatCapacity cvo
+  Modelica.Units.SI.SpecificHeatCapacity cvo
     "Ideal gas specific isochoric heat capacity";
 
-  Modelica.SIunits.Temperature TCri = 345.25
+  Modelica.Units.SI.Temperature TCri = 345.25
     "Critical temperature of refrigerant";
 
   parameter Integer n = size(A, 1);
 
-algorithm
-  // Ideal gas isobaric heat capacity from polynomial equation
-  cpo := 1.0e3*IBPSA.Utilities.Math.Functions.polynomial(a=a, x=T);
-  cvo := cpo - R;
-
-  // Integral of second derivative of pressure w.r.t. temperature
+algorithm
+// Ideal gas isobaric heat capacity from polynomial equation
+  cpo := 1.0e3 * IBPSA.Utilities.Math.Functions.polynomial(a = a, x = T);
+  cvo := cpo - R;
+// Integral of second derivative of pressure w.r.t. temperature
   integral_of_d2pdT2 := 0.0;
   for i in 1:n loop
     integral_of_d2pdT2 := integral_of_d2pdT2 + C[i]*Modelica.Math.exp(-k*T/TCri)/(i*(v - b)^(i));
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Refrigerants/R410A/specificVolumeVap_pT.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Refrigerants/R410A/specificVolumeVap_pT.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Refrigerants/R410A/specificVolumeVap_pT.mo"	2022-03-10 09:57:39.696144342 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Refrigerants/R410A/specificVolumeVap_pT.mo"	2022-03-10 09:58:06.128147690 +0000
@@ -1,15 +1,15 @@
 within BuildSysPro.IBPSA.Media.Refrigerants.R410A;
 function specificVolumeVap_pT
   "Function that calculates the specific volume R410A vapor based on pressure and temperature"
-  input Modelica.SIunits.AbsolutePressure p
+  input Modelica.Units.SI.AbsolutePressure p
     "Pressure of refrigerant vapor";
-  input Modelica.SIunits.Temperature T
+  input Modelica.Units.SI.Temperature T
     "Temperature of refrigerant";
-  output Modelica.SIunits.SpecificVolume v
+  output Modelica.Units.SI.SpecificVolume v
     "Specific volume of refrigerant";
 
 protected
-  Modelica.SIunits.SpecificEntropy R = 114.55
+  Modelica.Units.SI.SpecificEntropy R = 114.55
     "Refrigerant gas constant for Martin-Hou equation of state";
 
   Real A[:] = {-1.721781e2, 2.381558e-1, -4.329207e-4, -6.241072e-7}
@@ -27,10 +27,10 @@
   Real k = 5.75
     "Coefficient K for Martin-Hou equation of state";
 
-  Modelica.SIunits.SpecificVolume dv
+  Modelica.Units.SI.SpecificVolume dv
     "Error on specific volume of refrigerant";
 
-  Modelica.SIunits.Pressure dp
+  Modelica.Units.SI.Pressure dp
     "Error on pressure of refrigerant";
 
   Real dpdv( final unit = "(Pa.kg)/m3");
@@ -39,28 +39,22 @@
 
   parameter Integer n = size(A, 1);
 
-algorithm
-
-  // Initial guess of specific volume
-  v := R*T/p + b;
+algorithm
+// Initial guess of specific volume
+  v := R * T / p + b;
   dv := 1e99;
-  m := 0;
-  while abs(dv/v) > 1e-10 loop
-    assert(m < 1E3,
-      "Failed to converge in IBPSA.Media.Refrigerants.R410A.specificVolumeVap_pT");
-    m := m + 1;
-
-    // Evaluate first derivative of pressure w.r.t. specific volume
-    dpdv :=
-      IBPSA.Media.Refrigerants.R410A.dPressureVap_dSpecificVolume_Tv(T,
-      v);
-    // Error on pressure
-    dp := p - IBPSA.Media.Refrigerants.R410A.pressureVap_Tv(T, v);
-    // Corresponding linear adjustment of specific volume
-    dv := dp/dpdv;
-    v := v + dv;
-
-end while;
+  m := 0;
+  while abs(dv / v) > 1e-10 loop
+    assert(m < 1E3, "Failed to converge in IBPSA.Media.Refrigerants.R410A.specificVolumeVap_pT");
+    m := m + 1;
+    dpdv := IBPSA.Media.Refrigerants.R410A.dPressureVap_dSpecificVolume_Tv(T, v);
+    dp := p - IBPSA.Media.Refrigerants.R410A.pressureVap_Tv(T, v);
+    dv := dp / dpdv;
+    v := v + dv;
+  end while;
+// Evaluate first derivative of pressure w.r.t. specific volume
+// Error on pressure
+// Corresponding linear adjustment of specific volume
 
 annotation (derivative=IBPSA.Media.Refrigerants.R410A.dSpecificVolumeVap_pT,
 preferredView="info",Documentation(info="
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Refrigerants/Validation/R410A_dSpecificVolumeVap_pT.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Refrigerants/Validation/R410A_dSpecificVolumeVap_pT.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Refrigerants/Validation/R410A_dSpecificVolumeVap_pT.mo"	2022-03-10 09:57:39.696144342 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Refrigerants/Validation/R410A_dSpecificVolumeVap_pT.mo"	2022-03-10 09:58:06.104147688 +0000
@@ -3,10 +3,10 @@
   "Validation of the derivatives of the specific volume with regards to p and T"
   extends Modelica.Icons.Example;
 
-  parameter Modelica.SIunits.AbsolutePressure p = 400e3
+  parameter Modelica.Units.SI.AbsolutePressure p = 400e3
     "Pressure of refrigerant vapor";
 
-  parameter Modelica.SIunits.Temperature T = 273.15
+  parameter Modelica.Units.SI.Temperature T = 273.15
     "Temperature of refrigerant";
 
   parameter Real dp(final unit="Pa") = 1.0
@@ -50,17 +50,12 @@
     "Numerical delta of specific volume of refrigerant with regards to
     temperature";
 
-  constant Modelica.SIunits.Time oneSec = 1.0
+  constant Modelica.Units.SI.Time oneSec = 1.0
     "Unit time variable for unit conversion of time derivatives";
 
-equation
-
-  // Analytical derivatives
-  dv_p = IBPSA.Media.Refrigerants.R410A.dSpecificVolumeVap_pT(
-            p,
-            T,
-            dp/oneSec,
-            0.0)*oneSec;
+equation
+// Analytical derivatives
+  dv_p = IBPSA.Media.Refrigerants.R410A.dSpecificVolumeVap_pT(p, T, dp / oneSec, 0.0) * oneSec;
 
   dv_T = IBPSA.Media.Refrigerants.R410A.dSpecificVolumeVap_pT(
             p,
@@ -70,12 +65,9 @@
 
   dvdp = dv_p / dp;
 
-  dvdT = dv_T / dT;
-
-  // Numerical derivatives
-  dv_p_num = IBPSA.Media.Refrigerants.R410A.specificVolumeVap_pT(p + 0.5
-    *dp, T) - IBPSA.Media.Refrigerants.R410A.specificVolumeVap_pT(p - 0.5
-    *dp, T);
+  dvdT = dv_T / dT;
+// Numerical derivatives
+  dv_p_num = IBPSA.Media.Refrigerants.R410A.specificVolumeVap_pT(p + 0.5 * dp, T) - IBPSA.Media.Refrigerants.R410A.specificVolumeVap_pT(p - 0.5 * dp, T);
 
   dv_T_num = IBPSA.Media.Refrigerants.R410A.specificVolumeVap_pT(p, T +
     0.5*dT) - IBPSA.Media.Refrigerants.R410A.specificVolumeVap_pT(p, T -
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Specialized/Air/Examples/PerfectGasDerivativeCheck.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Specialized/Air/Examples/PerfectGasDerivativeCheck.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Specialized/Air/Examples/PerfectGasDerivativeCheck.mo"	2022-03-10 09:57:39.696144342 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Specialized/Air/Examples/PerfectGasDerivativeCheck.mo"	2022-03-10 09:58:06.060147682 +0000
@@ -4,13 +4,13 @@
 
    package Medium = IBPSA.Media.Specialized.Air.PerfectGas;
 
-    Modelica.SIunits.Temperature T "Temperature";
-    Modelica.SIunits.SpecificEnthalpy hLiqSym "Liquid phase enthalpy";
-    Modelica.SIunits.SpecificEnthalpy hLiqCod "Liquid phase enthalpy";
-    Modelica.SIunits.SpecificEnthalpy hSteSym "Water vapor enthalpy";
-    Modelica.SIunits.SpecificEnthalpy hSteCod "Water vapor enthalpy";
-    Modelica.SIunits.SpecificEnthalpy hAirSym "Dry air enthalpy";
-    Modelica.SIunits.SpecificEnthalpy hAirCod "Dry air enthalpy";
+    Modelica.Units.SI.Temperature T "Temperature";
+    Modelica.Units.SI.SpecificEnthalpy hLiqSym "Liquid phase enthalpy";
+    Modelica.Units.SI.SpecificEnthalpy hLiqCod "Liquid phase enthalpy";
+    Modelica.Units.SI.SpecificEnthalpy hSteSym "Water vapor enthalpy";
+    Modelica.Units.SI.SpecificEnthalpy hSteCod "Water vapor enthalpy";
+    Modelica.Units.SI.SpecificEnthalpy hAirSym "Dry air enthalpy";
+    Modelica.Units.SI.SpecificEnthalpy hAirCod "Dry air enthalpy";
     constant Real convT(unit="K/s3") = 270
     "Conversion factor to satisfy unit check";
 initial equation
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Specialized/Air/PerfectGas.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Specialized/Air/PerfectGas.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Specialized/Air/PerfectGas.mo"	2022-03-10 09:57:39.696144342 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Specialized/Air/PerfectGas.mo"	2022-03-10 09:58:06.036147679 +0000
@@ -37,7 +37,7 @@
      is no longer possible and non-linear algebraic equations occur.
       */
   protected
-    constant Modelica.SIunits.MolarMass[2] MMX = {steam.MM,dryair.MM}
+    constant Modelica.Units.SI.MolarMass[2] MMX = {steam.MM,dryair.MM}
       "Molar masses of components";
 
     MassFraction X_steam "Mass fraction of steam water";
@@ -54,12 +54,11 @@
     X_air    = 1-Xi[Water];
 
     h = (T - reference_T)*dryair.cp * (1 - Xi[Water]) +
-        ((T-reference_T) * steam.cp + h_fg) * Xi[Water];
-
-    R = dryair.R*(1 - X_steam) + steam.R*X_steam;
-    //
-    u = h - R*T;
-    d = p/(R*T);
+        ((T-reference_T) * steam.cp + h_fg) * Xi[Water];
+  R_s = dryair.R * (1 - X_steam) + steam.R * X_steam;
+//
+      u = h - R_s * T;
+  d = p / (R_s * T);
     /* Note, u and d are computed under the assumption that the volume of the liquid
          water is negligible with respect to the volume of air and of steam
       */
@@ -129,21 +128,22 @@
 
 redeclare function extends gasConstant "Gas constant"
 algorithm
-    R := dryair.R*(1 - state.X[Water]) + steam.R*state.X[Water];
+    R_s := dryair.R*(1 - state.X[Water]) + steam.R*state.X[Water];
   annotation (
-    Inline=true);
+    Inline=true);
+
 end gasConstant;
 
 function saturationPressureLiquid
     "Return saturation pressure of water as a function of temperature T in the range of 273.16 to 373.16 K"
 
   extends Modelica.Icons.Function;
-  input Modelica.SIunits.Temperature Tsat "saturation temperature";
-  output Modelica.SIunits.AbsolutePressure psat "saturation pressure";
-  // This function is declared here explicitly, instead of referencing the function in its
-  // base class, since otherwise Dymola 7.3 does not find the derivative for the model
-  // IBPSA.Fluid.Sensors.Examples.MassFraction
-algorithm
+  input Modelica.Units.SI.Temperature Tsat "saturation temperature";
+  output Modelica.Units.SI.AbsolutePressure psat "saturation pressure";
+  // This function is declared here explicitly, instead of referencing the function in its
+  // base class, since otherwise Dymola 7.3 does not find the derivative for the model
+  // IBPSA.Fluid.Sensors.Examples.MassFraction
+  algorithm
   psat := 611.657*Modelica.Math.exp(17.2799 - 4102.99/(Tsat - 35.719));
   annotation (
     smoothOrder=5,
@@ -152,14 +152,15 @@
     Documentation(info="
 Saturation pressure of water above the triple point temperature is computed from temperature. It's range of validity is between
 273.16 and 373.16 K. Outside these limits a less accurate result is returned.
-"));
+"));
+
 end saturationPressureLiquid;
 
 function saturationPressureLiquid_der
     "Time derivative of saturationPressureLiquid"
 
   extends Modelica.Icons.Function;
-  input Modelica.SIunits.Temperature Tsat "Saturation temperature";
+  input Modelica.Units.SI.Temperature Tsat "Saturation temperature";
   input Real dTsat(unit="K/s") "Saturation temperature derivative";
   output Real psat_der(unit="Pa/s") "Saturation pressure";
 
@@ -173,7 +174,8 @@
 Derivative function of
 
 IBPSA.Media.Specialized.Air.PerfectGas.saturationPressureLiquid
-"));
+"));
+
 end saturationPressureLiquid_der;
 
   function sublimationPressureIce =
@@ -423,11 +425,10 @@
 redeclare function extends thermalConductivity
     "Thermal conductivity of dry air as a polynomial in the temperature"
 algorithm
-  lambda := Modelica.Media.Incompressible.TableBased.Polynomials_Temp.evaluate(
-      {(-4.8737307422969E-008), 7.67803133753502E-005, 0.0241814385504202},
-   Modelica.SIunits.Conversions.to_degC(state.T));
+  lambda := Modelica.Math.Polynomials.evaluate({-4.8737307422969E-008, 7.67803133753502E-005, 0.0241814385504202}, Modelica.Units.Conversions.to_degC(state.T));
   annotation (
-    Inline=true);
+    Inline=true);
+
 end thermalConductivity;
 
 redeclare function extends specificEnthalpy "Specific enthalpy"
@@ -439,20 +440,21 @@
 
 redeclare replaceable function specificEnthalpy_pTX "Specific enthalpy"
   extends Modelica.Icons.Function;
-  input Modelica.SIunits.Pressure p "Pressure";
-  input Modelica.SIunits.Temperature T "Temperature";
-  input Modelica.SIunits.MassFraction X[:] "Mass fractions of moist air";
-  output Modelica.SIunits.SpecificEnthalpy h "Specific enthalpy at p, T, X";
+  input Modelica.Units.SI.Pressure p "Pressure";
+  input Modelica.Units.SI.Temperature T "Temperature";
+  input Modelica.Units.SI.MassFraction X[:] "Mass fractions of moist air";
+  output Modelica.Units.SI.SpecificEnthalpy h "Specific enthalpy at p, T, X";
 
   protected
-  Modelica.SIunits.SpecificEnthalpy hDryAir "Enthalpy of dry air";
+  Modelica.Units.SI.SpecificEnthalpy hDryAir "Enthalpy of dry air";
 algorithm
   hDryAir := (T - reference_T)*dryair.cp;
   h := hDryAir * (1 - X[Water]) +
        ((T-reference_T) * steam.cp + h_fg) * X[Water];
   annotation(smoothOrder=5,
              Inline=true,
-             inverse(T=temperature_phX(p, h, X)));
+             inverse(T=temperature_phX(p, h, X)));
+
 end specificEnthalpy_pTX;
 
 redeclare function extends specificInternalEnergy "Specific internal energy"
@@ -498,23 +500,24 @@
 is independent of the pressure.
 "));
 end temperature_phX;
-//////////////////////////////////////////////////////////////////////
-// Protected classes.
-// These classes are only of use within this medium model.
-// Equipment models generally have no need to access them.
-// Therefore, they are made protected. This also allows to redeclare the
-// medium model with another medium model that does not provide an
-// implementation of these classes.
+
+  //////////////////////////////////////////////////////////////////////
+  // Protected classes.
+  // These classes are only of use within this medium model.
+  // Equipment models generally have no need to access them.
+  // Therefore, they are made protected. This also allows to redeclare the
+  // medium model with another medium model that does not provide an
+  // implementation of these classes.
 protected
   record GasProperties
     "Coefficient data record for properties of perfect gases"
     extends Modelica.Icons.Record;
 
-    Modelica.SIunits.MolarMass MM "Molar mass";
-    Modelica.SIunits.SpecificHeatCapacity R "Gas constant";
-    Modelica.SIunits.SpecificHeatCapacity cp
+    Modelica.Units.SI.MolarMass MM "Molar mass";
+    Modelica.Units.SI.SpecificHeatCapacity R "Gas constant";
+    Modelica.Units.SI.SpecificHeatCapacity cp
       "Specific heat capacity at constant pressure";
-    Modelica.SIunits.SpecificHeatCapacity cv = cp-R
+    Modelica.Units.SI.SpecificHeatCapacity cv = cp-R
       "Specific heat capacity at constant volume";
     annotation (
       preferredView="info",
@@ -557,26 +560,26 @@
   // In the assignments below, we compute cv as OpenModelica
   // cannot evaluate cv=cp-R as defined in GasProperties.
   constant GasProperties dryair(
-    R =    Modelica.Media.IdealGases.Common.SingleGasesData.Air.R,
+    R =    Modelica.Media.IdealGases.Common.SingleGasesData.Air.R_s,
     MM =   Modelica.Media.IdealGases.Common.SingleGasesData.Air.MM,
     cp=IBPSA.Utilities.Psychrometrics.Constants.cpAir,
     cv=IBPSA.Utilities.Psychrometrics.Constants.cpAir
-             -Modelica.Media.IdealGases.Common.SingleGasesData.Air.R)
+             - Modelica.Media.IdealGases.Common.SingleGasesData.Air.R_s)
     "Dry air properties";
   constant GasProperties steam(
-    R =    Modelica.Media.IdealGases.Common.SingleGasesData.H2O.R,
+    R =    Modelica.Media.IdealGases.Common.SingleGasesData.H2O.R_s,
     MM =   Modelica.Media.IdealGases.Common.SingleGasesData.H2O.MM,
     cp=IBPSA.Utilities.Psychrometrics.Constants.cpSte,
     cv=IBPSA.Utilities.Psychrometrics.Constants.cpSte
-             -Modelica.Media.IdealGases.Common.SingleGasesData.H2O.R)
+             - Modelica.Media.IdealGases.Common.SingleGasesData.H2O.R_s)
     "Steam properties";
 
   constant Real k_mair =  steam.MM/dryair.MM "Ratio of molar weights";
 
-  constant Modelica.SIunits.SpecificEnergy h_fg=IBPSA.Utilities.Psychrometrics.Constants.h_fg
+  constant Modelica.Units.SI.SpecificEnergy h_fg=IBPSA.Utilities.Psychrometrics.Constants.h_fg
     "Latent heat of evaporation of water";
 
-  constant Modelica.SIunits.SpecificHeatCapacity cpWatLiq=IBPSA.Utilities.Psychrometrics.Constants.cpWatLiq
+  constant Modelica.Units.SI.SpecificHeatCapacity cpWatLiq=IBPSA.Utilities.Psychrometrics.Constants.cpWatLiq
     "Specific heat capacity of liquid water";
 
   function s_pTX = Modelica.Media.Air.MoistAir.s_pTX
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Specialized/Water/ConstantProperties_pT/package.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Specialized/Water/ConstantProperties_pT/package.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Specialized/Water/ConstantProperties_pT/package.mo"	2022-03-10 09:57:39.696144342 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Specialized/Water/ConstantProperties_pT/package.mo"	2022-03-10 09:58:05.832147654 +0000
@@ -13,40 +13,40 @@
     a_const=a_nominal,
     T_max=T_max_nominal);
 
-  constant Modelica.SIunits.Temperature T_max_nominal=
+  constant Modelica.Units.SI.Temperature T_max_nominal=
   Modelica.Media.Water.IF97_Utilities.BaseIF97.Basic.tsat(p_nominal)
     "Maximum temperature valid for medium model";
 
-  constant Modelica.SIunits.Temperature T_nominal = 273.15 + 20
+  constant Modelica.Units.SI.Temperature T_nominal = 273.15 + 20
     "Nominal temperature for calculation of water properties";
 
-  constant Modelica.SIunits.VelocityOfSound a_nominal=
+  constant Modelica.Units.SI.VelocityOfSound a_nominal=
     Modelica.Media.Water.IF97_Utilities.velocityOfSound_pT(p_nominal, T_nominal)
     "Constant velocity of sound";
 
-  constant Modelica.SIunits.SpecificHeatCapacity cp_nominal=
+  constant Modelica.Units.SI.SpecificHeatCapacity cp_nominal=
     Modelica.Media.Water.IF97_Utilities.cp_pT(p_nominal, T_nominal)
     "Specific heat capacity at nominal water conditions";
 
-  constant Modelica.SIunits.Density d_nominal=
+  constant Modelica.Units.SI.Density d_nominal=
     Modelica.Media.Water.IF97_Utilities.rho_pT(p_nominal, T_nominal)
     "Density at nominal water conditions";
 
-  constant Modelica.SIunits.DynamicViscosity eta_nominal=
+  constant Modelica.Units.SI.DynamicViscosity eta_nominal=
    Modelica.Media.Water.IF97_Utilities.dynamicViscosity(
      d_nominal,
      T_nominal,
      p_nominal)
    "Constant dynamic viscosity";
 
-  constant Modelica.SIunits.ThermalConductivity lambda_nominal=
+  constant Modelica.Units.SI.ThermalConductivity lambda_nominal=
     Modelica.Media.Water.IF97_Utilities.thermalConductivity(
      d_nominal,
      T_nominal,
      p_nominal)
     "Constant thermal conductivity";
 
-  constant Modelica.SIunits.AbsolutePressure p_nominal = 101325
+  constant Modelica.Units.SI.AbsolutePressure p_nominal = 101325
     "Nominal pressure for calculation of water properties";
 
 annotation (Documentation(info="
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Specialized/Water/Examples/TemperatureDependentDensityDerivativeCheck.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Specialized/Water/Examples/TemperatureDependentDensityDerivativeCheck.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Specialized/Water/Examples/TemperatureDependentDensityDerivativeCheck.mo"	2022-03-10 09:57:39.696144342 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Specialized/Water/Examples/TemperatureDependentDensityDerivativeCheck.mo"	2022-03-10 09:58:05.796147649 +0000
@@ -7,13 +7,13 @@
       IBPSA.Media.Specialized.Water.TemperatureDependentDensity
     "Medium model";
 
-    Modelica.SIunits.Temperature T "Temperature";
-    Modelica.SIunits.SpecificEnthalpy hLiqSym "Liquid phase enthalpy";
-    Modelica.SIunits.SpecificEnthalpy hLiqCod "Liquid phase enthalpy";
-    Modelica.SIunits.SpecificHeatCapacity cpSym "Specific heat capacity";
-    Modelica.SIunits.SpecificHeatCapacity cpCod "Specific heat capacity";
-    Modelica.SIunits.SpecificHeatCapacity cvSym "Specific heat capacity";
-    Modelica.SIunits.SpecificHeatCapacity cvCod "Specific heat capacity";
+    Modelica.Units.SI.Temperature T "Temperature";
+    Modelica.Units.SI.SpecificEnthalpy hLiqSym "Liquid phase enthalpy";
+    Modelica.Units.SI.SpecificEnthalpy hLiqCod "Liquid phase enthalpy";
+    Modelica.Units.SI.SpecificHeatCapacity cpSym "Specific heat capacity";
+    Modelica.Units.SI.SpecificHeatCapacity cpCod "Specific heat capacity";
+    Modelica.Units.SI.SpecificHeatCapacity cvSym "Specific heat capacity";
+    Modelica.Units.SI.SpecificHeatCapacity cvCod "Specific heat capacity";
     constant Real convT(unit="K/s3") = 270
     "Conversion factor to satisfy unit check";
 initial equation
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Specialized/Water/Examples/TemperatureDependentDensityProperties.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Specialized/Water/Examples/TemperatureDependentDensityProperties.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Specialized/Water/Examples/TemperatureDependentDensityProperties.mo"	2022-03-10 09:57:39.696144342 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Specialized/Water/Examples/TemperatureDependentDensityProperties.mo"	2022-03-10 09:58:05.780147646 +0000
@@ -8,7 +8,7 @@
     TMin=273.15,
     TMax=373.15);
 equation
-  // Check the implementation of the base properties
+// Check the implementation of the base properties
   basPro.state.p=p;
   basPro.state.T=T;
    annotation(experiment(Tolerance=1e-6, StopTime=1.0),
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Specialized/Water/Examples/WaterProperties_pT.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Specialized/Water/Examples/WaterProperties_pT.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Specialized/Water/Examples/WaterProperties_pT.mo"	2022-03-10 09:57:39.696144342 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Specialized/Water/Examples/WaterProperties_pT.mo"	2022-03-10 09:58:05.744147642 +0000
@@ -9,7 +9,7 @@
     TMin=273.15,
     TMax=273.15 + 150);
 equation
-  // Check the implementation of the base properties
+// Check the implementation of the base properties
   basPro.state.p=p;
   basPro.state.T=T;
    annotation(experiment(Tolerance=1e-6, StopTime=1.0),
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Specialized/Water/TemperatureDependentDensity.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Specialized/Water/TemperatureDependentDensity.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Specialized/Water/TemperatureDependentDensity.mo"	2022-03-10 09:57:39.696144342 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Specialized/Water/TemperatureDependentDensity.mo"	2022-03-10 09:58:05.728147639 +0000
@@ -24,7 +24,7 @@
     Temperature T(start=T_default) "Temperature of medium";
     AbsolutePressure p(start=p_default) "Pressure of medium";
   end ThermodynamicState;
-  constant Modelica.SIunits.SpecificHeatCapacity cp_const = 4184
+  constant Modelica.Units.SI.SpecificHeatCapacity cp_const = 4184
     "Specific heat capacity at constant pressure";
 
   redeclare model extends BaseProperties(
@@ -35,7 +35,7 @@
     d = density(state);
     state.T = T;
     state.p = p;
-    R=Modelica.Constants.R;
+    R_s =Modelica.Constants.R;
     MM=MM_const;
     annotation(Documentation(info="
     

@@ -131,8 +131,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 := (T - reference_T)*cp_const;
   annotation (
@@ -151,7 +151,8 @@
 First implementation.
 
 
-"));
+"));
+
 end enthalpyOfLiquid;
 
 redeclare function extends specificInternalEnergy
@@ -285,11 +286,11 @@
     else
        0.7025109*(0.7025109*state.T - 1220.35045233)/(-0.7025109*state.T +
        1220.35045233)^2);
-        // Symbolic conversion of degC to Kelvin
-//        ((4.5027e-05)*T_degC^2 - 0.01167152*state.T +
-//               3.202446788)/((1.5009e-05)*T_degC^3 - 0.00583576*T_degC^2 +
-//               0.0143711*state.T + 996.194534035)
-annotation (
+// Symbolic conversion of degC to Kelvin
+//        ((4.5027e-05)*T_degC^2 - 0.01167152*state.T +
+//               3.202446788)/((1.5009e-05)*T_degC^3 - 0.00583576*T_degC^2 +
+//               0.0143711*state.T + 996.194534035)
+    annotation (
   Inline=true,
   Documentation(info="
 

@@ -312,7 +313,8 @@
 First implementation.
 
 
-"));
+"));
+
 end isobaricExpansionCoefficient;
 
 redeclare function extends isothermalCompressibility
@@ -629,9 +631,9 @@
 redeclare function extends setState_psX
     "Return the thermodynamic state as function of p, s and composition X or Xi"
 algorithm
-  // The temperature is obtained from symbolic solving the
-  // specificEntropy function for T, i.e.,
-  // s := cv_const*Modelica.Math.log(state.T/reference_T)
+// The temperature is obtained from symbolic solving the
+// specificEntropy function for T, i.e.,
+// s := cv_const*Modelica.Math.log(state.T/reference_T)
   state := ThermodynamicState(p=p, T=reference_T * Modelica.Math.exp(s/cv_const));
   annotation (
     Inline=true,
@@ -658,22 +660,24 @@
 First implementation.
 
 
-"));
+"));
+
 end setState_psX;
-//////////////////////////////////////////////////////////////////////
-// Protected classes.
-// These classes are only of use within this medium model.
-// Equipment models generally have no need to access them.
-// Therefore, they are made protected. This also allows to redeclare the
-// medium model with another medium model that does not provide an
-// implementation of these classes.
+
+  //////////////////////////////////////////////////////////////////////
+  // Protected classes.
+  // These classes are only of use within this medium model.
+  // Equipment models generally have no need to access them.
+  // Therefore, they are made protected. This also allows to redeclare the
+  // medium model with another medium model that does not provide an
+  // implementation of these classes.
 protected
-  final constant Modelica.SIunits.SpecificHeatCapacity cv_const = cp_const
+  final constant Modelica.Units.SI.SpecificHeatCapacity cv_const = cp_const
     "Specific heat capacity at constant volume";
 
-  constant Modelica.SIunits.VelocityOfSound a_const=1484
+  constant Modelica.Units.SI.VelocityOfSound a_const=1484
     "Constant velocity of sound";
-  constant Modelica.SIunits.MolarMass MM_const=0.018015268 "Molar mass";
+  constant Modelica.Units.SI.MolarMass MM_const=0.018015268 "Molar mass";
 
 replaceable function der_specificHeatCapacityCp
     "Return the derivative of the specific heat capacity at constant pressure"
@@ -731,8 +735,8 @@
 function kinematicViscosity "Return the kinematic viscosity"
   extends Modelica.Icons.Function;
 
-  input Modelica.SIunits.Temperature T "Temperature";
-  output Modelica.SIunits.KinematicViscosity kinVis "Kinematic viscosity";
+  input Modelica.Units.SI.Temperature T "Temperature";
+  output Modelica.Units.SI.KinematicViscosity kinVis "Kinematic viscosity";
 algorithm
   kinVis := smooth(1,
   if T < 278.15 then
@@ -781,7 +785,8 @@
 but converted from Celsius to Kelvin.
 
 
-"));
+"));
+
 end kinematicViscosity;
 annotation(preferredView="info", Documentation(info="
 

diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Water.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Water.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Water.mo"	2022-03-10 09:57:39.696144342 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Media/Water.mo"	2022-03-10 09:58:05.652147630 +0000
@@ -9,7 +9,7 @@
      AbsolutePressure(start=p_default),
      Temperature(start=T_default),
      Density(start=d_const));
-  // cp_const and cv_const have been made final because the model sets u=h.
+  // cp_const and cv_const have been made final because the model sets u=h.
   extends Modelica.Icons.Package;
 
   redeclare model BaseProperties "Base properties"
@@ -20,14 +20,14 @@
     InputMassFraction[nXi] Xi=fill(0, 0)
       "Structurally independent mass fractions";
     InputSpecificEnthalpy h "Specific enthalpy of medium";
-    Modelica.SIunits.SpecificInternalEnergy u
+    Modelica.Units.SI.SpecificInternalEnergy u
       "Specific internal energy of medium";
-    Modelica.SIunits.Density d=d_const "Density of medium";
-    Modelica.SIunits.MassFraction[nX] X={1}
+    Modelica.Units.SI.Density d=d_const "Density of medium";
+    Modelica.Units.SI.MassFraction[nX] X={1}
       "Mass fractions (= (component mass)/total mass  m_i/m)";
-    final Modelica.SIunits.SpecificHeatCapacity R=0
+    final Modelica.Units.SI.SpecificHeatCapacity R=0
       "Gas constant (of mixture if applicable)";
-    final Modelica.SIunits.MolarMass MM=MM_const
+    final Modelica.Units.SI.MolarMass MM=MM_const
       "Molar mass (of mixture or single fluid)";
     ThermodynamicState state
       "Thermodynamic state record for optional functions";
@@ -36,21 +36,21 @@
       annotation(Evaluate=true, Dialog(tab="Advanced"));
     final parameter Boolean standardOrderComponents=true
       "If true, and reducedX = true, the last element of X will be computed from the other ones";
-    Modelica.SIunits.Conversions.NonSIunits.Temperature_degC T_degC=
-        Modelica.SIunits.Conversions.to_degC(T)
+
+    Modelica.Units.NonSI.Temperature_degC T_degC=
+        Modelica.Units.Conversions.to_degC(T)
       "Temperature of medium in [degC]";
-    Modelica.SIunits.Conversions.NonSIunits.Pressure_bar p_bar=
-        Modelica.SIunits.Conversions.to_bar(p)
+    Modelica.Units.NonSI.Pressure_bar p_bar=
+        Modelica.Units.Conversions.to_bar(p)
       "Absolute pressure of medium in [bar]";
 
     // Local connector definition, used for equation balancing check
-    connector InputAbsolutePressure = input Modelica.SIunits.AbsolutePressure
+    connector InputAbsolutePressure = input Modelica.Units.SI.AbsolutePressure
       "Pressure as input signal connector";
-    connector InputSpecificEnthalpy = input Modelica.SIunits.SpecificEnthalpy
+    connector InputSpecificEnthalpy = input Modelica.Units.SI.SpecificEnthalpy
       "Specific enthalpy as input signal connector";
-    connector InputMassFraction = input Modelica.SIunits.MassFraction
+    connector InputMassFraction = input Modelica.Units.SI.MassFraction
       "Mass fraction as input signal connector";
-
   equation
     assert(T >= T_min and T <= T_max, "
 Temperature T (= " + String(T) + " K) is not
@@ -77,8 +77,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 (
@@ -98,7 +98,8 @@
 IBPSA.Fluid.MixingVolumes.MixingVolumeMoistAir.
 
 
-"));
+"));
+
 end enthalpyOfLiquid;
   annotation(preferredView="info", Documentation(info="
 

diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/ThermalZones/ReducedOrder/EquivalentAirTemperature/BaseClasses/PartialVDI6007.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/ThermalZones/ReducedOrder/EquivalentAirTemperature/BaseClasses/PartialVDI6007.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/ThermalZones/ReducedOrder/EquivalentAirTemperature/BaseClasses/PartialVDI6007.mo"	2022-03-10 09:57:39.696144342 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/ThermalZones/ReducedOrder/EquivalentAirTemperature/BaseClasses/PartialVDI6007.mo"	2022-03-10 09:58:05.588147622 +0000
@@ -2,30 +2,30 @@
 partial model PartialVDI6007
   "Partial model for equivalent air temperature as defined in VDI 6007 Part 1"
 
-  parameter Modelica.SIunits.Emissivity aExt
+  parameter Modelica.Units.SI.Emissivity aExt
     "Coefficient of absorption of exterior walls (outdoor)";
   parameter Integer n "Number of orientations (without ground)";
   parameter Real wfWall[n](each final unit="1") "Weight factors of the walls";
   parameter Real wfWin[n](each final unit="1") "Weight factors of the windows";
   parameter Real wfGro(unit="1")
     "Weight factor of the ground (0 if not considered)";
-  parameter Modelica.SIunits.Temperature TGro
+  parameter Modelica.Units.SI.Temperature TGro
     "Temperature of the ground in contact with floor plate";
-  parameter Modelica.SIunits.CoefficientOfHeatTransfer alphaWallOut
+  parameter Modelica.Units.SI.CoefficientOfHeatTransfer alphaWallOut
     "Exterior walls convective coefficient of heat transfer (outdoor)";
-  parameter Modelica.SIunits.CoefficientOfHeatTransfer alphaRad
+  parameter Modelica.Units.SI.CoefficientOfHeatTransfer alphaRad
     "Coefficient of heat transfer for linearized radiation";
   parameter Boolean withLongwave=true
     "Set to true to include longwave radiation exchange"
     annotation(choices(checkBox = true));
 
-  Modelica.SIunits.Temperature TEqWall[n] "Equivalent wall temperature";
-  Modelica.SIunits.Temperature TEqWin[n] "Equivalent window temperature";
-  Modelica.SIunits.TemperatureDifference delTEqLW
+  Modelica.Units.SI.Temperature TEqWall[n] "Equivalent wall temperature";
+  Modelica.Units.SI.Temperature TEqWin[n] "Equivalent window temperature";
+  Modelica.Units.SI.TemperatureDifference delTEqLW
     "Equivalent long wave temperature";
-  Modelica.SIunits.TemperatureDifference delTEqLWWin
+  Modelica.Units.SI.TemperatureDifference delTEqLWWin
     "Equivalent long wave temperature for windows";
-  Modelica.SIunits.TemperatureDifference delTEqSW[n]
+  Modelica.Units.SI.TemperatureDifference delTEqSW[n]
     "Equivalent short wave temperature";
 
   Modelica.Blocks.Interfaces.RealInput HSol[n](
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/ThermalZones/ReducedOrder/EquivalentAirTemperature/VDI6007WithWindow.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/ThermalZones/ReducedOrder/EquivalentAirTemperature/VDI6007WithWindow.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/ThermalZones/ReducedOrder/EquivalentAirTemperature/VDI6007WithWindow.mo"	2022-03-10 09:57:39.696144342 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/ThermalZones/ReducedOrder/EquivalentAirTemperature/VDI6007WithWindow.mo"	2022-03-10 09:58:05.516147612 +0000
@@ -3,7 +3,7 @@
   "Equivalent air temperature as defined in VDI 6007 Part 1 with modifications"
   extends BaseClasses.PartialVDI6007;
 
-  parameter Modelica.SIunits.CoefficientOfHeatTransfer alphaWinOut
+  parameter Modelica.Units.SI.CoefficientOfHeatTransfer alphaWinOut
     "Windows' convective coefficient of heat transfer (outdoor)";
 
   Modelica.Blocks.Interfaces.RealOutput TEqAirWin(final unit="K")
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/ThermalZones/ReducedOrder/RC/BaseClasses/ExteriorWall.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/ThermalZones/ReducedOrder/RC/BaseClasses/ExteriorWall.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/ThermalZones/ReducedOrder/RC/BaseClasses/ExteriorWall.mo"	2022-03-10 09:57:39.696144342 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/ThermalZones/ReducedOrder/RC/BaseClasses/ExteriorWall.mo"	2022-03-10 09:58:05.316147588 +0000
@@ -2,19 +2,19 @@
 model ExteriorWall "Exterior wall consisting of variable number of RC elements"
 
   parameter Integer n(min = 1) "Number of RC-elements";
-  parameter Modelica.SIunits.ThermalResistance RExt[n](
+  parameter Modelica.Units.SI.ThermalResistance RExt[n](
     each min=Modelica.Constants.small)
     "Vector of resistors, from port_a to port_b"
     annotation(Dialog(group="Thermal mass"));
-  parameter Modelica.SIunits.ThermalResistance RExtRem(
+  parameter Modelica.Units.SI.ThermalResistance RExtRem(
     min=Modelica.Constants.small)
     "Resistance of remaining resistor RExtRem between capacitor n and port_b"
      annotation(Dialog(group="Thermal mass"));
-  parameter Modelica.SIunits.HeatCapacity CExt[n](
+  parameter Modelica.Units.SI.HeatCapacity CExt[n](
     each min=Modelica.Constants.small)
     "Vector of heat capacities, from port_a to port_b"
     annotation(Dialog(group="Thermal mass"));
-  parameter Modelica.SIunits.Temperature T_start
+  parameter Modelica.Units.SI.Temperature T_start
     "Initial temperature of capacities"
     annotation(Dialog(group="Thermal mass"));
   Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_a port_a "interior port"
@@ -37,23 +37,21 @@
     "single thermal resistor connecting least capacitor to port_b"
     annotation (Placement(transformation(extent={{40,-10},{60,10}})));
 
-equation
-  // Connecting inner elements thermResExt[i]--thermCapExt[i] to n groups
-  for i in 1:n loop
-    connect(thermResExt[i].port_b,thermCapExt[i].port)
-    annotation (Line(points={{-40,0},{0,0},{0,-12}}, color={191,0,0}));
-  end for;
-  // Connecting groups between each other thermCapExt[i] -- thermResExt[i+1]
-  for i in 1:n-1 loop
-    connect(thermCapExt[i].port,thermResExt[i+1].port_a)
-     annotation (Line(points={{0,-12},
-          {-36,-12},{-72,-12},{-72,0},{-60,0}}, color={191,0,0}));
-  end for;
-  // Connecting first RC element to port_a ,
-  // last RC-element to RExtRem and RExtRem to port_b
-  connect(port_a,thermResExt[1].port_a)
-    annotation (Line(points={{-100,0},{-100,0},{-60,0}},
-                                                       color={191,0,0}));
+equation
+// Connecting inner elements thermResExt[i]--thermCapExt[i] to n groups
+  for i in 1:n loop
+    connect(thermResExt[i].port_b, thermCapExt[i].port) annotation(
+      Line(points = {{-40, 0}, {0, 0}, {0, -12}}, color = {191, 0, 0}));
+  end for;
+// Connecting groups between each other thermCapExt[i] -- thermResExt[i+1]
+  for i in 1:n - 1 loop
+    connect(thermCapExt[i].port, thermResExt[i + 1].port_a) annotation(
+      Line(points = {{0, -12}, {-36, -12}, {-72, -12}, {-72, 0}, {-60, 0}}, color = {191, 0, 0}));
+  end for;
+// Connecting first RC element to port_a ,
+// last RC-element to RExtRem and RExtRem to port_b
+  connect(port_a, thermResExt[1].port_a) annotation(
+    Line(points = {{-100, 0}, {-100, 0}, {-60, 0}}, color = {191, 0, 0}));
   connect(thermCapExt[n].port,thermResExtRem.port_a)
   annotation (Line(points={{0,-12},{0,-12},{0,0},{40,0}}, color={191,0,0}));
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/ThermalZones/ReducedOrder/RC/BaseClasses/InteriorWall.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/ThermalZones/ReducedOrder/RC/BaseClasses/InteriorWall.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/ThermalZones/ReducedOrder/RC/BaseClasses/InteriorWall.mo"	2022-03-10 09:57:39.696144342 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/ThermalZones/ReducedOrder/RC/BaseClasses/InteriorWall.mo"	2022-03-10 09:58:05.288147583 +0000
@@ -2,15 +2,15 @@
 model InteriorWall "Interior wall consisting of variable number of RC elements"
 
   parameter Integer n(min = 1) "Number of RC-elements";
-  parameter Modelica.SIunits.ThermalResistance RInt[n](
+  parameter Modelica.Units.SI.ThermalResistance RInt[n](
    each min=Modelica.Constants.small)
     "Vector of resistors, from port to capacitor"
     annotation(Dialog(group="Thermal mass"));
-  parameter Modelica.SIunits.HeatCapacity CInt[n](
+  parameter Modelica.Units.SI.HeatCapacity CInt[n](
    each min=Modelica.Constants.small)
     "Vector of heat capacitors, from port to center"
     annotation(Dialog(group="Thermal mass"));
-  parameter Modelica.SIunits.Temperature T_start
+  parameter Modelica.Units.SI.Temperature T_start
     "Initial temperature of capacities"
     annotation(Dialog(group="Thermal mass"));
   Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_a port_a "interior port"
@@ -25,22 +25,20 @@
     final R=RInt) "vector of resistors connecting port and capacitors"
     annotation (Placement(transformation(extent={{-60,-10},{-40,10}})));
 
-equation
-  // Connecting inner elements thermResInt[i]--thermCapInt[i] to n groups
-  for i in 1:n loop
-    connect(thermResInt[i].port_b,thermCapInt[i].port)
-    annotation (Line(points={{-40,0},{-28,0},{0,0},{0,-12}}, color={191,0,0}));
-  end for;
-  // Connecting groups between each other thermCapInt[i] -- thermResInt[i+1]
-  for i in 1:n-1 loop
-    connect(thermCapInt[i].port,thermResInt[i+1].port_a)
-    annotation (Line(points={{0,-12},
-          {-32,-12},{-70,-12},{-70,0},{-60,0}}, color={191,0,0}));
-  end for;
-  // Connecting first RC element to port_a port_a--thermResInt[1]
-  connect(port_a,thermResInt[1].port_a) annotation (Line(points={{-100,0},{-80,0},
-          {-80,0},{-60,0}},  color={191,0,0}));
-
+equation
+// Connecting inner elements thermResInt[i]--thermCapInt[i] to n groups
+  for i in 1:n loop
+    connect(thermResInt[i].port_b, thermCapInt[i].port) annotation(
+      Line(points = {{-40, 0}, {-28, 0}, {0, 0}, {0, -12}}, color = {191, 0, 0}));
+  end for;
+// Connecting groups between each other thermCapInt[i] -- thermResInt[i+1]
+  for i in 1:n - 1 loop
+    connect(thermCapInt[i].port, thermResInt[i + 1].port_a) annotation(
+      Line(points = {{0, -12}, {-32, -12}, {-70, -12}, {-70, 0}, {-60, 0}}, color = {191, 0, 0}));
+  end for;
+// Connecting first RC element to port_a port_a--thermResInt[1]
+  connect(port_a, thermResInt[1].port_a) annotation(
+    Line(points = {{-100, 0}, {-80, 0}, {-80, 0}, {-60, 0}}, color = {191, 0, 0}));
  annotation(defaultComponentName = "intWalRC",Diagram(coordinateSystem(
   preserveAspectRatio=false,   extent={{-100,-100},{100,120}})),
   Documentation(info="
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/ThermalZones/ReducedOrder/RC/BaseClasses/splitFacVal.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/ThermalZones/ReducedOrder/RC/BaseClasses/splitFacVal.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/ThermalZones/ReducedOrder/RC/BaseClasses/splitFacVal.mo"	2022-03-10 09:57:39.696144342 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/ThermalZones/ReducedOrder/RC/BaseClasses/splitFacVal.mo"	2022-03-10 09:58:05.260147580 +0000
@@ -4,12 +4,12 @@
 
   input Integer nRow "Number of rows";
   input Integer nCol "Number of columns";
-  input Modelica.SIunits.Area[:] AArray "Vector of areas";
-  input Modelica.SIunits.Area[nCol] AExt "Vector of exterior wall areas";
-  input Modelica.SIunits.Area[nCol] AWin "Vector of window areas";
+  input Modelica.Units.SI.Area[:] AArray "Vector of areas";
+  input Modelica.Units.SI.Area[nCol] AExt "Vector of exterior wall areas";
+  input Modelica.Units.SI.Area[nCol] AWin "Vector of window areas";
   output Real[nRow,nCol] splitFacValues "Split factor values for ThermSplitter";
 protected
-  Modelica.SIunits.Area ATot=sum(AArray) "Total area";
+  Modelica.Units.SI.Area ATot=sum(AArray) "Total area";
   Integer j=1 "Row counter";
   Integer k=1 "Column counter";
   Integer l=1 "AArray counter";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/ThermalZones/ReducedOrder/RC/FourElements.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/ThermalZones/ReducedOrder/RC/FourElements.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/ThermalZones/ReducedOrder/RC/FourElements.mo"	2022-03-10 09:57:39.696144342 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/ThermalZones/ReducedOrder/RC/FourElements.mo"	2022-03-10 09:58:05.244147578 +0000
@@ -3,22 +3,22 @@
   interior walls, floor plate and roof"
   extends ThreeElements(AArray={ATotExt,ATotWin,AInt,AFloor,ARoof});
 
-  parameter Modelica.SIunits.Area ARoof "Area of roof"
+  parameter Modelica.Units.SI.Area ARoof "Area of roof"
     annotation(Dialog(group="Roof"));
-  parameter Modelica.SIunits.CoefficientOfHeatTransfer alphaRoof
+  parameter Modelica.Units.SI.CoefficientOfHeatTransfer alphaRoof
     "Convective coefficient of heat transfer of roof (indoor)"
     annotation(Dialog(group="Roof"));
   parameter Integer nRoof(min = 1) "Number of RC-elements of roof"
     annotation(Dialog(group="Roof"));
-  parameter Modelica.SIunits.ThermalResistance RRoof[nExt](
+  parameter Modelica.Units.SI.ThermalResistance RRoof[nExt](
     each min=Modelica.Constants.small)
     "Vector of resistances of roof, from inside to outside"
     annotation(Dialog(group="Roof"));
-  parameter Modelica.SIunits.ThermalResistance RRoofRem(
+  parameter Modelica.Units.SI.ThermalResistance RRoofRem(
     min=Modelica.Constants.small)
     "Resistance of remaining resistor RRoofRem between capacity n and outside"
     annotation(Dialog(group="Roof"));
-  parameter Modelica.SIunits.HeatCapacity CRoof[nExt](
+  parameter Modelica.Units.SI.HeatCapacity CRoof[nExt](
     each min=Modelica.Constants.small)
     "Vector of heat capacities of roof, from inside to outside"
     annotation(Dialog(group="Roof"));
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/ThermalZones/ReducedOrder/RC/OneElement.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/ThermalZones/ReducedOrder/RC/OneElement.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/ThermalZones/ReducedOrder/RC/OneElement.mo"	2022-03-10 09:57:39.696144342 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/ThermalZones/ReducedOrder/RC/OneElement.mo"	2022-03-10 09:58:05.128147563 +0000
@@ -2,9 +2,9 @@
 model OneElement "Thermal Zone with one element for exterior walls"
   extends IBPSA.Fluid.Interfaces.LumpedVolumeDeclarations;
 
-  parameter Modelica.SIunits.Volume VAir "Air volume of the zone"
+  parameter Modelica.Units.SI.Volume VAir "Air volume of the zone"
     annotation(Dialog(group="Thermal zone"));
-  parameter Modelica.SIunits.CoefficientOfHeatTransfer alphaRad
+  parameter Modelica.Units.SI.CoefficientOfHeatTransfer alphaRad
     "Coefficient of heat transfer for linearized radiation exchange between walls"
     annotation(Dialog(group="Thermal zone"));
   parameter Integer nOrientations(min=1) "Number of orientations"
@@ -12,18 +12,18 @@
   parameter Integer nPorts=0 "Number of fluid ports"
     annotation(Evaluate=true,
     Dialog(connectorSizing=true, tab="General",group="Ports"));
-  parameter Modelica.SIunits.Area AWin[nOrientations]
+  parameter Modelica.Units.SI.Area AWin[nOrientations]
     "Vector of areas of windows by orientations"
     annotation(Dialog(group="Windows"));
-  parameter Modelica.SIunits.Area ATransparent[nOrientations] "Vector of areas of transparent (solar radiation transmittend) elements by
+  parameter Modelica.Units.SI.Area ATransparent[nOrientations] "Vector of areas of transparent (solar radiation transmittend) elements by
     orientations"
     annotation(Dialog(group="Windows"));
-  parameter Modelica.SIunits.CoefficientOfHeatTransfer alphaWin
+  parameter Modelica.Units.SI.CoefficientOfHeatTransfer alphaWin
     "Convective coefficient of heat transfer of windows (indoor)"
     annotation(Dialog(group="Windows"));
-  parameter Modelica.SIunits.ThermalResistance RWin "Resistor for windows"
+  parameter Modelica.Units.SI.ThermalResistance RWin "Resistor for windows"
     annotation(Dialog(group="Windows"));
-  parameter Modelica.SIunits.TransmissionCoefficient gWin
+  parameter Modelica.Units.SI.TransmissionCoefficient gWin
     "Total energy transmittance of windows"
     annotation(Dialog(group="Windows"));
   parameter Real ratioWinConRad
@@ -32,23 +32,23 @@
   parameter Boolean indoorPortWin = false
     "Additional heat port at indoor surface of windows"
     annotation(Dialog(group="Windows"),choices(checkBox = true));
-  parameter Modelica.SIunits.Area AExt[nOrientations]
+  parameter Modelica.Units.SI.Area AExt[nOrientations]
     "Vector of areas of exterior walls by orientations"
     annotation(Dialog(group="Exterior walls"));
-  parameter Modelica.SIunits.CoefficientOfHeatTransfer alphaExt
+  parameter Modelica.Units.SI.CoefficientOfHeatTransfer alphaExt
     "Convective coefficient of heat transfer of exterior walls (indoor)"
     annotation(Dialog(group="Exterior walls"));
   parameter Integer nExt(min = 1) "Number of RC-elements of exterior walls"
     annotation(Dialog(group="Exterior walls"));
-  parameter Modelica.SIunits.ThermalResistance RExt[nExt](
+  parameter Modelica.Units.SI.ThermalResistance RExt[nExt](
     each min=Modelica.Constants.small)
     "Vector of resistances of exterior walls, from inside to outside"
     annotation(Dialog(group="Exterior walls"));
-  parameter Modelica.SIunits.ThermalResistance RExtRem(
+  parameter Modelica.Units.SI.ThermalResistance RExtRem(
     min=Modelica.Constants.small)
     "Resistance of remaining resistor RExtRem between capacity n and outside"
     annotation(Dialog(group="Exterior walls"));
-  parameter Modelica.SIunits.HeatCapacity CExt[nExt](
+  parameter Modelica.Units.SI.HeatCapacity CExt[nExt](
     each min=Modelica.Constants.small)
     "Vector of heat capacities of exterior walls, from inside to outside"
     annotation(Dialog(group="Exterior walls"));
@@ -166,12 +166,12 @@
     annotation (Placement(transformation(extent={{-158,-50},{-178,-28}})));
 
 protected
-  parameter Modelica.SIunits.Area ATot=sum(AArray) "Sum of wall surface areas";
-  parameter Modelica.SIunits.Area ATotExt=sum(AExt)
+  parameter Modelica.Units.SI.Area ATot=sum(AArray) "Sum of wall surface areas";
+  parameter Modelica.Units.SI.Area ATotExt=sum(AExt)
     "Sum of exterior wall surface areas";
-  parameter Modelica.SIunits.Area ATotWin=sum(AWin)
+  parameter Modelica.Units.SI.Area ATotWin=sum(AWin)
     "Sum of window surface areas";
-  parameter Modelica.SIunits.Area[:] AArray = {ATotExt, ATotWin}
+  parameter Modelica.Units.SI.Area[:] AArray = {ATotExt, ATotWin}
     "List of all wall surface areas";
   parameter Integer dimension = sum({if A>0 then 1 else 0 for A in AArray})
     "Number of non-zero wall surface areas";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/ThermalZones/ReducedOrder/RC/ThreeElements.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/ThermalZones/ReducedOrder/RC/ThreeElements.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/ThermalZones/ReducedOrder/RC/ThreeElements.mo"	2022-03-10 09:57:39.696144342 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/ThermalZones/ReducedOrder/RC/ThreeElements.mo"	2022-03-10 09:58:05.056147555 +0000
@@ -3,22 +3,22 @@
   interior walls and floor plate"
     extends TwoElements(AArray={ATotExt,ATotWin,AInt,AFloor});
 
-  parameter Modelica.SIunits.Area AFloor "Area of floor plate"
+  parameter Modelica.Units.SI.Area AFloor "Area of floor plate"
     annotation(Dialog(group="Floor plate"));
-  parameter Modelica.SIunits.CoefficientOfHeatTransfer alphaFloor
+  parameter Modelica.Units.SI.CoefficientOfHeatTransfer alphaFloor
     "Convective coefficient of heat transfer of floor plate (indoor)"
     annotation(Dialog(group="Floor plate"));
   parameter Integer nFloor(min = 1) "Number of RC-elements of floor plate"
     annotation(Dialog(group="Floor plate"));
-  parameter Modelica.SIunits.ThermalResistance RFloor[nExt](
+  parameter Modelica.Units.SI.ThermalResistance RFloor[nExt](
     each min=Modelica.Constants.small)
     "Vector of resistances of floor plate, from inside to outside"
     annotation(Dialog(group="Floor plate"));
-  parameter Modelica.SIunits.ThermalResistance RFloorRem(
+  parameter Modelica.Units.SI.ThermalResistance RFloorRem(
     min=Modelica.Constants.small)
     "Resistance of remaining resistor RFloorRem between capacity n and outside"
     annotation(Dialog(group="Floor plate"));
-  parameter Modelica.SIunits.HeatCapacity CFloor[nExt](
+  parameter Modelica.Units.SI.HeatCapacity CFloor[nExt](
     each min=Modelica.Constants.small)
     "Vector of heat capacities of floor plate, from inside to outside"
     annotation(Dialog(group="Floor plate"));
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/ThermalZones/ReducedOrder/RC/TwoElements.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/ThermalZones/ReducedOrder/RC/TwoElements.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/ThermalZones/ReducedOrder/RC/TwoElements.mo"	2022-03-10 09:57:39.696144342 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/ThermalZones/ReducedOrder/RC/TwoElements.mo"	2022-03-10 09:58:05.004147547 +0000
@@ -3,18 +3,18 @@
   "Thermal Zone with two elements for exterior and interior walls"
   extends OneElement(AArray={ATotExt,ATotWin,AInt});
 
-  parameter Modelica.SIunits.Area AInt "Area of interior walls"
+  parameter Modelica.Units.SI.Area AInt "Area of interior walls"
     annotation(Dialog(group="Interior walls"));
-  parameter Modelica.SIunits.CoefficientOfHeatTransfer alphaInt
+  parameter Modelica.Units.SI.CoefficientOfHeatTransfer alphaInt
     "Convective coefficient of heat transfer of interior walls (indoor)"
     annotation(Dialog(group="Interior walls"));
   parameter Integer nInt(min = 1) "Number of RC-elements of interior walls"
     annotation(Dialog(group="Interior walls"));
-  parameter Modelica.SIunits.ThermalResistance RInt[nInt](
+  parameter Modelica.Units.SI.ThermalResistance RInt[nInt](
     each min=Modelica.Constants.small)
     "Vector of resistances of interior walls, from port to center"
     annotation(Dialog(group="Interior walls"));
-  parameter Modelica.SIunits.HeatCapacity CInt[nInt](
+  parameter Modelica.Units.SI.HeatCapacity CInt[nInt](
     each min=Modelica.Constants.small)
     "Vector of heat capacities of interior walls, from port to center"
     annotation(Dialog(group="Interior walls"));
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/ThermalZones/ReducedOrder/SolarGain/BaseClasses/PartialCorrectionG.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/ThermalZones/ReducedOrder/SolarGain/BaseClasses/PartialCorrectionG.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/ThermalZones/ReducedOrder/SolarGain/BaseClasses/PartialCorrectionG.mo"	2022-03-10 09:57:39.696144342 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/ThermalZones/ReducedOrder/SolarGain/BaseClasses/PartialCorrectionG.mo"	2022-03-10 09:58:04.920147537 +0000
@@ -3,7 +3,7 @@
   "Partial model for correction of the solar gain factor"
 
   parameter Integer n(min = 1) "Vector size for input and output";
-  parameter Modelica.SIunits.CoefficientOfHeatTransfer UWin
+  parameter Modelica.Units.SI.CoefficientOfHeatTransfer UWin
     "Thermal transmission coefficient of whole window";
 
   Modelica.Blocks.Interfaces.RealInput HSkyDifTil[n](
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/ThermalZones/ReducedOrder/SolarGain/CorrectionGDoublePane.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/ThermalZones/ReducedOrder/SolarGain/CorrectionGDoublePane.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/ThermalZones/ReducedOrder/SolarGain/CorrectionGDoublePane.mo"	2022-03-10 09:57:39.696144342 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/ThermalZones/ReducedOrder/SolarGain/CorrectionGDoublePane.mo"	2022-03-10 09:58:04.896147534 +0000
@@ -2,10 +2,10 @@
 model CorrectionGDoublePane
   "Double pane window solar correction"
   extends BaseClasses.PartialCorrectionG;
-  import con = Modelica.SIunits.Conversions;
+  import con = Modelica.Units.Conversions;
 
-  // Parameters for the transmission correction factor based on VDI 6007 Part 3
-  // A0 to A6 are experimental constants VDI 6007 Part 3 page 20
+// Parameters for the transmission correction factor based on VDI 6007 Part 3
+  // A0 to A6 are experimental constants VDI 6007 Part 3 page 20
 protected
   parameter Real A0=0.918 "Constant 0 to calculate reference transmission";
   parameter Real A1=2.21*10^(-4)
@@ -20,65 +20,65 @@
     "Constant 5 to calculate reference transmission";
   parameter Real A6=4.74*10^(-12)
     "Constant 6 to calculate reference transmission";
-  parameter Modelica.SIunits.TransmissionCoefficient g_dir0=0.7537
+  parameter Modelica.Units.SI.TransmissionCoefficient g_dir0=0.7537
     "Reference vertical parallel transmission coefficient for direct radiation
     for double pane window";
-  parameter Modelica.SIunits.TransmissionCoefficient Ta_diff = 0.84
+  parameter Modelica.Units.SI.TransmissionCoefficient Ta_diff = 0.84
     "Energetic degree of transmission for diffuse radiation for uniformly
     overcast sky";
-  parameter Modelica.SIunits.TransmissionCoefficient Tai_diff=0.903
+  parameter Modelica.Units.SI.TransmissionCoefficient Tai_diff=0.903
     "Pure degree of transmission for diffuse radiation";
-  parameter Modelica.SIunits.TransmissionCoefficient Ta1_diff= Ta_diff*Tai_diff
+  parameter Modelica.Units.SI.TransmissionCoefficient Ta1_diff= Ta_diff*Tai_diff
     "Degreee of transmission for single pane window";
-  parameter Modelica.SIunits.ReflectionCoefficient rho_T1_diff=1-(Ta_diff)
+  parameter Modelica.Units.SI.ReflectionCoefficient rho_T1_diff=1-(Ta_diff)
     "Part of degree of transmission for single pane window related to Ta1_diff";
-  parameter Modelica.SIunits.ReflectionCoefficient rho_11_diff=rho_T1_diff/
+  parameter Modelica.Units.SI.ReflectionCoefficient rho_11_diff=rho_T1_diff/
     (2-(rho_T1_diff))
     "Part of degree of transmission for single pane window
     related to rho_T1_diff";
-  parameter Modelica.SIunits.ReflectionCoefficient rho_1_diff= rho_11_diff+
+  parameter Modelica.Units.SI.ReflectionCoefficient rho_1_diff= rho_11_diff+
     (((1-rho_11_diff)*Tai_diff)^2*rho_11_diff)/(1-(rho_11_diff*Tai_diff)^2)
     "Degree of reflection for single pane window";
-  parameter Modelica.SIunits.ReflectionCoefficient XN2_diff=1-rho_1_diff^2
+  parameter Modelica.Units.SI.ReflectionCoefficient XN2_diff=1-rho_1_diff^2
     "Calculation factor to simplify equations";
-  parameter Modelica.SIunits.TransmissionCoefficient Ta2_diff=(Ta1_diff^2)/
+  parameter Modelica.Units.SI.TransmissionCoefficient Ta2_diff=(Ta1_diff^2)/
     XN2_diff "Energetic dregree of transmission for second pane";
-  parameter Modelica.SIunits.Emissivity a1_diff=1-Ta1_diff-rho_1_diff
+  parameter Modelica.Units.SI.Emissivity a1_diff=1-Ta1_diff-rho_1_diff
     "Degree of absorption for single pane window";
-  parameter Modelica.SIunits.CoefficientOfHeatTransfer Q21_diff=
+  parameter Modelica.Units.SI.CoefficientOfHeatTransfer Q21_diff=
     a1_diff*(1+(Ta1_diff*rho_1_diff/XN2_diff))*UWin/25
     "Coefficient of heat transfer for exterior pane of double pane window";
-  parameter Modelica.SIunits.CoefficientOfHeatTransfer Q22_diff=
+  parameter Modelica.Units.SI.CoefficientOfHeatTransfer Q22_diff=
     a1_diff*(Ta1_diff/XN2_diff)*(1-(UWin/7.7))
     "Coefficient of heat transfer for interior pane of double pane window";
-  parameter Modelica.SIunits.CoefficientOfHeatTransfer Qsek2_diff=
+  parameter Modelica.Units.SI.CoefficientOfHeatTransfer Qsek2_diff=
     Q21_diff+Q22_diff
     "Overall coefficient of heat transfer for double pane window";
-  parameter Modelica.SIunits.TransmissionCoefficient CorG_diff=
+  parameter Modelica.Units.SI.TransmissionCoefficient CorG_diff=
     (Ta2_diff+Qsek2_diff)/g_dir0
     "Transmission coefficient correction factor for diffuse radiation";
-  parameter Modelica.SIunits.TransmissionCoefficient CorG_gr=
+  parameter Modelica.Units.SI.TransmissionCoefficient CorG_gr=
     (Ta2_diff+Qsek2_diff)/g_dir0
     "Transmission coefficient correction factor for irradiations from ground";
 
   //Calculating the correction factor for direct solar radiation
-  Modelica.SIunits.TransmissionCoefficient[n] Ta_dir
+  Modelica.Units.SI.TransmissionCoefficient[n] Ta_dir
     "Energetic degree of transmission for direct radiation";
-  Modelica.SIunits.TransmissionCoefficient[n] Tai_dir
+  Modelica.Units.SI.TransmissionCoefficient[n] Tai_dir
     "Pure degree of transmission for direct radiation";
-  Modelica.SIunits.TransmissionCoefficient[n] Ta1_dir
+  Modelica.Units.SI.TransmissionCoefficient[n] Ta1_dir
     "Pure degree of transmission for single pane window";
-  Modelica.SIunits.ReflectionCoefficient[n] rho_T1_dir
+  Modelica.Units.SI.ReflectionCoefficient[n] rho_T1_dir
     "Part of degree of transmission for single pane window related to Ta1_dir";
-  Modelica.SIunits.ReflectionCoefficient[n] rho_11_dir
+  Modelica.Units.SI.ReflectionCoefficient[n] rho_11_dir
     "Part of degree of transmission for single pane window related to T1_dir";
-  Modelica.SIunits.ReflectionCoefficient[n] rho_1_dir
+  Modelica.Units.SI.ReflectionCoefficient[n] rho_1_dir
     "Degree of reflection for single pane window";
-  Modelica.SIunits.ReflectionCoefficient[n] XN2_dir
+  Modelica.Units.SI.ReflectionCoefficient[n] XN2_dir
     "Calculation factor to simplify equations";
-  Modelica.SIunits.TransmissionCoefficient[n] Ta2_dir
+  Modelica.Units.SI.TransmissionCoefficient[n] Ta2_dir
     "Energetic dregree of transmission for second pane";
-  Modelica.SIunits.Emissivity[n] a1_dir
+  Modelica.Units.SI.Emissivity[n] a1_dir
     "Degree of absorption for single pane window";
   Real[n] Q21_dir
     "Coefficient of heat transfer for exterior pane of double pane window";
@@ -86,7 +86,7 @@
     "Coefficient of heat transfer for interior pane of double pane window";
   Real[n] Qsek2_dir
     "Overall coefficient of heat transfer for double pane window";
-  Modelica.SIunits.TransmissionCoefficient[n] CorG_dir
+  Modelica.Units.SI.TransmissionCoefficient[n] CorG_dir
     "Transmission coefficient correction factor for direct radiation";
 
 equation
@@ -106,8 +106,7 @@
     Qsek2_dir[i]=Q21_dir[i]+Q22_dir[i];
     Ta2_dir[i]= Ta1_dir[i]^2/XN2_dir[i];
     CorG_dir[i]= (Ta2_dir[i]+Qsek2_dir[i])/g_dir0;
-
-    //Calculating the input thermal energy due to solar radiation
+//Calculating the input thermal energy due to solar radiation
     solarRadWinTrans[i] = ((HDirTil[i]*CorG_dir[i])+(HSkyDifTil[i]*CorG_diff)+
     (HGroDifTil[i]*CorG_gr));
   end for;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/ThermalZones/ReducedOrder/Validation/VDI6007/BaseClasses/VerifyDifferenceThreePeriods.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/ThermalZones/ReducedOrder/Validation/VDI6007/BaseClasses/VerifyDifferenceThreePeriods.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/ThermalZones/ReducedOrder/Validation/VDI6007/BaseClasses/VerifyDifferenceThreePeriods.mo"	2022-03-10 09:57:39.696144342 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/ThermalZones/ReducedOrder/Validation/VDI6007/BaseClasses/VerifyDifferenceThreePeriods.mo"	2022-03-10 09:58:04.816147525 +0000
@@ -2,15 +2,15 @@
 block VerifyDifferenceThreePeriods "Assert when condition is violated"
   extends IBPSA.Utilities.Diagnostics.BaseClasses.PartialInputCheck(
      message="Inputs differ by more than threShold.\n  Check output 'satisfied' for when violation(s) happened.");
-  parameter Modelica.SIunits.Time endTime = 0
+  parameter Modelica.Units.SI.Time endTime = 0
     "Start time for deactivating the assert (period one)";
-  parameter Modelica.SIunits.Time startTime2 = 0
+  parameter Modelica.Units.SI.Time startTime2 = 0
     "Start time for activating the assert (period two)";
-  parameter Modelica.SIunits.Time endTime2 = 0
+  parameter Modelica.Units.SI.Time endTime2 = 0
     "Start time for deactivating the assert (period two)";
-  parameter Modelica.SIunits.Time startTime3 = 0
+  parameter Modelica.Units.SI.Time startTime3 = 0
     "Start time for activating the assert (period three)";
-  parameter Modelica.SIunits.Time endTime3 = 0
+  parameter Modelica.Units.SI.Time endTime3 = 0
     "Start time for deactivating the assert (period three)";
 
   Modelica.Blocks.Interfaces.BooleanOutput satisfied(start=true, fixed=true)
@@ -20,15 +20,15 @@
     annotation (Placement(transformation(extent={{100,42},{140,82}}),
         iconTransformation(extent={{100,42},{140,82}})));
 protected
-  parameter Modelica.SIunits.Time t1(fixed=false)
+  parameter Modelica.Units.SI.Time t1(fixed=false)
     "Simulation end time period one";
-  parameter Modelica.SIunits.Time t3(fixed=false)
+  parameter Modelica.Units.SI.Time t3(fixed=false)
     "Simulation end time period two";
-  parameter Modelica.SIunits.Time t5(fixed=false)
+  parameter Modelica.Units.SI.Time t5(fixed=false)
     "Simulation end time period three";
-  parameter Modelica.SIunits.Time t2(fixed=false)
+  parameter Modelica.Units.SI.Time t2(fixed=false)
     "Simulation start time period two";
-  parameter Modelica.SIunits.Time t4(fixed=false)
+  parameter Modelica.Units.SI.Time t4(fixed=false)
     "Simulation start time period three";
   Integer nFai "Number of test violations";
 
@@ -39,22 +39,20 @@
   t4 = time + startTime3;
   t5 = time + endTime3;
   nFai = 0;
-equation
-  if (time >= t0) and (time < t1) or
-     (time >= t2) and (time < t3) or
-     (time >= t4) and (time < t5) then
-     diff = abs(u1 - u2);
-  else
-    diff = 0; // Test is not needed in this time domain
-  end if;
-  // Output whether test is satisfied, using a small hysteresis that is scaled using threShold
-  satisfied = not ( (pre(satisfied) and diff > 1.01*threShold) or (not pre(satisfied) and diff >= 0.99*threShold));
-
-  // Count the number of failures and raise an assertion in the terminal section.
-  // This ensures that if the model is in an FMU, no asserts are triggered during
-  // the solver iterations.
-  when not satisfied then
-    nFai = pre(nFai) + 1;
+equation
+  if time >= t0 and time < t1 or time >= t2 and time < t3 or time >= t4 and time < t5 then
+    diff = abs(u1 - u2);
+  else
+    diff = 0;
+// Test is not needed in this time domain
+  end if;
+// Output whether test is satisfied, using a small hysteresis that is scaled using threShold
+  satisfied = not (pre(satisfied) and diff > 1.01 * threShold or not pre(satisfied) and diff >= 0.99 * threShold);
+// Count the number of failures and raise an assertion in the terminal section.
+// This ensures that if the model is in an FMU, no asserts are triggered during
+// the solver iterations.
+  when not satisfied then
+    nFai = pre(nFai) + 1;
   end when;
 
   when terminal() then
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Types/Azimuth/package.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Types/Azimuth/package.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Types/Azimuth/package.mo"	2022-03-10 09:57:39.700144341 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Types/Azimuth/package.mo"	2022-03-10 09:58:04.300147459 +0000
@@ -2,15 +2,15 @@
 package Azimuth "List of possible constant values for surface azimuth"
    extends Modelica.Icons.TypesPackage;
 
-   constant Modelica.SIunits.Angle E = -Modelica.Constants.pi/2
+
+   constant Modelica.Units.SI.Angle E = -Modelica.Constants.pi/2
   "Azimuth for an exterior wall whose outer surface faces east";
-   constant Modelica.SIunits.Angle N = Modelica.Constants.pi
+   constant Modelica.Units.SI.Angle N = Modelica.Constants.pi
   "Azimuth for an exterior wall whose outer surface faces north";
-   constant Modelica.SIunits.Angle S = 0
+   constant Modelica.Units.SI.Angle S = 0
   "Azimuth for an exterior wall whose outer surface faces south";
-   constant Modelica.SIunits.Angle W = +Modelica.Constants.pi/2
+   constant Modelica.Units.SI.Angle W = +Modelica.Constants.pi/2
   "Azimuth for an exterior wall whose outer surface faces west";
-
   annotation(preferredView="info",
 Documentation(info="
 

diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Types/Tilt/package.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Types/Tilt/package.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Types/Tilt/package.mo"	2022-03-10 09:57:39.700144341 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Types/Tilt/package.mo"	2022-03-10 09:58:04.272147456 +0000
@@ -2,10 +2,10 @@
 package Tilt "List of possible constant values for surface tilt"
   extends Modelica.Icons.TypesPackage;
 
-  constant Modelica.SIunits.Angle Ceiling = 0 "Tilt for ceiling";
-  constant Modelica.SIunits.Angle Floor =   Modelica.Constants.pi
+  constant Modelica.Units.SI.Angle Ceiling = 0 "Tilt for ceiling";
+  constant Modelica.Units.SI.Angle Floor =   Modelica.Constants.pi
   "Tilt for floor";
-  constant Modelica.SIunits.Angle Wall =    Modelica.Constants.pi/2
+  constant Modelica.Units.SI.Angle Wall =    Modelica.Constants.pi/2
   "Tilt for wall";
 
 annotation(preferredView="info", Documentation(info="
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Cryptographics/Validation/SHA1.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Cryptographics/Validation/SHA1.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Cryptographics/Validation/SHA1.mo"	2022-03-10 09:57:39.700144341 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Cryptographics/Validation/SHA1.mo"	2022-03-10 09:58:04.216147449 +0000
@@ -2,7 +2,7 @@
 model SHA1 "Model that verifies the SHA1 encryption C function"
   extends Modelica.Icons.Example;
 
-  //Test strings
+//Test strings
   parameter String strIn1 = "abc"
     "First test string";
   parameter String strIn2 = ""
@@ -15,7 +15,7 @@
     string="aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa")
     "Fifth test string";
 
-  //Expected outputs
+//Expected outputs
   parameter String strEx1=
     "a9993e364706816aba3e25717850c26c9cd0d89d"
     "Encryption result of first string";
@@ -32,9 +32,9 @@
     "34aa973cd4c4daa4f61eeb2bdbad27316534016f"
     "Encryption result of fifth string";
 
-  //Comparison results
-  Boolean cmp1,cmp2,cmp3,cmp4,cmp5,cmpAll;
 
+//Comparison results
+  Boolean cmp1,cmp2,cmp3,cmp4,cmp5,cmpAll;
 equation
   cmp1 = Modelica.Utilities.Strings.isEqual(
             IBPSA.Utilities.Cryptographics.sha(strIn1),
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Diagnostics/BaseClasses/PartialInputCheck.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Diagnostics/BaseClasses/PartialInputCheck.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Diagnostics/BaseClasses/PartialInputCheck.mo"	2022-03-10 09:57:39.700144341 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Diagnostics/BaseClasses/PartialInputCheck.mo"	2022-03-10 09:58:04.172147443 +0000
@@ -1,7 +1,7 @@
 within BuildSysPro.IBPSA.Utilities.Diagnostics.BaseClasses;
 block PartialInputCheck "Assert when condition is violated"
   extends Modelica.Blocks.Icons.Block;
-  parameter Modelica.SIunits.Time startTime = 0
+  parameter Modelica.Units.SI.Time startTime = 0
     "Start time for activating the assert";
   parameter Real threShold(min=0)=1E-2 "Threshold for equality comparison";
   parameter String message = "Inputs differ by more than threShold";
@@ -10,7 +10,7 @@
   Modelica.Blocks.Interfaces.RealInput u2 "Value to check"
        annotation (Placement(transformation(extent={{-140,-80},{-100,-40}})));
 protected
-  parameter Modelica.SIunits.Time t0( fixed=false) "Simulation start time";
+  parameter Modelica.Units.SI.Time t0( fixed=false) "Simulation start time";
 initial equation
   t0 = time + startTime;
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Diagnostics/Validation/CheckEquality.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Diagnostics/Validation/CheckEquality.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Diagnostics/Validation/CheckEquality.mo"	2022-03-10 09:57:39.700144341 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Diagnostics/Validation/CheckEquality.mo"	2022-03-10 09:58:04.076147431 +0000
@@ -7,7 +7,7 @@
     annotation (Placement(transformation(extent={{20,10},{40,30}})));
   Modelica.Blocks.Sources.Constant con(k=0.1) "Input"
     annotation (Placement(transformation(extent={{-60,30},{-40,50}})));
-  Modelica.Blocks.Sources.Sine sin1(freqHz=1, amplitude=0.03)
+  Modelica.Blocks.Sources.Sine sin1(f =1, amplitude=0.03)
     "Input"
     annotation (Placement(transformation(extent={{-60,-10},{-40,10}})));
   Modelica.Blocks.Math.Add add "Adder to offset the sin input signal"
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/IO/Files/BaseClasses/FileWriter.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/IO/Files/BaseClasses/FileWriter.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/IO/Files/BaseClasses/FileWriter.mo"	2022-03-10 09:57:39.700144341 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/IO/Files/BaseClasses/FileWriter.mo"	2022-03-10 09:58:04.040147426 +0000
@@ -7,7 +7,7 @@
     annotation(Evaluate=true, Dialog(connectorSizing=true));
   parameter String fileName = getInstanceName() + ".csv"
     "File name, including extension";
-  parameter Modelica.SIunits.Time samplePeriod
+  parameter Modelica.Units.SI.Time samplePeriod
     "Sample period: equidistant interval for which the inputs are saved";
   parameter String delimiter = "\t"
     "Delimiter for csv file"
@@ -26,7 +26,7 @@
   parameter Boolean isCombiTimeTable = false
     "=true, if CombiTimeTable header should be prepended upon destruction"
     annotation(Evaluate=true);
-  parameter Modelica.SIunits.Time t0(fixed=false)
+  parameter Modelica.Units.SI.Time t0(fixed=false)
     "First sample time instant";
   parameter String insNam = getInstanceName() "Instance name";
   IBPSA.Utilities.IO.Files.BaseClasses.FileWriterObject filWri=
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/IO/Files/Examples/BaseClasses/PartialCSV.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/IO/Files/Examples/BaseClasses/PartialCSV.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/IO/Files/Examples/BaseClasses/PartialCSV.mo"	2022-03-10 09:57:39.700144341 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/IO/Files/Examples/BaseClasses/PartialCSV.mo"	2022-03-10 09:58:03.980147418 +0000
@@ -1,7 +1,7 @@
 within BuildSysPro.IBPSA.Utilities.IO.Files.Examples.BaseClasses;
 model PartialCSV "Base model for CSV reader and writer example"
   extends Modelica.Icons.Example;
-  Modelica.Blocks.Sources.Cosine cos(freqHz=0.345) "Cosine"
+  Modelica.Blocks.Sources.Cosine cos(f =0.345) "Cosine"
     annotation (Placement(transformation(extent={{-80,20},{-60,40}})));
   Modelica.Blocks.Sources.Step step(startTime=5) "Step function"
     annotation (Placement(transformation(extent={{-80,-40},{-60,-20}})));
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Math/Examples/SmoothBlocks.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Math/Examples/SmoothBlocks.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Math/Examples/SmoothBlocks.mo"	2022-03-10 09:57:39.700144341 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Math/Examples/SmoothBlocks.mo"	2022-03-10 09:58:03.536147362 +0000
@@ -5,9 +5,9 @@
             -20,40},{0,60}})));
   Modelica.Blocks.Math.Max max annotation (Placement(transformation(extent={{
             -20,0},{0,20}})));
-  Modelica.Blocks.Sources.Sine sine(freqHz=8)
+  Modelica.Blocks.Sources.Sine sine(f =8)
     annotation (Placement(transformation(extent={{-80,60},{-60,80}})));
-  Modelica.Blocks.Sources.Sine sine1(freqHz=1)
+  Modelica.Blocks.Sources.Sine sine1(f =1)
                                      annotation (Placement(transformation(
           extent={{-100,0},{-80,20}})));
   Diagnostics.AssertEquality assEquMax(threShold=0.08)
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Math/Examples/SmoothLimit.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Math/Examples/SmoothLimit.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Math/Examples/SmoothLimit.mo"	2022-03-10 09:57:39.700144341 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Math/Examples/SmoothLimit.mo"	2022-03-10 09:58:03.500147357 +0000
@@ -1,7 +1,7 @@
 within BuildSysPro.IBPSA.Utilities.Math.Examples;
 model SmoothLimit "Test model for smooth limit"
   extends Modelica.Icons.Example;
-  Modelica.Blocks.Sources.Sine sine(freqHz=8)
+  Modelica.Blocks.Sources.Sine sine(f =8)
     annotation (Placement(transformation(extent={{-40,0},{-20,20}})));
   IBPSA.Utilities.Math.SmoothLimit smoLim(
     deltaX=0.001,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Math/Examples/Splice.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Math/Examples/Splice.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Math/Examples/Splice.mo"	2022-03-10 09:57:39.700144341 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Math/Examples/Splice.mo"	2022-03-10 09:58:03.488147355 +0000
@@ -3,7 +3,7 @@
   extends Modelica.Icons.Example;
   IBPSA.Utilities.Math.Splice splice(deltax=0.2)
     annotation (Placement(transformation(extent={{0,0},{20,20}})));
-  Modelica.Blocks.Sources.Sine sine(freqHz=0.5)
+  Modelica.Blocks.Sources.Sine sine(f =0.5)
     annotation (Placement(transformation(extent={{-60,0},{-40,20}})));
   Modelica.Blocks.Sources.Constant const1(k=-0.5)
     annotation (Placement(transformation(extent={{-60,-40},{-40,-20}})));
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Math/Examples/VectorFunctions.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Math/Examples/VectorFunctions.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Math/Examples/VectorFunctions.mo"	2022-03-10 09:57:39.700144341 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Math/Examples/VectorFunctions.mo"	2022-03-10 09:58:03.476147355 +0000
@@ -4,12 +4,12 @@
 
   IBPSA.Utilities.Math.Min minVec(nin=3)
     annotation (Placement(transformation(extent={{-20,20},{0,40}})));
-  Modelica.Blocks.Sources.Sine sine(freqHz=6)
+  Modelica.Blocks.Sources.Sine sine(f =6)
     annotation (Placement(transformation(extent={{-80,20},{-60,40}})));
   Modelica.Blocks.Sources.Sine sine1(
-                                    freqHz=8)
+                                    f =8)
     annotation (Placement(transformation(extent={{-80,-20},{-60,0}})));
-  Modelica.Blocks.Sources.Sine sine2(freqHz=10)
+  Modelica.Blocks.Sources.Sine sine2(f =10)
     annotation (Placement(transformation(extent={{-80,-60},{-60,-40}})));
   IBPSA.Utilities.Math.Max maxVec(nin=3)
     annotation (Placement(transformation(extent={{-20,-60},{0,-40}})));
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Math/Functions/BaseClasses/smoothTransition.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Math/Functions/BaseClasses/smoothTransition.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Math/Functions/BaseClasses/smoothTransition.mo"	2022-03-10 09:57:39.700144341 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Math/Functions/BaseClasses/smoothTransition.mo"	2022-03-10 09:58:03.296147331 +0000
@@ -3,9 +3,9 @@
   "Twice continuously differentiable transition between the regions"
   extends Modelica.Icons.Function;
 
-  // The function that transitions between the regions is implemented
-  // using its own function. This allows Dymola 2016 to inline the function
-  // inverseXRegularized.
+// The function that transitions between the regions is implemented
+  // using its own function. This allows Dymola 2016 to inline the function
+  // inverseXRegularized.
 
 input Real x "Abscissa value";
 input Real delta(min=Modelica.Constants.eps)
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Math/Functions/Examples/CubicHermite.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Math/Functions/Examples/CubicHermite.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Math/Functions/Examples/CubicHermite.mo"	2022-03-10 09:57:39.700144341 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Math/Functions/Examples/CubicHermite.mo"	2022-03-10 09:58:03.172147315 +0000
@@ -13,7 +13,7 @@
   Real yMonotone "Dependent variable with monotone interpolation";
   Integer i "Integer to select data interval";
 initial algorithm
-  // Get the derivative values at the support points
+// Get the derivative values at the support points
   d := IBPSA.Utilities.Math.Functions.splineDerivatives(
               x=xd,
               y=yd,
@@ -23,24 +23,17 @@
               y=yd,
               ensureMonotonicity=true);
 algorithm
-  x := xd[1] + time*1.2*(xd[size(xd, 1)] - xd[1]) - 0.5;
-  // i is a counter that is used to pick the derivative of d or dMonotonic
-  // that correspond to the interval that contains x
+  x := xd[1] + time*1.2*(xd[size(xd, 1)] - xd[1]) - 0.5;
+// i is a counter that is used to pick the derivative of d or dMonotonic
+// that correspond to the interval that contains x
   i := 1;
   for j in 1:size(xd, 1) - 1 loop
     if x > xd[j] then
       i := j;
     end if;
-  end for;
-  // Extrapolate or interpolate the data
-  y := IBPSA.Utilities.Math.Functions.cubicHermiteLinearExtrapolation(
-              x=x,
-              x1=xd[i],
-              x2=xd[i + 1],
-              y1=yd[i],
-              y2=yd[i + 1],
-              y1d=d[i],
-              y2d=d[i + 1]);
+  end for;
+// Extrapolate or interpolate the data
+  y := IBPSA.Utilities.Math.Functions.cubicHermiteLinearExtrapolation(x = x, x1 = xd[i], x2 = xd[i + 1], y1 = yd[i], y2 = yd[i + 1], y1d = d[i], y2d = d[i + 1]);
   yMonotone :=
     IBPSA.Utilities.Math.Functions.cubicHermiteLinearExtrapolation(
               x=x,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Math/Functions/Examples/IsMonotonic.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Math/Functions/Examples/IsMonotonic.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Math/Functions/Examples/IsMonotonic.mo"	2022-03-10 09:57:39.700144341 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Math/Functions/Examples/IsMonotonic.mo"	2022-03-10 09:58:03.084147304 +0000
@@ -9,49 +9,33 @@
   Real x_decStrict[3] = {2.5, 2, 0.1} "strictly decreasing";
   Real x_decWeak[4] = {3, 1, 1, 0.5} "weakly decreasing";
 
-equation
-// Tests with weak monotonicity
-    //strictly increasing
-  assert(IBPSA.Utilities.Math.Functions.isMonotonic(x_incStrict,
-    strict=false), "Error. Function should have returned true.");
-     //not monotonic
-  assert(false == IBPSA.Utilities.Math.Functions.isMonotonic(x_notMon,
-    strict=false), "Error. Function should have returned true.");
-     //weakly increasing
-  assert(IBPSA.Utilities.Math.Functions.isMonotonic(x_incWeak, strict=
-    false), "Error. Function should have returned true.");
-     //not weakly monotonic
-  assert(false == IBPSA.Utilities.Math.Functions.isMonotonic(
-    x_notWeak, strict=false), "Error. Function should have returned true.");
-
-    //strictly decreasing
-  assert(IBPSA.Utilities.Math.Functions.isMonotonic({2.5,2,0.1},
-    strict=false), "Error. Function should have returned true.");
-     //weakly decreasing
-  assert(IBPSA.Utilities.Math.Functions.isMonotonic({3,1,1,0.5},
-    strict=false), "Error. Function should have returned true.");
-
-// Tests with strict monotonicity
-    //strictly increasing
-  assert(IBPSA.Utilities.Math.Functions.isMonotonic(x_incStrict,
-    strict=true), "Error. Function should have returned true.");
-     //not monotonic
-  assert(false == IBPSA.Utilities.Math.Functions.isMonotonic(x_notMon,
-    strict=true), "Error. Function should have returned true.");
-     //weakly increasing
-  assert(false == IBPSA.Utilities.Math.Functions.isMonotonic(
-    x_incWeak, strict=true), "Error. Function should have returned true.");
-     //not weakly monotonic
-  assert(false == IBPSA.Utilities.Math.Functions.isMonotonic(
-    x_notWeak, strict=true), "Error. Function should have returned true.");
-
-    //strictly decreasing
-  assert(IBPSA.Utilities.Math.Functions.isMonotonic(x_decStrict,
-    strict=true), "Error. Function should have returned true.");
-     //weakly decreasing
-  assert(false == IBPSA.Utilities.Math.Functions.isMonotonic(
-    x_decWeak, strict=true), "Error. Function should have returned true.");
-
+equation
+// Tests with weak monotonicity
+//strictly increasing
+  assert(IBPSA.Utilities.Math.Functions.isMonotonic(x_incStrict, strict = false), "Error. Function should have returned true.");
+//not monotonic
+  assert(false == IBPSA.Utilities.Math.Functions.isMonotonic(x_notMon, strict = false), "Error. Function should have returned true.");
+//weakly increasing
+  assert(IBPSA.Utilities.Math.Functions.isMonotonic(x_incWeak, strict = false), "Error. Function should have returned true.");
+//not weakly monotonic
+  assert(false == IBPSA.Utilities.Math.Functions.isMonotonic(x_notWeak, strict = false), "Error. Function should have returned true.");
+//strictly decreasing
+  assert(IBPSA.Utilities.Math.Functions.isMonotonic({2.5, 2, 0.1}, strict = false), "Error. Function should have returned true.");
+//weakly decreasing
+  assert(IBPSA.Utilities.Math.Functions.isMonotonic({3, 1, 1, 0.5}, strict = false), "Error. Function should have returned true.");
+// Tests with strict monotonicity
+//strictly increasing
+  assert(IBPSA.Utilities.Math.Functions.isMonotonic(x_incStrict, strict = true), "Error. Function should have returned true.");
+//not monotonic
+  assert(false == IBPSA.Utilities.Math.Functions.isMonotonic(x_notMon, strict = true), "Error. Function should have returned true.");
+//weakly increasing
+  assert(false == IBPSA.Utilities.Math.Functions.isMonotonic(x_incWeak, strict = true), "Error. Function should have returned true.");
+//not weakly monotonic
+  assert(false == IBPSA.Utilities.Math.Functions.isMonotonic(x_notWeak, strict = true), "Error. Function should have returned true.");
+//strictly decreasing
+  assert(IBPSA.Utilities.Math.Functions.isMonotonic(x_decStrict, strict = true), "Error. Function should have returned true.");
+//weakly decreasing
+  assert(false == IBPSA.Utilities.Math.Functions.isMonotonic(x_decWeak, strict = true), "Error. Function should have returned true.");
   annotation (experiment(Tolerance=1e-6, StopTime=1.0),
 __Dymola_Commands(file="modelica://BuildSysPro/Resources/IBPSA/Scripts/Dymola/Utilities/Math/Functions/Examples/IsMonotonic.mos"
         "Simulate and plot"),
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Math/Functions/Examples/SpliceFunctionDerivativeCheck.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Math/Functions/Examples/SpliceFunctionDerivativeCheck.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Math/Functions/Examples/SpliceFunctionDerivativeCheck.mo"	2022-03-10 09:57:39.700144341 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Math/Functions/Examples/SpliceFunctionDerivativeCheck.mo"	2022-03-10 09:58:02.932147285 +0000
@@ -16,9 +16,8 @@
 equation
   x = time^3;
   deltax=delta*10*time^8+0.1;
-
-  // Because the derivative is implemented for all arguments,
-  // we make pos, neg and deltax also functions of time
+// Because the derivative is implemented for all arguments,
+// we make pos, neg and deltax also functions of time
   y = IBPSA.Utilities.Math.Functions.spliceFunction(
               pos=10*x^3,
               neg=-10*x^2,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Math/Functions/Examples/TrapezoidalIntegration.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Math/Functions/Examples/TrapezoidalIntegration.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Math/Functions/Examples/TrapezoidalIntegration.mo"	2022-03-10 09:57:39.700144341 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Math/Functions/Examples/TrapezoidalIntegration.mo"	2022-03-10 09:58:02.924147284 +0000
@@ -2,7 +2,7 @@
 model TrapezoidalIntegration
   "Tests the correct implementation of the function trapezoidalIntegration"
   extends Modelica.Icons.Example;
-  Real y1[7] = {72, 70, 64, 54, 40, 22, 0}; //function values of y = -2*x^2-72 for x={0,1,2,3,4,5,6}
+  Real y1[7] = {72, 70, 64, 54, 40, 22, 0};   //function values of y = -2*x^2-72 for x={0,1,2,3,4,5,6}
   Real y "Integration result";
   //Real y2[7] = {0.3333, 1.0, 3.0, 9.9, 27.0, 81.0, 243.0}; // //function values of y = 3^(3x-1) for x=0:0.3333:2
 algorithm
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Math/Functions/cubicHermiteLinearExtrapolation.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Math/Functions/cubicHermiteLinearExtrapolation.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Math/Functions/cubicHermiteLinearExtrapolation.mo"	2022-03-10 09:57:39.700144341 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Math/Functions/cubicHermiteLinearExtrapolation.mo"	2022-03-10 09:58:02.772147265 +0000
@@ -1,33 +1,27 @@
-within BuildSysPro.IBPSA.Utilities.Math.Functions;
-function cubicHermiteLinearExtrapolation
-  "Interpolate using a cubic Hermite spline with linear extrapolation"
-  extends Modelica.Icons.Function;
-  input Real x "Abscissa value";
-  input Real x1 "Lower abscissa value";
-  input Real x2 "Upper abscissa value";
-  input Real y1 "Lower ordinate value";
-  input Real y2 "Upper ordinate value";
-  input Real y1d "Lower gradient";
-  input Real y2d "Upper gradient";
-  output Real y "Interpolated ordinate value";
-algorithm
-  if (x > x1 and x < x2) then
-    y:=Modelica.Fluid.Utilities.cubicHermite(
-      x=x,
-      x1=x1,
-      x2=x2,
-      y1=y1,
-      y2=y2,
-      y1d=y1d,
-      y2d=y2d);
-  elseif x <= x1 then
-    // linear extrapolation
-    y:=y1 + (x - x1)*y1d;
-  else
-    y:=y2 + (x - x2)*y2d;
-  end if;
-  annotation(smoothOrder=1,
-      Documentation(info="
+within BuildSysPro.IBPSA.Utilities.Math.Functions;
+
+function cubicHermiteLinearExtrapolation "Interpolate using a cubic Hermite spline with linear extrapolation"
+  extends Modelica.Icons.Function;
+  input Real x "Abscissa value";
+  input Real x1 "Lower abscissa value";
+  input Real x2 "Upper abscissa value";
+  input Real y1 "Lower ordinate value";
+  input Real y2 "Upper ordinate value";
+  input Real y1d "Lower gradient";
+  input Real y2d "Upper gradient";
+  output Real y "Interpolated ordinate value";
+algorithm
+  if x > x1 and x < x2 then
+    y := Modelica.Fluid.Utilities.cubicHermite(x = x, x1 = x1, x2 = x2, y1 = y1, y2 = y2, y1d = y1d, y2d = y2d);
+  elseif x <= x1 then
+    y := y1 + (x - x1) * y1d;
+  else
+    y := y2 + (x - x2) * y2d;
+  end if;
+// linear extrapolation
+  annotation(
+    smoothOrder = 1,
+    Documentation(info = "
 

 For x1 < x < x2, this function interpolates
 using cubic hermite spline. For x outside this interval, the function
@@ -38,13 +32,12 @@
 
 IBPSA.Utilities.Math.Functions.Examples.CubicHermite.
 

-",
-revisions="
+", revisions = "
 
    
 
  • 
 September 27, 2011 by Michael Wetter:
    
 First implementation.
 
    • 
 

-"));
-end cubicHermiteLinearExtrapolation;
+"));
+end cubicHermiteLinearExtrapolation;
\ No newline at end of file
Only in converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Math/Functions: cubicHermiteLinearExtrapolation.mo.after
Only in converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Math/Functions: cubicHermiteLinearExtrapolation.mo.before
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Math/Functions/isMonotonic.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Math/Functions/isMonotonic.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Math/Functions/isMonotonic.mo"	2022-03-10 09:57:39.700144341 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Math/Functions/isMonotonic.mo"	2022-03-10 09:58:02.704147256 +0000
@@ -1,63 +1,63 @@
-within BuildSysPro.IBPSA.Utilities.Math.Functions;
-function isMonotonic "Returns true if the argument is a monotonic sequence"
-  extends Modelica.Icons.Function;
-  input Real x[:] "Sequence to be tested";
-  input Boolean strict=false "Set to true to test for strict monotonicity";
-  output Boolean monotonic "True if x is monotonic increasing or decreasing";
-protected
-  Integer n=size(x, 1) "Number of data points";
-
-algorithm
-  if n == 1 then
-    monotonic := true;
-  else
-    monotonic := true;
-    if strict then
-      if (x[1] >= x[n]) then
-        for i in 1:n - 1 loop
-          if (not x[i] > x[i + 1]) then
-            monotonic := false;
-          end if;
-        end for;
-      else
-        for i in 1:n - 1 loop
-          if (not x[i] < x[i + 1]) then
-            monotonic := false;
-          end if;
-        end for;
-      end if;
-    else
-      // not strict
-      if (x[1] >= x[n]) then
-        for i in 1:n - 1 loop
-          if (not x[i] >= x[i + 1]) then
-            monotonic := false;
-          end if;
-        end for;
-      else
-        for i in 1:n - 1 loop
-          if (not x[i] <= x[i + 1]) then
-            monotonic := false;
-          end if;
-        end for;
-      end if;
-    end if;
-    // strict
-  end if;
-
-  annotation (Documentation(info="
+within BuildSysPro.IBPSA.Utilities.Math.Functions;
+
+function isMonotonic "Returns true if the argument is a monotonic sequence"
+  extends Modelica.Icons.Function;
+  input Real x[:] "Sequence to be tested";
+  input Boolean strict = false "Set to true to test for strict monotonicity";
+  output Boolean monotonic "True if x is monotonic increasing or decreasing";
+protected
+  Integer n = size(x, 1) "Number of data points";
+algorithm
+  if n == 1 then
+    monotonic := true;
+  else
+    monotonic := true;
+    if strict then
+      if x[1] >= x[n] then
+        for i in 1:n - 1 loop
+          if not x[i] > x[i + 1] then
+            monotonic := false;
+          end if;
+        end for;
+      else
+        for i in 1:n - 1 loop
+          if not x[i] < x[i + 1] then
+            monotonic := false;
+          end if;
+        end for;
+      end if;
+    else
+      if x[1] >= x[n] then
+        for i in 1:n - 1 loop
+          if not x[i] >= x[i + 1] then
+            monotonic := false;
+          end if;
+        end for;
+      else
+        for i in 1:n - 1 loop
+          if not x[i] <= x[i + 1] then
+            monotonic := false;
+          end if;
+        end for;
+      end if;
+    end if;
+  end if;
+// not strict
+// strict
+  annotation(
+    Documentation(info = "
 

 This function returns true if its argument is
 monotonic increasing or decreasing, and false otherwise.
 If strict=true, then strict monotonicity is tested,
 otherwise weak monotonicity is tested.
 

-", revisions="
+", revisions = "
 
    
 
  • 
 September 28, 2011 by Michael Wetter:
    
 First implementation.
 
    • 
 

-"));
-end isMonotonic;
+"));
+end isMonotonic;
\ No newline at end of file
Only in converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Math/Functions: isMonotonic.mo.after
Only in converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Math/Functions: isMonotonic.mo.before
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Math/Functions/splineDerivatives.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Math/Functions/splineDerivatives.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Math/Functions/splineDerivatives.mo"	2022-03-10 09:57:39.700144341 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Math/Functions/splineDerivatives.mo"	2022-03-10 09:58:02.556147238 +0000
@@ -14,61 +14,56 @@
   Real beta "Coefficient to ensure monotonicity";
   Real tau "Coefficient to ensure monotonicity";
 
-algorithm
-  if (n>1) then
+algorithm
+  if n > 1 then
     assert(x[1] < x[n], "x must be strictly increasing.
   Received x[1] = " + String(x[1]) + "
-           x[" + String(n) + "] = " + String(x[n]));
-  // Check data
-    assert(isMonotonic(x, strict=true),
-      "x-values must be strictly monontone increasing or decreasing.");
-    if ensureMonotonicity then
-      assert(isMonotonic(y, strict=false),
-        "If ensureMonotonicity=true, y-values must be monontone increasing or decreasing.");
-    end if;
-  end if;
-
-  // Compute derivatives at the support points
-  if n == 1 then
-    // only one data point
-    d[1] :=0;
-  elseif n == 2 then
-    // linear function
-    d[1] := (y[2] - y[1])/(x[2] - x[1]);
-    d[2] := d[1];
-  else
-    // Slopes of the secant lines between i and i+1
-    for i in 1:n - 1 loop
-      delta[i] := (y[i + 1] - y[i])/(x[i + 1] - x[i]);
-    end for;
-    // Initial values for tangents at the support points.
-    // End points use one-sided derivatives
-    d[1] := delta[1];
-    d[n] := delta[n - 1];
-
-    for i in 2:n - 1 loop
-      d[i] := (delta[i - 1] + delta[i])/2;
-    end for;
-
-  end if;
-  // Ensure monotonicity
-  if n > 2 and ensureMonotonicity then
-    for i in 1:n - 1 loop
-      if (abs(delta[i]) < Modelica.Constants.small) then
-        d[i] := 0;
-        d[i + 1] := 0;
-      else
-        alpha := d[i]/delta[i];
-        beta := d[i + 1]/delta[i];
-        // Constrain derivative to ensure monotonicity in this interval
-        if (alpha^2 + beta^2) > 9 then
-          tau := 3/(alpha^2 + beta^2)^(1/2);
-          d[i] := delta[i]*alpha*tau;
-          d[i + 1] := delta[i]*beta*tau;
-        end if;
-      end if;
-    end for;
+           x[" + String(n) + "] = " + String(x[n]));
+    assert(isMonotonic(x, strict = true), "x-values must be strictly monontone increasing or decreasing.");
+    if ensureMonotonicity then
+      assert(isMonotonic(y, strict = false), "If ensureMonotonicity=true, y-values must be monontone increasing or decreasing.");
+    end if;
+  end if;
+// Check data
+// Compute derivatives at the support points
+  if n == 1 then
+    d[1] := 0;
+  elseif n == 2 then
+    d[1] := (y[2] - y[1]) / (x[2] - x[1]);
+    d[2] := d[1];
+  else
+    for i in 1:n - 1 loop
+      delta[i] := (y[i + 1] - y[i]) / (x[i + 1] - x[i]);
+    end for;
+    d[1] := delta[1];
+    d[n] := delta[n - 1];
+    for i in 2:n - 1 loop
+      d[i] := (delta[i - 1] + delta[i]) / 2;
+    end for;
+  end if;
+// only one data point
+// linear function
+// Slopes of the secant lines between i and i+1
+// Initial values for tangents at the support points.
+// End points use one-sided derivatives
+// Ensure monotonicity
+  if n > 2 and ensureMonotonicity then
+    for i in 1:n - 1 loop
+      if abs(delta[i]) < Modelica.Constants.small then
+        d[i] := 0;
+        d[i + 1] := 0;
+      else
+        alpha := d[i] / delta[i];
+        beta := d[i + 1] / delta[i];
+        if alpha ^ 2 + beta ^ 2 > 9 then
+          tau := 3 / (alpha ^ 2 + beta ^ 2) ^ (1 / 2);
+          d[i] := delta[i] * alpha * tau;
+          d[i + 1] := delta[i] * beta * tau;
+        end if;
+      end if;
+    end for;
   end if;
+// Constrain derivative to ensure monotonicity in this interval
   annotation (Documentation(info="
 

 This function computes the derivatives at the support points xi
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Math/IntegratorWithReset.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Math/IntegratorWithReset.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Math/IntegratorWithReset.mo"	2022-03-10 09:57:39.700144341 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Math/IntegratorWithReset.mo"	2022-03-10 09:58:02.520147233 +0000
@@ -54,8 +54,7 @@
 
 equation
   der(y) = k*u;
-
-  // Equations for integrator reset
+// Equations for integrator reset
   connect(trigger, trigger_internal);
   connect(y_reset_in, y_reset_internal);
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/BaseClasses/HumidityRatioVaporPressure.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/BaseClasses/HumidityRatioVaporPressure.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/BaseClasses/HumidityRatioVaporPressure.mo"	2022-03-10 09:57:39.700144341 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/BaseClasses/HumidityRatioVaporPressure.mo"	2022-03-10 09:58:02.292147204 +0000
@@ -5,7 +5,7 @@
   parameter Boolean use_p_in = true "Get the pressure from the input connector"
     annotation(Evaluate=true, HideResult=true);
 
-  parameter Modelica.SIunits.Pressure p = 101325 "Fixed value of pressure"
+  parameter Modelica.Units.SI.Pressure p = 101325 "Fixed value of pressure"
     annotation (Dialog(enable = not use_p_in));
   Modelica.Blocks.Interfaces.RealInput p_in(final quantity="Pressure",
                                          final unit="Pa",
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Constants.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Constants.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Constants.mo"	2022-03-10 09:57:39.700144341 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Constants.mo"	2022-03-10 09:58:02.272147202 +0000
@@ -1,15 +1,15 @@
 within BuildSysPro.IBPSA.Utilities.Psychrometrics;
 package Constants "Library of constants for psychometric functions"
   extends Modelica.Icons.Package;
-  constant Modelica.SIunits.Temperature T_ref = 273.15
+  constant Modelica.Units.SI.Temperature T_ref = 273.15
     "Reference temperature for psychrometric calculations";
-  constant Modelica.SIunits.SpecificHeatCapacity cpAir=1006
+  constant Modelica.Units.SI.SpecificHeatCapacity cpAir=1006
     "Specific heat capacity of air";
-  constant Modelica.SIunits.SpecificHeatCapacity cpSte=1860
+  constant Modelica.Units.SI.SpecificHeatCapacity cpSte=1860
     "Specific heat capacity of water vapor";
-  constant Modelica.SIunits.SpecificHeatCapacity cpWatLiq = 4184
+  constant Modelica.Units.SI.SpecificHeatCapacity cpWatLiq = 4184
     "Specific heat capacity of liquid water";
-  constant Modelica.SIunits.SpecificEnthalpy h_fg = 2501014.5
+  constant Modelica.Units.SI.SpecificEnthalpy h_fg = 2501014.5
     "Enthalpy of evaporation of water at the reference temperature";
   constant Real k_mair = 0.6219647130774989 "Ratio of molar weights";
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Examples/TWetBul_TDryBulPhi.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Examples/TWetBul_TDryBulPhi.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Examples/TWetBul_TDryBulPhi.mo"	2022-03-10 09:57:39.700144341 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Examples/TWetBul_TDryBulPhi.mo"	2022-03-10 09:58:02.132147185 +0000
@@ -35,7 +35,7 @@
 protected
   block Assertions
     extends Modelica.Blocks.Icons.Block;
-    constant Modelica.SIunits.Temperature dT_max=0.1
+    constant Modelica.Units.SI.Temperature dT_max=0.1
       "Maximum allowed deviation with reference result";
 
     Modelica.Blocks.Interfaces.RealInput phi "Relative humidity"
@@ -47,8 +47,8 @@
       "Wet bulb temperature from wetBulXi_phi"
       annotation (Placement(transformation(extent={{-140,-80},{-100,-40}})));
   equation
-    // Validation of one data point based on example 17.1 in
-    // Ananthanarayanan, P. N. Basic refrigeration and air conditioning. Tata McGraw-Hill Education, 2013.
+// Validation of one data point based on example 17.1 in
+// Ananthanarayanan, P. N. Basic refrigeration and air conditioning. Tata McGraw-Hill Education, 2013.
     if abs(phi-0.48)<0.001 then
       assert(abs(wetBulPhi_TWetBul - 21.1-273.15) < dT_max,
       "Error in computation of wet bulb temperature, deviation with reference result is larger than "
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/BaseClasses/Examples/DewPointTemperatureDerivativeCheck.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/BaseClasses/Examples/DewPointTemperatureDerivativeCheck.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/BaseClasses/Examples/DewPointTemperatureDerivativeCheck.mo"	2022-03-10 09:57:39.700144341 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/BaseClasses/Examples/DewPointTemperatureDerivativeCheck.mo"	2022-03-10 09:58:02.060147174 +0000
@@ -6,7 +6,7 @@
   Real y "Function value";
   Real y_comp "Function value for comparison";
   Real err "Integration error";
-  Modelica.SIunits.Temperature T "Temperature";
+  Modelica.Units.SI.Temperature T "Temperature";
 initial equation
   y=y_comp;
 equation
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/BaseClasses/Examples/DewPointTemperatureDerivativeCheck_amb.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/BaseClasses/Examples/DewPointTemperatureDerivativeCheck_amb.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/BaseClasses/Examples/DewPointTemperatureDerivativeCheck_amb.mo"	2022-03-10 09:57:39.700144341 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/BaseClasses/Examples/DewPointTemperatureDerivativeCheck_amb.mo"	2022-03-10 09:58:02.044147173 +0000
@@ -6,7 +6,7 @@
   Real y "Function value";
   Real y_comp "Function value for comparison";
   Real err "Integration error";
-  Modelica.SIunits.Temperature T "Temperature";
+  Modelica.Units.SI.Temperature T "Temperature";
 initial equation
   y=y_comp;
 equation
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/BaseClasses/Examples/InverseDewPointTemperatureDerivativeCheck_amb.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/BaseClasses/Examples/InverseDewPointTemperatureDerivativeCheck_amb.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/BaseClasses/Examples/InverseDewPointTemperatureDerivativeCheck_amb.mo"	2022-03-10 09:57:39.700144341 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/BaseClasses/Examples/InverseDewPointTemperatureDerivativeCheck_amb.mo"	2022-03-10 09:58:02.032147171 +0000
@@ -6,7 +6,7 @@
   Real y "Function value";
   Real y_comp "Function value for comparison";
   Real err(unit="K", displayUnit="K") "Integration error";
-  Modelica.SIunits.Pressure p_w "Water vapor partial pressure";
+  Modelica.Units.SI.Pressure p_w "Water vapor partial pressure";
 initial equation
   y=y_comp;
 equation
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/BaseClasses/Examples/SaturationPressureDerivativeCheck.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/BaseClasses/Examples/SaturationPressureDerivativeCheck.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/BaseClasses/Examples/SaturationPressureDerivativeCheck.mo"	2022-03-10 09:57:39.700144341 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/BaseClasses/Examples/SaturationPressureDerivativeCheck.mo"	2022-03-10 09:58:02.020147170 +0000
@@ -3,13 +3,13 @@
   "Model to test correct implementation of derivative"
   extends Modelica.Icons.Example;
 
-  parameter Modelica.SIunits.Temperature TMin = 190 "Temperature";
-  parameter Modelica.SIunits.Temperature TMax = 373.16 "Temperature";
+  parameter Modelica.Units.SI.Temperature TMin = 190 "Temperature";
+  parameter Modelica.Units.SI.Temperature TMax = 373.16 "Temperature";
 
   Real y "Function value";
   Real y_comp "Function value for comparison";
   Real err "Integration error";
-  Modelica.SIunits.Temperature T "Temperature";
+  Modelica.Units.SI.Temperature T "Temperature";
 initial equation
   y=y_comp;
 equation
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/BaseClasses/Examples/WaterVaporPressureDerivativeCheck.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/BaseClasses/Examples/WaterVaporPressureDerivativeCheck.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/BaseClasses/Examples/WaterVaporPressureDerivativeCheck.mo"	2022-03-10 09:57:39.700144341 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/BaseClasses/Examples/WaterVaporPressureDerivativeCheck.mo"	2022-03-10 09:58:02.004147167 +0000
@@ -6,10 +6,10 @@
   Real y "Function value";
   Real y_comp "Function value for comparison";
   Real err "Integration error";
-  Modelica.SIunits.MassFraction X_w
-    "Water vapor mass fraction at dry bulb temperature";
-  Modelica.SIunits.Pressure p "Total pressure";
 
+  Modelica.Units.SI.MassFraction X_w
+    "Water vapor mass fraction at dry bulb temperature";
+  Modelica.Units.SI.Pressure p "Total pressure";
 initial equation
   y=y_comp;
 equation
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/BaseClasses/der_TDewPoi_pW_amb.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/BaseClasses/der_TDewPoi_pW_amb.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/BaseClasses/der_TDewPoi_pW_amb.mo"	2022-03-10 09:57:39.700144341 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/BaseClasses/der_TDewPoi_pW_amb.mo"	2022-03-10 09:58:01.988147166 +0000
@@ -2,15 +2,15 @@
 function der_TDewPoi_pW_amb "Derivative of function TDewPoi_pW_amb"
   extends Modelica.Icons.Function;
 
-  input Modelica.SIunits.Pressure p_w "Water vapor partial pressure";
+  input Modelica.Units.SI.Pressure p_w "Water vapor partial pressure";
   input Real dp_w "Differential of water vapor partial pressure";
   output Real dT "Differential of dew point temperature";
 
 protected
-  constant Modelica.SIunits.Temperature T1=283.15 "First support point";
-  constant Modelica.SIunits.Temperature T2=293.15 "Second support point";
-  constant Modelica.SIunits.Pressure p1=1227.97 "First support point";
-  constant Modelica.SIunits.Pressure p2=2338.76 "Second support point";
+  constant Modelica.Units.SI.Temperature T1=283.15 "First support point";
+  constant Modelica.Units.SI.Temperature T2=293.15 "Second support point";
+  constant Modelica.Units.SI.Pressure p1=1227.97 "First support point";
+  constant Modelica.Units.SI.Pressure p2=2338.76 "Second support point";
 
   constant Real a1=(Modelica.Math.log(p2) - Modelica.Math.log(p1)*T2/T1)/(1 -
       T2/T1);
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/BaseClasses/der_pW_TDewPoi.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/BaseClasses/der_pW_TDewPoi.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/BaseClasses/der_pW_TDewPoi.mo"	2022-03-10 09:57:39.700144341 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/BaseClasses/der_pW_TDewPoi.mo"	2022-03-10 09:58:01.984147165 +0000
@@ -1,7 +1,7 @@
 within BuildSysPro.IBPSA.Utilities.Psychrometrics.Functions.BaseClasses;
 function der_pW_TDewPoi "Derivative of function pW_TDewPoi"
   extends Modelica.Icons.Function;
-  input Modelica.SIunits.Temperature T "Dew point temperature";
+  input Modelica.Units.SI.Temperature T "Dew point temperature";
   input Real dT "Temperature differential";
   output Real dp_w "Differential of water vapor partial pressure";
 protected
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/BaseClasses/der_pW_TDewPoi_amb.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/BaseClasses/der_pW_TDewPoi_amb.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/BaseClasses/der_pW_TDewPoi_amb.mo"	2022-03-10 09:57:39.700144341 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/BaseClasses/der_pW_TDewPoi_amb.mo"	2022-03-10 09:58:01.976147164 +0000
@@ -1,14 +1,14 @@
 within BuildSysPro.IBPSA.Utilities.Psychrometrics.Functions.BaseClasses;
 function der_pW_TDewPoi_amb "Derivative of function pW_TDewPoi_amb"
   extends Modelica.Icons.Function;
-  input Modelica.SIunits.Temperature T "Dew point temperature";
+  input Modelica.Units.SI.Temperature T "Dew point temperature";
   input Real dT;
   output Real dp_w "Differential of water vapor partial pressure";
 protected
-  constant Modelica.SIunits.Temperature T1=283.15 "First support point";
-  constant Modelica.SIunits.Temperature T2=293.15 "Second support point";
-  constant Modelica.SIunits.Pressure p1=1227.97 "First support point";
-  constant Modelica.SIunits.Pressure p2=2338.76 "Second support point";
+  constant Modelica.Units.SI.Temperature T1=283.15 "First support point";
+  constant Modelica.Units.SI.Temperature T2=293.15 "Second support point";
+  constant Modelica.Units.SI.Pressure p1=1227.97 "First support point";
+  constant Modelica.Units.SI.Pressure p2=2338.76 "Second support point";
 
   constant Real a1=(Modelica.Math.log(p2) - Modelica.Math.log(p1)*T2/T1)/(1 -
       T2/T1);
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/BaseClasses/der_pW_X.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/BaseClasses/der_pW_X.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/BaseClasses/der_pW_X.mo"	2022-03-10 09:57:39.700144341 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/BaseClasses/der_pW_X.mo"	2022-03-10 09:58:01.968147164 +0000
@@ -2,11 +2,11 @@
 function der_pW_X "Derivative of function pW_X"
   extends Modelica.Icons.Function;
 
-  input Modelica.SIunits.MassFraction X_w(
+  input Modelica.Units.SI.MassFraction X_w(
     min=0,
     max=1,
     nominal=0.01) "Species concentration at dry bulb temperature";
-  input Modelica.SIunits.Pressure p=101325 "Total pressure";
+  input Modelica.Units.SI.Pressure p=101325 "Total pressure";
 
   input Real dX_w
     "Differential of species concentration at dry bulb temperature";
@@ -15,7 +15,7 @@
   output Real dp_w "Differential of water vapor pressure";
 
 protected
-  Modelica.SIunits.MassFraction x_w(nominal=0.01)
+  Modelica.Units.SI.MassFraction x_w(nominal=0.01)
     "Water mass fraction per mass of dry air";
   Real dX_w_dX "Differential d (x_w) / d X_w";
 algorithm
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/BaseClasses/der_saturationPressureLiquid.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/BaseClasses/der_saturationPressureLiquid.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/BaseClasses/der_saturationPressureLiquid.mo"	2022-03-10 09:57:39.700144341 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/BaseClasses/der_saturationPressureLiquid.mo"	2022-03-10 09:58:01.952147161 +0000
@@ -2,7 +2,7 @@
 function der_saturationPressureLiquid
   "Derivative of the function saturationPressureLiquid"
   extends Modelica.Icons.Function;
-  input Modelica.SIunits.Temperature Tsat "Saturation temperature";
+  input Modelica.Units.SI.Temperature Tsat "Saturation temperature";
   input Real dTsat(unit="K/s") "Saturation temperature derivative";
   output Real psat_der(unit="Pa/s") "Differential of saturation pressure";
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/BaseClasses/der_sublimationPressureIce.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/BaseClasses/der_sublimationPressureIce.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/BaseClasses/der_sublimationPressureIce.mo"	2022-03-10 09:57:39.700144341 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/BaseClasses/der_sublimationPressureIce.mo"	2022-03-10 09:58:01.944147160 +0000
@@ -2,14 +2,14 @@
 function der_sublimationPressureIce
   "Derivative of function sublimationPressureIce"
     extends Modelica.Icons.Function;
-    input Modelica.SIunits.Temperature TSat(displayUnit="degC",
+    input Modelica.Units.SI.Temperature TSat(displayUnit="degC",
                                             nominal=300)
     "Saturation temperature";
     input Real dTsat(unit="K/s") "Sublimation temperature derivative";
     output Real psat_der(unit="Pa/s") "Sublimation pressure derivative";
 protected
-    Modelica.SIunits.Temperature TTriple=273.16 "Triple point temperature";
-    Modelica.SIunits.AbsolutePressure pTriple=611.657 "Triple point pressure";
+    Modelica.Units.SI.Temperature TTriple=273.16 "Triple point temperature";
+    Modelica.Units.SI.AbsolutePressure pTriple=611.657 "Triple point pressure";
     Real r1=TSat/TTriple "Common subexpression 1";
     Real r1_der=dTsat/TTriple "Derivative of common subexpression 1";
     Real a[2]={-13.9281690,34.7078238} "Coefficients a[:]";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/Examples/Density_pTX.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/Examples/Density_pTX.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/Examples/Density_pTX.mo"	2022-03-10 09:57:39.700144341 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/Examples/Density_pTX.mo"	2022-03-10 09:58:01.872147152 +0000
@@ -2,10 +2,10 @@
 model Density_pTX "Model to test density_pTX"
   extends Modelica.Icons.Example;
 
-  parameter Modelica.SIunits.Pressure p = 101325 "Pressure of the medium";
-  Modelica.SIunits.Temperature T "Temperature";
-  Modelica.SIunits.MassFraction X_w "Mass fraction";
-  Modelica.SIunits.Density d "Mass density";
+  parameter Modelica.Units.SI.Pressure p = 101325 "Pressure of the medium";
+  Modelica.Units.SI.Temperature T "Temperature";
+  Modelica.Units.SI.MassFraction X_w "Mass fraction";
+  Modelica.Units.SI.Density d "Mass density";
   constant Real convT(unit="1/s") = 0.999 "Conversion factor";
   constant Real convX(unit="1/s") = 0.02 "Conversion factor";
 equation
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/Examples/SaturationPressure.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/Examples/SaturationPressure.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/Examples/SaturationPressure.mo"	2022-03-10 09:57:39.700144341 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/Examples/SaturationPressure.mo"	2022-03-10 09:58:01.848147149 +0000
@@ -1,10 +1,10 @@
 within BuildSysPro.IBPSA.Utilities.Psychrometrics.Functions.Examples;
 model SaturationPressure "Model to test the saturationPressure function"
   extends Modelica.Icons.Example;
-  parameter Modelica.SIunits.Temperature TMin = 190 "Temperature";
-  parameter Modelica.SIunits.Temperature TMax = 373.16 "Temperature";
-  Modelica.SIunits.Temperature T "Temperature";
-  Modelica.SIunits.AbsolutePressure pSat "Saturation pressure";
+  parameter Modelica.Units.SI.Temperature TMin = 190 "Temperature";
+  parameter Modelica.Units.SI.Temperature TMax = 373.16 "Temperature";
+  Modelica.Units.SI.Temperature T "Temperature";
+  Modelica.Units.SI.AbsolutePressure pSat "Saturation pressure";
   constant Real conv(unit="1/s") = 1 "Conversion factor";
 equation
   T = TMin + conv*time * (TMax-TMin);
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/Examples/X_pSatpphi.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/Examples/X_pSatpphi.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/Examples/X_pSatpphi.mo"	2022-03-10 09:57:39.700144341 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/Examples/X_pSatpphi.mo"	2022-03-10 09:58:01.832147146 +0000
@@ -3,12 +3,12 @@
   extends Modelica.Icons.Example;
   package Medium = IBPSA.Media.Air "Medium model"
            annotation (choicesAllMatching = true);
-  parameter Modelica.SIunits.Temperature T = 293.15 "Temperature";
-  parameter Modelica.SIunits.Pressure p = 101325 "Pressure of the fluid";
+  parameter Modelica.Units.SI.Temperature T = 293.15 "Temperature";
+  parameter Modelica.Units.SI.Pressure p = 101325 "Pressure of the fluid";
 
-  Modelica.SIunits.AbsolutePressure pSat "Saturation pressure";
+  Modelica.Units.SI.AbsolutePressure pSat "Saturation pressure";
   Real phi(min=0, max=1) "Relative humidity";
-  Modelica.SIunits.MassFraction X_w(
+  Modelica.Units.SI.MassFraction X_w(
     min=0,
     max=1,
     nominal=0.01) "Water vapor concentration per total mass of air";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/Examples/pW_TDewPoi.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/Examples/pW_TDewPoi.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/Examples/pW_TDewPoi.mo"	2022-03-10 09:57:39.700144341 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/Examples/pW_TDewPoi.mo"	2022-03-10 09:58:01.820147144 +0000
@@ -2,10 +2,10 @@
 model pW_TDewPoi "Model to test pW_TDewPoi and its inverse function"
   extends Modelica.Icons.Example;
 
-  Modelica.SIunits.Temperature T "Dew point temperature";
-  Modelica.SIunits.Temperature TInv "Dew point temperature";
-  Modelica.SIunits.TemperatureDifference dT "Difference between temperatures";
-  Modelica.SIunits.Pressure p_w "Water vapor partial pressure";
+  Modelica.Units.SI.Temperature T "Dew point temperature";
+  Modelica.Units.SI.Temperature TInv "Dew point temperature";
+  Modelica.Units.SI.TemperatureDifference dT "Difference between temperatures";
+  Modelica.Units.SI.Pressure p_w "Water vapor partial pressure";
   constant Real conv(unit="K/s") = 100 "Conversion factor";
 equation
   T = conv*time + 273.15;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/Examples/pW_TDewPoi_comparison.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/Examples/pW_TDewPoi_comparison.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/Examples/pW_TDewPoi_comparison.mo"	2022-03-10 09:57:39.700144341 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/Examples/pW_TDewPoi_comparison.mo"	2022-03-10 09:58:01.808147142 +0000
@@ -3,12 +3,12 @@
   "Model to test the approximation for pW_TDewPoi and its inverse function"
   extends Modelica.Icons.Example;
 
-  Modelica.SIunits.Temperature T "Dew point temperature";
-  Modelica.SIunits.Temperature TInv "Dew point temperature";
-  Modelica.SIunits.TemperatureDifference dT "Difference between temperatures";
-  Modelica.SIunits.Pressure p_w_ashrae
+  Modelica.Units.SI.Temperature T "Dew point temperature";
+  Modelica.Units.SI.Temperature TInv "Dew point temperature";
+  Modelica.Units.SI.TemperatureDifference dT "Difference between temperatures";
+  Modelica.Units.SI.Pressure p_w_ashrae
     "Water vapor partial pressure according to the ASHRAE handbook";
-  Modelica.SIunits.Pressure p_w "Water vapor partial pressure";
+  Modelica.Units.SI.Pressure p_w "Water vapor partial pressure";
 
   constant Real conv(unit="K/s") = 30 "Conversion factor";
   Real r_p "Ratio of the two approximations";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/Examples/pW_X.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/Examples/pW_X.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/Examples/pW_X.mo"	2022-03-10 09:57:39.700144341 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/Examples/pW_X.mo"	2022-03-10 09:58:01.796147142 +0000
@@ -2,10 +2,10 @@
 model pW_X "Model to test pW_X and its inverse function"
   extends Modelica.Icons.Example;
 
-  Modelica.SIunits.MassFraction X "Mass fraction";
-  Modelica.SIunits.MassFraction XInv "Mass fraction";
-  Modelica.SIunits.MassFraction dX "Difference between mass fraction";
-  Modelica.SIunits.Pressure p_w "Water vapor partial pressure";
+  Modelica.Units.SI.MassFraction X "Mass fraction";
+  Modelica.Units.SI.MassFraction XInv "Mass fraction";
+  Modelica.Units.SI.MassFraction dX "Difference between mass fraction";
+  Modelica.Units.SI.Pressure p_w "Water vapor partial pressure";
   constant Real conv(unit="1/s") = 0.999 "Conversion factor";
 equation
   X = conv*time;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/Examples/phi_pTX.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/Examples/phi_pTX.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/Examples/phi_pTX.mo"	2022-03-10 09:57:39.700144341 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/Examples/phi_pTX.mo"	2022-03-10 09:58:01.784147141 +0000
@@ -2,9 +2,9 @@
 model phi_pTX "Model to test phi_pTX"
   extends Modelica.Icons.Example;
 
-  parameter Modelica.SIunits.Pressure p = 101325 "Pressure of the medium";
-  Modelica.SIunits.Temperature T "Temperature";
-  Modelica.SIunits.MassFraction X_w "Mass fraction";
+  parameter Modelica.Units.SI.Pressure p = 101325 "Pressure of the medium";
+  Modelica.Units.SI.Temperature T "Temperature";
+  Modelica.Units.SI.MassFraction X_w "Mass fraction";
   Real phi "Relative humidity";
   constant Real convT(unit="1/s") = 0.999 "Conversion factor";
   constant Real convX(unit="1/s") = 0.02 "Conversion factor";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/Internal.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/Internal.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/Internal.mo"	2022-03-10 09:57:39.700144341 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/Internal.mo"	2022-03-10 09:58:01.776147138 +0000
@@ -1,6 +1,6 @@
 within BuildSysPro.IBPSA.Utilities.Psychrometrics.Functions;
 package Internal "Solve f(x, data) for x with given f"
-  extends Modelica.Media.Common.OneNonLinearEquation;
+  extends ObsoleteModelica4.Media.Common.OneNonLinearEquation;
 
   redeclare function extends f_nonlinear
   algorithm
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/TDewPoi_pW.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/TDewPoi_pW.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/TDewPoi_pW.mo"	2022-03-10 09:57:39.700144341 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/TDewPoi_pW.mo"	2022-03-10 09:58:01.768147138 +0000
@@ -3,12 +3,12 @@
   "Function to compute the water vapor partial pressure for a given dew point temperature of moist air"
   extends Modelica.Icons.Function;
 
-  input Modelica.SIunits.Pressure p_w(displayUnit="Pa", min=200)
+  input Modelica.Units.SI.Pressure p_w(displayUnit="Pa", min=200)
     "Water vapor partial pressure";
-  output Modelica.SIunits.Temperature T "Dew point temperature";
+  output Modelica.Units.SI.Temperature T "Dew point temperature";
 
 protected
-  constant Modelica.Media.Common.OneNonLinearEquation.f_nonlinear_Data dummy
+  constant ObsoleteModelica4.Media.Common.OneNonLinearEquation.f_nonlinear_Data dummy
     "Dummy argument for nonlinear function solver";
 algorithm
   T := Internal.solve(
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/TDewPoi_pW_amb.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/TDewPoi_pW_amb.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/TDewPoi_pW_amb.mo"	2022-03-10 09:57:39.700144341 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/TDewPoi_pW_amb.mo"	2022-03-10 09:58:01.756147136 +0000
@@ -3,14 +3,14 @@
   "Function to compute the dew point temperature of moist air for a given water vapor partial pressure"
   extends Modelica.Icons.Function;
 
-  input Modelica.SIunits.Pressure p_w(displayUnit="Pa", min=100)
+  input Modelica.Units.SI.Pressure p_w(displayUnit="Pa", min=100)
     "Water vapor partial pressure";
-  output Modelica.SIunits.Temperature T "Dew point temperature";
+  output Modelica.Units.SI.Temperature T "Dew point temperature";
 protected
-  constant Modelica.SIunits.Temperature T1=283.15 "First support point";
-  constant Modelica.SIunits.Temperature T2=293.15 "Second support point";
-  constant Modelica.SIunits.Pressure p1=1227.97 "First support point";
-  constant Modelica.SIunits.Pressure p2=2338.76 "Second support point";
+  constant Modelica.Units.SI.Temperature T1=283.15 "First support point";
+  constant Modelica.Units.SI.Temperature T2=293.15 "Second support point";
+  constant Modelica.Units.SI.Pressure p1=1227.97 "First support point";
+  constant Modelica.Units.SI.Pressure p2=2338.76 "Second support point";
 
   constant Real a1=(Modelica.Math.log(p2) - Modelica.Math.log(p1)*T2/T1)/(1 -
       T2/T1);
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/X_pSatpphi.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/X_pSatpphi.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/X_pSatpphi.mo"	2022-03-10 09:57:39.704144342 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/X_pSatpphi.mo"	2022-03-10 09:58:01.744147134 +0000
@@ -1,14 +1,14 @@
 within BuildSysPro.IBPSA.Utilities.Psychrometrics.Functions;
 function X_pSatpphi "Humidity ratio for given water vapor pressure"
   extends Modelica.Icons.Function;
-  input Modelica.SIunits.AbsolutePressure pSat "Saturation pressure";
-  input Modelica.SIunits.Pressure p "Pressure of the fluid";
+  input Modelica.Units.SI.AbsolutePressure pSat "Saturation pressure";
+  input Modelica.Units.SI.Pressure p "Pressure of the fluid";
   input Real phi(min=0, max=1) "Relative humidity";
-  output Modelica.SIunits.MassFraction X_w(
+
+  output Modelica.Units.SI.MassFraction X_w(
     min=0,
     max=1,
     nominal=0.01) "Water vapor concentration per total mass of air";
-
 protected
   constant Real k = 0.621964713077499 "Ratio of molar masses";
 algorithm
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/X_pW.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/X_pW.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/X_pW.mo"	2022-03-10 09:57:39.704144342 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/X_pW.mo"	2022-03-10 09:58:01.736147134 +0000
@@ -1,17 +1,17 @@
 within BuildSysPro.IBPSA.Utilities.Psychrometrics.Functions;
 function X_pW "Humidity ratio for given water vapor pressure"
   extends Modelica.Icons.Function;
-  input Modelica.SIunits.Pressure p_w(displayUnit="Pa",
+  input Modelica.Units.SI.Pressure p_w(displayUnit="Pa",
                                       min=0.003,
                                       nominal=1000) "Water vapor pressure";
-  input Modelica.SIunits.Pressure p=101325 "Total pressure";
-  output Modelica.SIunits.MassFraction X_w(
+  input Modelica.Units.SI.Pressure p=101325 "Total pressure";
+  output Modelica.Units.SI.MassFraction X_w(
     min=0,
     max=1,
     nominal=0.01) "Species concentration at dry bulb temperature";
 
 protected
-  Modelica.SIunits.MassFraction x_w(nominal=0.01)
+  Modelica.Units.SI.MassFraction x_w(nominal=0.01)
     "Water mass fraction per mass of dry air";
 algorithm
   x_w := 0.62198*p_w/(p - p_w);
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/density_pTX.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/density_pTX.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/density_pTX.mo"	2022-03-10 09:57:39.704144342 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/density_pTX.mo"	2022-03-10 09:58:01.720147131 +0000
@@ -2,17 +2,17 @@
 function density_pTX
   "Density of air as a function of pressure, temperature and species concentration"
   extends Modelica.Icons.Function;
-  input Modelica.SIunits.Pressure p "Absolute pressure of the medium";
-  input Modelica.SIunits.Temperature T "Dry bulb temperature";
-  input Modelica.SIunits.MassFraction X_w
+  input Modelica.Units.SI.Pressure p "Absolute pressure of the medium";
+  input Modelica.Units.SI.Temperature T "Dry bulb temperature";
+  input Modelica.Units.SI.MassFraction X_w
     "Water vapor mass fraction per unit mass total air";
-  output Modelica.SIunits.Density d "Mass density";
+  output Modelica.Units.SI.Density d "Mass density";
 protected
-  Modelica.SIunits.SpecificHeatCapacity R
+  Modelica.Units.SI.SpecificHeatCapacity R
     "Gas constant (of mixture if applicable)";
 algorithm
-  R := Modelica.Media.IdealGases.Common.SingleGasesData.Air.R*(1 - X_w)
-     + Modelica.Media.IdealGases.Common.SingleGasesData.H2O.R*X_w;
+  R := Modelica.Media.IdealGases.Common.SingleGasesData.Air.R_s * (1 - X_w)
+     + Modelica.Media.IdealGases.Common.SingleGasesData.H2O.R_s * X_w;
   d := p/(R*T);
 
   annotation (smoothOrder=99,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/pW_TDewPoi.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/pW_TDewPoi.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/pW_TDewPoi.mo"	2022-03-10 09:57:39.704144342 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/pW_TDewPoi.mo"	2022-03-10 09:58:01.708147131 +0000
@@ -2,8 +2,8 @@
 function pW_TDewPoi
   "Function to compute the water vapor partial pressure for a given dew point temperature of moist air"
   extends Modelica.Icons.Function;
-  input Modelica.SIunits.Temperature T(min=100) "Dew point temperature";
-  output Modelica.SIunits.Pressure p_w(displayUnit="Pa", min=100)
+  input Modelica.Units.SI.Temperature T(min=100) "Dew point temperature";
+  output Modelica.Units.SI.Pressure p_w(displayUnit="Pa", min=100)
     "Water vapor partial pressure";
 protected
   constant Real C8=-5.800226E3;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/pW_TDewPoi_amb.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/pW_TDewPoi_amb.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/pW_TDewPoi_amb.mo"	2022-03-10 09:57:39.704144342 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/pW_TDewPoi_amb.mo"	2022-03-10 09:58:01.692147128 +0000
@@ -3,14 +3,14 @@
   "Function to compute the water vapor partial pressure for a given dew point temperature of moist air"
   extends Modelica.Icons.Function;
 
-  input Modelica.SIunits.Temperature T "Dew point temperature";
-  output Modelica.SIunits.Pressure p_w(displayUnit="Pa", min=100)
+  input Modelica.Units.SI.Temperature T "Dew point temperature";
+  output Modelica.Units.SI.Pressure p_w(displayUnit="Pa", min=100)
     "Water vapor partial pressure";
 protected
-  constant Modelica.SIunits.Temperature T1=283.15 "First support point";
-  constant Modelica.SIunits.Temperature T2=293.15 "Second support point";
-  constant Modelica.SIunits.Pressure p1=1227.97 "First support point";
-  constant Modelica.SIunits.Pressure p2=2338.76 "Second support point";
+  constant Modelica.Units.SI.Temperature T1=283.15 "First support point";
+  constant Modelica.Units.SI.Temperature T2=293.15 "Second support point";
+  constant Modelica.Units.SI.Pressure p1=1227.97 "First support point";
+  constant Modelica.Units.SI.Pressure p2=2338.76 "Second support point";
 
   constant Real a1=(Modelica.Math.log(p2) - Modelica.Math.log(p1)*T2/T1)/(1 -
       T2/T1);
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/pW_X.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/pW_X.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/pW_X.mo"	2022-03-10 09:57:39.704144342 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/pW_X.mo"	2022-03-10 09:58:01.680147126 +0000
@@ -1,15 +1,15 @@
 within BuildSysPro.IBPSA.Utilities.Psychrometrics.Functions;
 function pW_X "Water vapor pressure for given humidity ratio"
   extends Modelica.Icons.Function;
-  input Modelica.SIunits.MassFraction X_w(
+  input Modelica.Units.SI.MassFraction X_w(
     min=0,
     max=0.99999,
     nominal=0.01) "Species concentration at dry bulb temperature";
-  input Modelica.SIunits.Pressure p=101325 "Total pressure";
-  output Modelica.SIunits.Pressure p_w(displayUnit="Pa") "Water vapor pressure";
+  input Modelica.Units.SI.Pressure p=101325 "Total pressure";
+  output Modelica.Units.SI.Pressure p_w(displayUnit="Pa") "Water vapor pressure";
 
 protected
-  Modelica.SIunits.MassFraction x_w(nominal=0.01)
+  Modelica.Units.SI.MassFraction x_w(nominal=0.01)
     "Water mass fraction per mass of dry air";
 algorithm
   x_w := X_w/(1 - X_w);
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/phi_pTX.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/phi_pTX.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/phi_pTX.mo"	2022-03-10 09:57:39.704144342 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/phi_pTX.mo"	2022-03-10 09:58:01.672147126 +0000
@@ -2,9 +2,9 @@
 function phi_pTX
   "Relative humidity for given pressure, dry bulb temperature and moisture mass fraction"
   extends Modelica.Icons.Function;
-  input Modelica.SIunits.Pressure p "Absolute pressure of the medium";
-  input Modelica.SIunits.Temperature T "Dry bulb temperature";
-  input Modelica.SIunits.MassFraction X_w
+  input Modelica.Units.SI.Pressure p "Absolute pressure of the medium";
+  input Modelica.Units.SI.Temperature T "Dry bulb temperature";
+  input Modelica.Units.SI.MassFraction X_w
     "Water vapor mass fraction per unit mass total air";
   output Real phi(unit="1") "Relative humidity";
 algorithm
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/saturationPressure.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/saturationPressure.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/saturationPressure.mo"	2022-03-10 09:57:39.704144342 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/saturationPressure.mo"	2022-03-10 09:58:01.668147125 +0000
@@ -2,12 +2,12 @@
 function saturationPressure
   "Saturation curve valid for 223.16 <= T <= 373.16 (and slightly outside with less accuracy)"
   extends Modelica.Icons.Function;
-  input Modelica.SIunits.Temperature TSat(displayUnit="degC",
+
+  input Modelica.Units.SI.Temperature TSat(displayUnit="degC",
                                           nominal=300) "Saturation temperature";
-  output Modelica.SIunits.AbsolutePressure pSat(
+  output Modelica.Units.SI.AbsolutePressure pSat(
                                           displayUnit="Pa",
                                           nominal=1000) "Saturation pressure";
-
 algorithm
   pSat := IBPSA.Utilities.Math.Functions.regStep(
             y1=
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/saturationPressureLiquid.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/saturationPressureLiquid.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/saturationPressureLiquid.mo"	2022-03-10 09:57:39.704144342 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/saturationPressureLiquid.mo"	2022-03-10 09:58:01.656147123 +0000
@@ -2,9 +2,9 @@
 function saturationPressureLiquid
   "Return saturation pressure of water as a function of temperature T in the range of 273.16 to 373.16 K"
   extends Modelica.Icons.Function;
-  input Modelica.SIunits.Temperature TSat(displayUnit="degC",
+  input Modelica.Units.SI.Temperature TSat(displayUnit="degC",
                                           nominal=300) "Saturation temperature";
-  output Modelica.SIunits.AbsolutePressure pSat(
+  output Modelica.Units.SI.AbsolutePressure pSat(
                                       displayUnit="Pa",
                                       nominal=1000) "Saturation pressure";
 algorithm
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/sublimationPressureIce.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/sublimationPressureIce.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/sublimationPressureIce.mo"	2022-03-10 09:57:39.704144342 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/Functions/sublimationPressureIce.mo"	2022-03-10 09:58:01.580147114 +0000
@@ -2,14 +2,14 @@
 function sublimationPressureIce
   "Return sublimation pressure of water as a function of temperature T between 190 and 273.16 K"
   extends Modelica.Icons.Function;
-  input Modelica.SIunits.Temperature TSat(displayUnit="degC",
+  input Modelica.Units.SI.Temperature TSat(displayUnit="degC",
                                           nominal=300) "Saturation temperature";
-  output Modelica.SIunits.AbsolutePressure pSat(
+  output Modelica.Units.SI.AbsolutePressure pSat(
                                       displayUnit="Pa",
                                       nominal=1000) "Saturation pressure";
 protected
-  Modelica.SIunits.Temperature TTriple=273.16 "Triple point temperature";
-  Modelica.SIunits.AbsolutePressure pTriple=611.657 "Triple point pressure";
+  Modelica.Units.SI.Temperature TTriple=273.16 "Triple point temperature";
+  Modelica.Units.SI.AbsolutePressure pTriple=611.657 "Triple point pressure";
   Real r1=TSat/TTriple "Common subexpression";
   Real a[2]={-13.9281690,34.7078238} "Coefficients a[:]";
   Real n[2]={-1.5,-1.25} "Coefficients n[:]";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/TWetBul_TDryBulPhi.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/TWetBul_TDryBulPhi.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/TWetBul_TDryBulPhi.mo"	2022-03-10 09:57:39.704144342 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/TWetBul_TDryBulPhi.mo"	2022-03-10 09:58:01.488147103 +0000
@@ -32,15 +32,15 @@
     annotation (Placement(transformation(extent={{100,-10},{120,10}})));
 
 protected
-  Modelica.SIunits.Conversions.NonSIunits.Temperature_degC TDryBul_degC
+  Modelica.Units.NonSI.Temperature_degC TDryBul_degC
     "Dry bulb temperature in degree Celsius";
   Real rh_per(min=0) "Relative humidity in percentage";
-  Modelica.SIunits.MassFraction XiDryBul
+
+  Modelica.Units.SI.MassFraction XiDryBul
     "Water vapor mass fraction at dry bulb state";
-  Modelica.SIunits.MassFraction XiSat "Water vapor mass fraction at saturation";
-  Modelica.SIunits.MassFraction XiSatRefIn
+  Modelica.Units.SI.MassFraction XiSat "Water vapor mass fraction at saturation";
+  Modelica.Units.SI.MassFraction XiSatRefIn
     "Water vapor mass fraction at saturation, referenced to inlet mass flow rate";
-
 equation
   if approximateWetBulb then
     TDryBul_degC = TDryBul - 273.15;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/TWetBul_TDryBulXi.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/TWetBul_TDryBulXi.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/TWetBul_TDryBulXi.mo"	2022-03-10 09:57:39.704144342 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/TWetBul_TDryBulXi.mo"	2022-03-10 09:58:01.464147099 +0000
@@ -31,14 +31,14 @@
     annotation (Placement(transformation(extent={{-120,-10},{-100,10}})));
 
 protected
-  Modelica.SIunits.Conversions.NonSIunits.Temperature_degC TDryBul_degC
+  Modelica.Units.NonSI.Temperature_degC TDryBul_degC
     "Dry bulb temperature in degree Celsius";
   Real rh_per(min=0) "Relative humidity in percentage";
 
-  Modelica.SIunits.MassFraction XiSat(start=0.01,
+  Modelica.Units.SI.MassFraction XiSat(start=0.01,
                                       nominal=0.01)
     "Water vapor mass fraction at saturation";
-  Modelica.SIunits.MassFraction XiSatRefIn
+  Modelica.Units.SI.MassFraction XiSatRefIn
     "Water vapor mass fraction at saturation, referenced to inlet mass flow rate";
 
  parameter Integer iWat = sum({(
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/X_pTphi.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/X_pTphi.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/X_pTphi.mo"	2022-03-10 09:57:39.704144342 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/X_pTphi.mo"	2022-03-10 09:58:01.420147094 +0000
@@ -15,7 +15,7 @@
     "Steam mass fraction"
     annotation (Placement(transformation(extent={{100,-10},{120,10}})));
 protected
-  Modelica.SIunits.AbsolutePressure pSat "Saturation pressure";
+  Modelica.Units.SI.AbsolutePressure pSat "Saturation pressure";
   parameter Integer i_w=
    sum({(
      if Modelica.Utilities.Strings.isEqual(
@@ -37,7 +37,7 @@
           pSat=pSat,
           p=p_in_internal,
           phi=phi);
-  //sum(X[:]) = 1; // The formulation with a sum in an equation section leads to a nonlinear equation system
+//sum(X[:]) = 1; // The formulation with a sum in an equation section leads to a nonlinear equation system
   X[i_nw] =  1 - X[i_w];
   annotation (Documentation(info="
 

diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/X_pW.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/X_pW.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/X_pW.mo"	2022-03-10 09:57:39.704144342 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/X_pW.mo"	2022-03-10 09:58:01.408147092 +0000
@@ -11,7 +11,7 @@
                                            start=2000,
                                            nominal=1000) "Water vapor pressure"
     annotation (Placement(transformation(extent={{-120,-10},{-100,10}})));
-  output Modelica.SIunits.MassFraction x_w(min=0, max=1, nominal=0.01, start=0.001)
+  output Modelica.Units.SI.MassFraction x_w(min=0, max=1, nominal=0.01, start=0.001)
     "Water mass fraction per mass of dry air";
 equation
   X_w = IBPSA.Utilities.Psychrometrics.Functions.X_pW(p_w=p_w, p=
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/pW_X.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/pW_X.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/pW_X.mo"	2022-03-10 09:57:39.704144342 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Psychrometrics/pW_X.mo"	2022-03-10 09:58:01.392147091 +0000
@@ -10,7 +10,7 @@
                                            min = 0) "Water vapor pressure"
     annotation (Placement(transformation(extent={{100,-10},{120,10}}), iconTransformation(extent={{100,-10},{120,10}})));
 
-  output Modelica.SIunits.MassFraction x_w(min=0, max=1, nominal=0.1, start=0.001)
+  output Modelica.Units.SI.MassFraction x_w(min=0, max=1, nominal=0.1, start=0.001)
     "Water mass fraction per mass of dry air";
 
 equation
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Time/CalendarTime.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Time/CalendarTime.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Time/CalendarTime.mo"	2022-03-10 09:57:39.704144342 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/IBPSA/Utilities/Time/CalendarTime.mo"	2022-03-10 09:58:01.368147088 +0000
@@ -7,7 +7,7 @@
   parameter Integer yearRef(min=firstYear, max=lastYear) = 2016
     "Year when time = 0, used if zerTim=Custom"
     annotation(Dialog(enable=zerTim == IBPSA.Utilities.Time.Types.ZeroTime.Custom));
-  parameter Modelica.SIunits.Time offset = 0
+  parameter Modelica.Units.SI.Time offset = 0
     "Offset that is added to 'time', may be used for computing time in different time zone"
     annotation(Dialog(tab="Advanced"));
 
@@ -39,7 +39,7 @@
   final constant Integer firstYear = 2010
     "First year that is supported, i.e. the first year in timeStampsNewYear[:]";
   final constant Integer lastYear = firstYear + size(timeStampsNewYear,1) - 1;
-  constant Modelica.SIunits.Time timeStampsNewYear[12] = {
+  constant Modelica.Units.SI.Time timeStampsNewYear[12] = {
     1262304000.0, 1293840000.0, 1325376000.0,
     1356998400.0, 1388534400.0, 1420070400.0,
     1451606400.0, 1483228800.0, 1514764800.0,
@@ -52,9 +52,9 @@
     "List of leap years starting from firstYear (2010), up to and including 2020";
   final constant Integer dayInMonth[12] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}
     "Number of days in each month";
-  parameter Modelica.SIunits.Time timOff(fixed=false) "Time offset";
-  // final parameters since the user may wrongly assume that this model shifts the
-  // actual time of the simulation
+  parameter Modelica.Units.SI.Time timOff(fixed=false) "Time offset";
+  // final parameters since the user may wrongly assume that this model shifts the
+  // actual time of the simulation
   final constant Integer monthRef(min=1, max=12) = 1 "Month when time = 0"
     annotation(Dialog(enable=zerTim == IBPSA.Utilities.Time.Types.ZeroTime.Custom));
   final constant Integer dayRef(min=1, max=31) = 1 "Day when time = 0"
@@ -64,9 +64,9 @@
   discrete Real epochLastMonth
     "Unix time stamp of the beginning of the current month";
 
-  final parameter Modelica.SIunits.Time hourSampleStart(fixed=false)
+  final parameter Modelica.Units.SI.Time hourSampleStart(fixed=false)
     "Time when the sampling every hour starts";
-  final parameter Modelica.SIunits.Time daySampleStart(fixed=false)
+  final parameter Modelica.Units.SI.Time daySampleStart(fixed=false)
     "Time when the sampling every day starts";
 
   Boolean hourSampleTrigger "True, if hourly sample time instant";
@@ -85,83 +85,55 @@
 
   day = integer(1+floor((unixTimeStamp-epochLastMonth)/3600/24));
   weekDay = integer(rem(4+daysSinceEpoch-1,7)+1);
-initial algorithm
-  // check if yearRef is in the valid range
-  assert(not zerTim == IBPSA.Utilities.Time.Types.ZeroTime.Custom or
-    yearRef >= firstYear and yearRef <= lastYear, "The value you chose for yearRef (="
-     + String(yearRef) + ") is outside of
-   the validity range of "
-                     + String(firstYear) + " to " + String(lastYear) + ".");
-
-  // check if the day number exists for the chosen month and year
-  assert(not zerTim == IBPSA.Utilities.Time.Types.ZeroTime.Custom or
-    dayInMonth[monthRef] + (if monthRef == 2 and isLeapYear[yearRef -
-    firstYear + 1] then 1 else 0) >= dayRef, "The day number you chose is larger than the number of days contained by the month you chose.");
-
-  // compute the offset to be added to time based on the parameters specified by the user
-  if zerTim == IBPSA.Utilities.Time.Types.ZeroTime.UnixTimeStamp then
-    timOff :=0;
-  elseif zerTim == IBPSA.Utilities.Time.Types.ZeroTime.NY2010 or zerTim ==
-      IBPSA.Utilities.Time.Types.ZeroTime.Custom and yearRef == 2010 then
-      timOff :=timeStampsNewYear[1];
-  elseif zerTim == IBPSA.Utilities.Time.Types.ZeroTime.NY2011 or zerTim ==
-      IBPSA.Utilities.Time.Types.ZeroTime.Custom and yearRef == 2011 then
-      timOff :=timeStampsNewYear[2];
-  elseif zerTim == IBPSA.Utilities.Time.Types.ZeroTime.NY2012 or zerTim ==
-      IBPSA.Utilities.Time.Types.ZeroTime.Custom and yearRef == 2012 then
-      timOff :=timeStampsNewYear[3];
-  elseif zerTim == IBPSA.Utilities.Time.Types.ZeroTime.NY2013 or zerTim ==
-      IBPSA.Utilities.Time.Types.ZeroTime.Custom and yearRef == 2013 then
-      timOff :=timeStampsNewYear[4];
-  elseif zerTim == IBPSA.Utilities.Time.Types.ZeroTime.NY2014 or zerTim ==
-      IBPSA.Utilities.Time.Types.ZeroTime.Custom and yearRef == 2014 then
-      timOff :=timeStampsNewYear[5];
-  elseif zerTim == IBPSA.Utilities.Time.Types.ZeroTime.NY2015 or zerTim ==
-      IBPSA.Utilities.Time.Types.ZeroTime.Custom and yearRef == 2015 then
-      timOff :=timeStampsNewYear[6];
-  elseif zerTim == IBPSA.Utilities.Time.Types.ZeroTime.NY2016 or zerTim ==
-      IBPSA.Utilities.Time.Types.ZeroTime.Custom and yearRef == 2016 then
-      timOff :=timeStampsNewYear[7];
-  elseif zerTim == IBPSA.Utilities.Time.Types.ZeroTime.NY2017 or zerTim ==
-      IBPSA.Utilities.Time.Types.ZeroTime.Custom and yearRef == 2017 then
-      timOff :=timeStampsNewYear[8];
-  elseif zerTim == IBPSA.Utilities.Time.Types.ZeroTime.NY2018 or zerTim ==
-      IBPSA.Utilities.Time.Types.ZeroTime.Custom and yearRef == 2018 then
-      timOff :=timeStampsNewYear[9];
-  elseif zerTim == IBPSA.Utilities.Time.Types.ZeroTime.NY2019 or zerTim ==
-      IBPSA.Utilities.Time.Types.ZeroTime.Custom and yearRef == 2019 then
-      timOff :=timeStampsNewYear[10];
-  elseif zerTim == IBPSA.Utilities.Time.Types.ZeroTime.NY2020 or zerTim ==
-      IBPSA.Utilities.Time.Types.ZeroTime.Custom and yearRef == 2020 then
-      timOff :=timeStampsNewYear[11];
-  else
-    timOff :=0;
-    // this code should not be reachable
+initial algorithm
+// check if yearRef is in the valid range
+  assert(not zerTim == IBPSA.Utilities.Time.Types.ZeroTime.Custom or yearRef >= firstYear and yearRef <= lastYear, "The value you chose for yearRef (=" + String(yearRef) + ") is outside of
+   the validity range of " + String(firstYear) + " to " + String(lastYear) + ".");
+// check if the day number exists for the chosen month and year
+  assert(not zerTim == IBPSA.Utilities.Time.Types.ZeroTime.Custom or dayInMonth[monthRef] + (if monthRef == 2 and isLeapYear[yearRef - firstYear + 1] then 1 else 0) >= dayRef, "The day number you chose is larger than the number of days contained by the month you chose.");
+// compute the offset to be added to time based on the parameters specified by the user
+  if zerTim == IBPSA.Utilities.Time.Types.ZeroTime.UnixTimeStamp then
+    timOff := 0;
+  elseif zerTim == IBPSA.Utilities.Time.Types.ZeroTime.NY2010 or zerTim == IBPSA.Utilities.Time.Types.ZeroTime.Custom and yearRef == 2010 then
+    timOff := timeStampsNewYear[1];
+  elseif zerTim == IBPSA.Utilities.Time.Types.ZeroTime.NY2011 or zerTim == IBPSA.Utilities.Time.Types.ZeroTime.Custom and yearRef == 2011 then
+    timOff := timeStampsNewYear[2];
+  elseif zerTim == IBPSA.Utilities.Time.Types.ZeroTime.NY2012 or zerTim == IBPSA.Utilities.Time.Types.ZeroTime.Custom and yearRef == 2012 then
+    timOff := timeStampsNewYear[3];
+  elseif zerTim == IBPSA.Utilities.Time.Types.ZeroTime.NY2013 or zerTim == IBPSA.Utilities.Time.Types.ZeroTime.Custom and yearRef == 2013 then
+    timOff := timeStampsNewYear[4];
+  elseif zerTim == IBPSA.Utilities.Time.Types.ZeroTime.NY2014 or zerTim == IBPSA.Utilities.Time.Types.ZeroTime.Custom and yearRef == 2014 then
+    timOff := timeStampsNewYear[5];
+  elseif zerTim == IBPSA.Utilities.Time.Types.ZeroTime.NY2015 or zerTim == IBPSA.Utilities.Time.Types.ZeroTime.Custom and yearRef == 2015 then
+    timOff := timeStampsNewYear[6];
+  elseif zerTim == IBPSA.Utilities.Time.Types.ZeroTime.NY2016 or zerTim == IBPSA.Utilities.Time.Types.ZeroTime.Custom and yearRef == 2016 then
+    timOff := timeStampsNewYear[7];
+  elseif zerTim == IBPSA.Utilities.Time.Types.ZeroTime.NY2017 or zerTim == IBPSA.Utilities.Time.Types.ZeroTime.Custom and yearRef == 2017 then
+    timOff := timeStampsNewYear[8];
+  elseif zerTim == IBPSA.Utilities.Time.Types.ZeroTime.NY2018 or zerTim == IBPSA.Utilities.Time.Types.ZeroTime.Custom and yearRef == 2018 then
+    timOff := timeStampsNewYear[9];
+  elseif zerTim == IBPSA.Utilities.Time.Types.ZeroTime.NY2019 or zerTim == IBPSA.Utilities.Time.Types.ZeroTime.Custom and yearRef == 2019 then
+    timOff := timeStampsNewYear[10];
+  elseif zerTim == IBPSA.Utilities.Time.Types.ZeroTime.NY2020 or zerTim == IBPSA.Utilities.Time.Types.ZeroTime.Custom and yearRef == 2020 then
+    timOff := timeStampsNewYear[11];
+  else
+    timOff := 0;
     assert(false, "No valid ZeroTime could be identified.
-   This is a bug, please submit a bug report.");
-  end if;
-
-  // add additional offset when using a custom date and time
-  if zerTim == IBPSA.Utilities.Time.Types.ZeroTime.Custom then
-    timOff :=timOff + ((dayRef - 1) + sum({dayInMonth[i] for i in 1:(monthRef - 1)})
-     + (if monthRef > 2 and isLeapYear[yearRef - firstYear + 1] then 1 else 0))*3600*24;
-  end if;
-
-   // input data range checks at initial time
-  assert(time + offset + timOff >= timeStampsNewYear[1], if zerTim ==
-    IBPSA.Utilities.Time.Types.ZeroTime.UnixTimeStamp then "Could not initialize date in the CalendarTime block.
+   This is a bug, please submit a bug report.");
+  end if;
+// this code should not be reachable
+// add additional offset when using a custom date and time
+  if zerTim == IBPSA.Utilities.Time.Types.ZeroTime.Custom then
+    timOff := timOff + (dayRef - 1 + sum({dayInMonth[i] for i in 1:monthRef - 1}) + (if monthRef > 2 and isLeapYear[yearRef - firstYear + 1] then 1 else 0)) * 3600 * 24;
+  end if;
+// input data range checks at initial time
+  assert(time + offset + timOff >= timeStampsNewYear[1], if zerTim == IBPSA.Utilities.Time.Types.ZeroTime.UnixTimeStamp then "Could not initialize date in the CalendarTime block.
    You selected 1970 as the time=0 reference.
-   Therefore the simulation startTime must be at least "
-                                                   + String(
-    timeStampsNewYear[1]) + "." elseif zerTim == IBPSA.Utilities.Time.Types.ZeroTime.Custom
-     then if yearRef < firstYear then "Could not initialize date in the CalendarTime block.
+   Therefore the simulation startTime must be at least " + String(timeStampsNewYear[1]) + "." elseif zerTim == IBPSA.Utilities.Time.Types.ZeroTime.Custom then if yearRef < firstYear then "Could not initialize date in the CalendarTime block.
    You selected a custom time=0 reference.
-   The minimum value for yearRef is then "
-                                     + String(firstYear) + " but your value is "
-     + String(yearRef) + "." else "Could not initialize date in the CalendarTime block.
+   The minimum value for yearRef is then " + String(firstYear) + " but your value is " + String(yearRef) + "." else "Could not initialize date in the CalendarTime block.
    You selected a custom time=0 reference.
-   Possibly your startTime is too small."
-                                    else "Could not initialize date in the CalendarTime block.
+   Possibly your startTime is too small." else "Could not initialize date in the CalendarTime block.
    Possibly your startTime is negative?");
 
   assert(time + offset + timOff < timeStampsNewYear[size(
@@ -172,57 +144,43 @@
                                      + String(lastYear) + " but your value is "
      + String(yearRef) + "." else "Could not initialize date in the CalendarTime block.
        Possibly your startTime is too large.");
-
-  // iterate to find the year at initialization
+// iterate to find the year at initialization
 initial algorithm
-  year :=0;
-  for i in 1:size(timeStampsNewYear,1) loop
-    // may be reformulated using break if JModelica fixes bug
-    if unixTimeStamp < timeStampsNewYear[i] and (if i == 1 then true else unixTimeStamp >= timeStampsNewYear[i-1]) then
-      yearIndex :=i - 1;
-      year :=firstYear + i - 2;
-    end if;
-  end for;
-
-  // iterate to find the month at initialization
+  year :=0;
+  for i in 1:size(timeStampsNewYear, 1) loop
+    if unixTimeStamp < timeStampsNewYear[i] and (if i == 1 then true else unixTimeStamp >= timeStampsNewYear[i - 1]) then
+      yearIndex := i - 1;
+      year := firstYear + i - 2;
+    end if;
+  end for;
+// may be reformulated using break if JModelica fixes bug
+// iterate to find the month at initialization
   epochLastMonth := timeStampsNewYear[yearIndex];
-  month:=13;
-  for i in 1:12 loop
-    if (unixTimeStamp-epochLastMonth)/3600/24 <
-      (if i==2 and isLeapYear[yearIndex] then 1 + dayInMonth[i] else dayInMonth[i]) then
-      // construction below avoids the need of a break, which bugs out JModelica
-      month :=min(i,month);
-    else
-      epochLastMonth :=epochLastMonth + (if i == 2 and isLeapYear[yearIndex]
-         then 1 + dayInMonth[i] else dayInMonth[i])*3600*24;
-    end if;
+  month:=13;
+  for i in 1:12 loop
+    if (unixTimeStamp - epochLastMonth) / 3600 / 24 < (if i == 2 and isLeapYear[yearIndex] then 1 + dayInMonth[i] else dayInMonth[i]) then
+      month := min(i, month);
+    else
+      epochLastMonth := epochLastMonth + (if i == 2 and isLeapYear[yearIndex] then 1 + dayInMonth[i] else dayInMonth[i]) * 3600 * 24;
+    end if;
   end for;
-
-equation
-  // compute unix time step based on found offset
-  unixTimeStamp = time + offset + timOff;
-
-  // update the year when passing the epoch time stamp of the next year
-  when unixTimeStamp >= timeStampsNewYear[pre(yearIndex)+1] then
-    yearIndex=pre(yearIndex)+1;
-    assert(yearIndex<=size(timeStampsNewYear,1),
-      "Index out of range for epoch vector: timeStampsNewYear needs to be extended beyond the year "
-        + String(firstYear+size(timeStampsNewYear,1)));
-    year = pre(year) + 1;
-  end when;
-
-  // update the month when passing the last day of the current month
-  when unixTimeStamp >= pre(epochLastMonth) +
-      (if pre(month)==2 and isLeapYear[yearIndex]
-        then 1 + dayInMonth[pre(month)] else dayInMonth[pre(month)])*3600*24 then
-    month = if pre(month) == 12 then 1 else pre(month) + 1;
-    epochLastMonth = pre(epochLastMonth) +
-      (if pre(month)==2 and isLeapYear[yearIndex]
-        then 1 + dayInMonth[pre(month)] else dayInMonth[pre(month)])*3600*24;
-  end when;
-
-  // compute other variables that can be computed without using when() statements
-  hourSampleTrigger =sample(hourSampleStart, 3600);
+// construction below avoids the need of a break, which bugs out JModelica
+equation
+// compute unix time step based on found offset
+  unixTimeStamp = time + offset + timOff;
+// update the year when passing the epoch time stamp of the next year
+  when unixTimeStamp >= timeStampsNewYear[pre(yearIndex) + 1] then
+    yearIndex = pre(yearIndex) + 1;
+    assert(yearIndex <= size(timeStampsNewYear, 1), "Index out of range for epoch vector: timeStampsNewYear needs to be extended beyond the year " + String(firstYear + size(timeStampsNewYear, 1)));
+    year = pre(year) + 1;
+  end when;
+// update the month when passing the last day of the current month
+  when unixTimeStamp >= pre(epochLastMonth) + (if pre(month) == 2 and isLeapYear[yearIndex] then 1 + dayInMonth[pre(month)] else dayInMonth[pre(month)]) * 3600 * 24 then
+    month = if pre(month) == 12 then 1 else pre(month) + 1;
+    epochLastMonth = pre(epochLastMonth) + (if pre(month) == 2 and isLeapYear[yearIndex] then 1 + dayInMonth[pre(month)] else dayInMonth[pre(month)]) * 3600 * 24;
+  end when;
+// compute other variables that can be computed without using when() statements
+  hourSampleTrigger = sample(hourSampleStart, 3600);
   when hourSampleTrigger then
     if pre(firstHourSampling) then
       hour = integer(floor(rem(unixTimeStamp,3600*24)/3600));
@@ -245,11 +203,9 @@
     day = integer(1+floor((unixTimeStamp-epochLastMonth)/3600/24));
 
     firstDaySampling = false;
-  end when;
-
-  // using Real variables and operations for minutes since otherwise too many events are generated
-  minute = (unixTimeStamp/60-daysSinceEpoch*60*24-hour*60);
-
+  end when;
+// using Real variables and operations for minutes since otherwise too many events are generated
+  minute = unixTimeStamp / 60 - daysSinceEpoch * 60 * 24 - hour * 60;
   annotation (
     defaultComponentName="calTim",
   Documentation(revisions="
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Controls/ControlOutletWaterTemperature.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Controls/ControlOutletWaterTemperature.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Controls/ControlOutletWaterTemperature.mo"	2022-03-10 09:57:39.996144378 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Controls/ControlOutletWaterTemperature.mo"	2022-03-10 09:58:01.148147059 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Systems.Controls;
+within BuildSysPro.Systems.Controls;
 model ControlOutletWaterTemperature
 
 parameter Boolean RegTOR = true "On/Off control ?";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Controls/ControlTemperature.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Controls/ControlTemperature.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Controls/ControlTemperature.mo"	2022-03-10 09:57:39.996144378 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Controls/ControlTemperature.mo"	2022-03-10 09:58:01.132147057 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Systems.Controls;
+within BuildSysPro.Systems.Controls;
 model ControlTemperature
 
 protected
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Controls/PBandHysteresisSingleMode.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Controls/PBandHysteresisSingleMode.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Controls/PBandHysteresisSingleMode.mo"	2022-03-10 09:57:39.996144378 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Controls/PBandHysteresisSingleMode.mo"	2022-03-10 09:58:01.092147052 +0000
@@ -1,142 +1,38 @@
-within BuildSysPro.Systems.Controls;
-model PBandHysteresisSingleMode
-
-  Modelica.Blocks.Interfaces.RealInput X
-    annotation (Placement(transformation(extent={{-110,40},{-90,60}})));
-  Modelica.Blocks.Interfaces.RealInput X_ref
-    annotation (Placement(transformation(extent={{-110,-60},{-90,-40}})));
-  Modelica.Blocks.Interfaces.RealOutput epsilon
-    annotation (Placement(transformation(extent={{96,-10},{116,10}})));
-
-  parameter Real epsmin=0.3 "Minimum value of the output parameter";
-  parameter Real epsmax=1 "Maximum value of the output parameter";
-  parameter Real Range=0.5
-    "Maximum difference (X-X_ref) before output saturation";
-
-protected
-  Boolean preeps(start=true)
-    "Boolean that characterizes the previous value of epsilon: 1 if epsilon>0, 0 if epsilon = 0";
-
-algorithm
-  if (XX_ref+Range then     //If X-X_ref too positive, epsilon goes to 0
-    epsilon := 0;
-    preeps := false;
-  else
-    if preeps then       //Hysteresis loop: Linear regulation if X increases, or at 0 if X decreases
-     epsilon := min(abs(epsmax),max(abs(epsmin),abs(epsmax - (X-(X_ref-Range))*(epsmax-epsmin)/(2*Range))));
-    else
-      epsilon := 0;
-    end if;
-  end if;
-
-  annotation (Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-100,
-            -100},{100,100}}), graphics), Icon(coordinateSystem(
-          preserveAspectRatio=false, extent={{-100,-100},{100,100}}),
-        graphics={
-        Rectangle(
-          extent={{-100,100},{100,-100}},
-          lineColor={0,0,0},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Line(
-          points={{0,-86},{0,88},{0,86},{0,82}},
-          color={0,0,0},
-          smooth=Smooth.None),
-        Line(
-          points={{-88,-40},{86,-40},{30,-40},{20,-40}},
-          color={0,0,0},
-          smooth=Smooth.None),
-        Polygon(
-          points={{-2,86},{2,86},{0,96},{-2,86}},
-          lineColor={0,0,0},
-          smooth=Smooth.None,
-          fillColor={0,0,0},
-          fillPattern=FillPattern.Solid),
-        Polygon(
-          points={{3,6},{-1,6},{1,-4},{3,6}},
-          lineColor={0,0,0},
-          smooth=Smooth.None,
-          fillColor={0,0,0},
-          fillPattern=FillPattern.Solid,
-          origin={92,-41},
-          rotation=90),
-        Line(
-          points={{-88,64},{-38,64},{38,-16},{38,-16}},
-          color={0,0,255},
-          smooth=Smooth.None),
-        Line(
-          points={{-4,64},{4,64}},
-          color={0,0,0},
-          smooth=Smooth.None),
-        Text(
-          extent={{6,58},{22,70}},
-          lineColor={0,0,0},
-          textString="epsmax"),
-        Line(
-          points={{-38,-44},{-38,-36}},
-          color={0,0,0},
-          smooth=Smooth.None),
-        Text(
-          extent={{-44,-54},{-34,-44}},
-          lineColor={0,0,0},
-          textString="-e"),
-        Text(
-          extent={{34,-54},{44,-44}},
-          lineColor={0,0,0},
-          textString="e"),
-        Line(
-          points={{38,-44},{38,-36}},
-          color={0,0,0},
-          smooth=Smooth.None),
-        Line(
-          points={{-4,-16},{4,-16}},
-          color={0,0,0},
-          smooth=Smooth.None),
-        Text(
-          extent={{4,74},{24,86}},
-          lineColor={0,0,0},
-          textString="epsilon"),
-        Text(
-          extent={{84,-38},{102,-24}},
-          lineColor={0,0,0},
-          textString="X-X_ref"),
-        Text(
-          extent={{-16,-20},{0,-8}},
-          lineColor={0,0,0},
-          textString="epsmin"),
-        Line(
-          points={{4,22},{6,18},{2,20}},
-          color={0,0,255},
-          smooth=Smooth.None),
-        Line(
-          points={{2,-42},{-2,-40},{2,-38}},
-          color={0,0,255},
-          smooth=Smooth.None),
-        Line(
-          points={{40,-26},{38,-30},{36,-26}},
-          color={0,0,255},
-          smooth=Smooth.None),
-        Line(
-          points={{88,-40},{-38,-40}},
-          color={0,0,255},
-          smooth=Smooth.None),
-        Line(
-          points={{38,-40},{38,-16}},
-          color={0,0,255},
-          smooth=Smooth.None),
-        Line(
-          points={{-38,-40},{-38,64}},
-          color={0,0,255},
-          smooth=Smooth.None),
-        Line(
-          points={{-36,6},{-38,10},{-40,6}},
-          color={0,0,255},
-          smooth=Smooth.None)}),
-    Documentation(info="
+within BuildSysPro.Systems.Controls;
+
+model PBandHysteresisSingleMode
+  Modelica.Blocks.Interfaces.RealInput X annotation(
+    Placement(transformation(extent = {{-110, 40}, {-90, 60}})));
+  Modelica.Blocks.Interfaces.RealInput X_ref annotation(
+    Placement(transformation(extent = {{-110, -60}, {-90, -40}})));
+  Modelica.Blocks.Interfaces.RealOutput epsilon annotation(
+    Placement(transformation(extent = {{96, -10}, {116, 10}})));
+  parameter Real epsmin = 0.3 "Minimum value of the output parameter";
+  parameter Real epsmax = 1 "Maximum value of the output parameter";
+  parameter Real Range = 0.5 "Maximum difference (X-X_ref) before output saturation";
+protected
+  Boolean preeps(start = true) "Boolean that characterizes the previous value of epsilon: 1 if epsilon>0, 0 if epsilon = 0";
+algorithm
+  if X < X_ref - Range then
+    epsilon := abs(epsmax);
+    preeps := true;
+  elseif X > X_ref + Range then
+    epsilon := 0;
+    preeps := false;
+  else
+    if preeps then
+      epsilon := min(abs(epsmax), max(abs(epsmin), abs(epsmax - (X - (X_ref - Range)) * (epsmax - epsmin) / (2 * Range))));
+    else
+      epsilon := 0;
+    end if;
+  end if;
+//If X-X_ref too negative, epsilon saturates at epsmax
+//If X-X_ref too positive, epsilon goes to 0
+//Hysteresis loop: Linear regulation if X increases, or at 0 if X decreases
+  annotation(
+    Diagram(coordinateSystem(preserveAspectRatio = false, extent = {{-100, -100}, {100, 100}}), graphics),
+    Icon(coordinateSystem(preserveAspectRatio = false, extent = {{-100, -100}, {100, 100}}), graphics = {Rectangle(extent = {{-100, 100}, {100, -100}}, lineColor = {0, 0, 0}, fillColor = {255, 255, 255}, fillPattern = FillPattern.Solid), Line(points = {{0, -86}, {0, 88}, {0, 86}, {0, 82}}, color = {0, 0, 0}, smooth = Smooth.None), Line(points = {{-88, -40}, {86, -40}, {30, -40}, {20, -40}}, color = {0, 0, 0}, smooth = Smooth.None), Polygon(points = {{-2, 86}, {2, 86}, {0, 96}, {-2, 86}}, lineColor = {0, 0, 0}, smooth = Smooth.None, fillColor = {0, 0, 0}, fillPattern = FillPattern.Solid), Polygon(points = {{3, 6}, {-1, 6}, {1, -4}, {3, 6}}, lineColor = {0, 0, 0}, smooth = Smooth.None, fillColor = {0, 0, 0}, fillPattern = FillPattern.Solid, origin = {92, -41}, rotation = 90), Line(points = {{-88, 64}, {-38, 64}, {38, -16}, {38, -16}}, color = {0, 0, 255}, smooth = Smooth.None), Line(points = {{-4, 64}, {4, 64}}, color = {0, 0, 0}, smooth = Smooth.None), Text(extent = {{6, 58}, {22, 70}}, lineColor = {0, 0, 0}, textString = "epsmax"), Line(points = {{-38, -44}, {-38, -36}}, color = {0, 0, 0}, smooth = Smooth.None), Text(extent = {{-44, -54}, {-34, -44}}, lineColor = {0, 0, 0}, textString = "-e"), Text(extent = {{34, -54}, {44, -44}}, lineColor = {0, 0, 0}, textString = "e"), Line(points = {{38, -44}, {38, -36}}, color = {0, 0, 0}, smooth = Smooth.None), Line(points = {{-4, -16}, {4, -16}}, color = {0, 0, 0}, smooth = Smooth.None), Text(extent = {{4, 74}, {24, 86}}, lineColor = {0, 0, 0}, textString = "epsilon"), Text(extent = {{84, -38}, {102, -24}}, lineColor = {0, 0, 0}, textString = "X-X_ref"), Text(extent = {{-16, -20}, {0, -8}}, lineColor = {0, 0, 0}, textString = "epsmin"), Line(points = {{4, 22}, {6, 18}, {2, 20}}, color = {0, 0, 255}, smooth = Smooth.None), Line(points = {{2, -42}, {-2, -40}, {2, -38}}, color = {0, 0, 255}, smooth = Smooth.None), Line(points = {{40, -26}, {38, -30}, {36, -26}}, color = {0, 0, 255}, smooth = Smooth.None), Line(points = {{88, -40}, {-38, -40}}, color = {0, 0, 255}, smooth = Smooth.None), Line(points = {{38, -40}, {38, -16}}, color = {0, 0, 255}, smooth = Smooth.None), Line(points = {{-38, -40}, {-38, 64}}, color = {0, 0, 255}, smooth = Smooth.None), Line(points = {{-36, 6}, {-38, 10}, {-40, 6}}, color = {0, 0, 255}, smooth = Smooth.None)}),
+    Documentation(info = "
 
Regulation proportional to hysteresis

 
Hypothesis and equations

 
The model returns a value between 0 and 1 from a value X and a setpoint X_ref.>

@@ -160,5 +56,5 @@
 BuildSysPro version 3.5.0

 Author : Frédéric GASTIGER, Sila FILFLI, EDF (2013)

 --------------------------------------------------------------

-"));
-end PBandHysteresisSingleMode;
+"));
+end PBandHysteresisSingleMode;
\ No newline at end of file
Only in converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Controls: PBandHysteresisSingleMode.mo.after
Only in converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Controls: PBandHysteresisSingleMode.mo.before
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Controls/PIDDualMode.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Controls/PIDDualMode.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Controls/PIDDualMode.mo"	2022-03-10 09:57:39.996144378 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Controls/PIDDualMode.mo"	2022-03-10 09:58:01.076147051 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Systems.Controls;
+within BuildSysPro.Systems.Controls;
 model PIDDualMode
   "Heating and cooling regulation with constant or prescribed setpoints"
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Controls/PIDFixed.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Controls/PIDFixed.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Controls/PIDFixed.mo"	2022-03-10 09:57:39.996144378 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Controls/PIDFixed.mo"	2022-03-10 09:58:01.008147042 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Systems.Controls;
+within BuildSysPro.Systems.Controls;
 model PIDFixed
   "PID control model connectable to an indoor air port of a building "
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Controls/PIDFixedDualMode.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Controls/PIDFixedDualMode.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Controls/PIDFixedDualMode.mo"	2022-03-10 09:57:39.996144378 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Controls/PIDFixedDualMode.mo"	2022-03-10 09:58:00.988147040 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Systems.Controls;
+within BuildSysPro.Systems.Controls;
 model PIDFixedDualMode "Heating and cooling setpoints"
   parameter Modelica.Units.SI.Power PuissanceNom=1000
     "Nominal power of the system";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Controls/PIDPrescribedSingleMode.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Controls/PIDPrescribedSingleMode.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Controls/PIDPrescribedSingleMode.mo"	2022-03-10 09:57:39.996144378 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Controls/PIDPrescribedSingleMode.mo"	2022-03-10 09:58:00.968147036 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Systems.Controls;
+within BuildSysPro.Systems.Controls;
 model PIDPrescribedSingleMode
   "Calculation of heating or air conditioning needs (PID with temperature scenario)"
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Controls/PIDSingleOrDualMode.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Controls/PIDSingleOrDualMode.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Controls/PIDSingleOrDualMode.mo"	2022-03-10 09:57:39.996144378 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Controls/PIDSingleOrDualMode.mo"	2022-03-10 09:58:00.952147034 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Systems.Controls;
+within BuildSysPro.Systems.Controls;
 model PIDSingleOrDualMode
   "Heating and cooling regulation with constant or prescribed setpoints"
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Controls/PrescribedFilteredTemperature.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Controls/PrescribedFilteredTemperature.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Controls/PrescribedFilteredTemperature.mo"	2022-03-10 09:57:39.996144378 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Controls/PrescribedFilteredTemperature.mo"	2022-03-10 09:58:00.928147031 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Systems.Controls;
+within BuildSysPro.Systems.Controls;
 model PrescribedFilteredTemperature
 
   BuildSysPro.BaseClasses.HeatTransfer.Interfaces.HeatPort_b port
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Controls/WaterDesignTemperature.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Controls/WaterDesignTemperature.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Controls/WaterDesignTemperature.mo"	2022-03-10 09:57:39.996144378 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Controls/WaterDesignTemperature.mo"	2022-03-10 09:58:00.912147030 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Systems.Controls;
+within BuildSysPro.Systems.Controls;
 model WaterDesignTemperature
 
   parameter Boolean RegTOR = true "On/Off control ?";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Controls/package.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Controls/package.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Controls/package.mo"	2022-03-10 09:57:39.996144378 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Controls/package.mo"	2022-03-10 09:58:01.160147061 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Systems;
+within BuildSysPro.Systems;
 package Controls "Eléments de régulation génériques développés pour des systèmes énergétiques"
 
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/DHW/Electric/ResistiveWaterHeater.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/DHW/Electric/ResistiveWaterHeater.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/DHW/Electric/ResistiveWaterHeater.mo"	2022-03-10 09:57:39.996144378 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/DHW/Electric/ResistiveWaterHeater.mo"	2022-03-10 09:58:00.880147025 +0000
@@ -21,7 +21,7 @@
   parameter Modelica.Units.SI.SpecificHeatCapacity Cp=4185
     "Specific heat capacity"
     annotation (Dialog(group="Fluid", tab="Other parameters"));
-  //Modelica.SIunits.Temperature T "Water temperature in the tank";
+  //Modelica.SIunits.Temperature T "Water temperature in the tank";
   Integer Hyst(start=0) "Hysteresis";
 
   Real PertekWh "Energy loss through the tank envelope in kWh";
@@ -114,7 +114,7 @@
   der(EnergieCHkWh)=ChauffageEau.solid.Q_flow*coef36;
   der(PertekWh)=deperdition.port_a.Q_flow*coef36;
 initial equation
-//  der(T)=0.0;
+//  der(T)=0.0;
   T_tank = T_sp;
   EnergieCHkWh=0.0;
   PertekWh=0.0;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/DHW/Electric/WaterTank.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/DHW/Electric/WaterTank.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/DHW/Electric/WaterTank.mo"	2022-03-10 09:57:39.996144378 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/DHW/Electric/WaterTank.mo"	2022-03-10 09:58:00.848147021 +0000
@@ -1,8 +1,7 @@
-within BuildSysPro.Systems.DHW.Electric;
+within BuildSysPro.Systems.DHW.Electric;
 model WaterTank
 
-  //import SI=Modelica.SIunits;
-
+//import SI=Modelica.SIunits;
   parameter Integer nc=10 "Number of layers of the tank" annotation (Dialog(tab="Tank parameters"));
   parameter Integer ncInj=9 "Layer number of the electric power injection" annotation (Dialog(tab="Tank parameters"));
   parameter Integer ncSol=2 "Layer number of the solar power injection"
@@ -54,8 +53,8 @@
   Modelica.Units.SI.Energy Conso;
   Real diametre=sqrt(4*Volume/(pi*Hauteur));
   Real dz=Hauteur/nc;
-  //Integer ncInj=integer(hInj/dz)+1;
-    //""Layer number of the power injection";
+  //Integer ncInj=integer(hInj/dz)+1;
+  //""Layer number of the power injection";
   Real dv=Volume/nc;
   Real pi=Modelica.Constants.pi;
   Real sint=pi*diametre*Hauteur+2*sbase;
@@ -63,8 +62,8 @@
   Real rovcp= rho*dv*cp;
   Real MCp=debit/3600*cp;
   Boolean HC[3]={heure>=0 and heure<=6,heure>=12 and heure<=14, heure>=16 and heure<=18};
-  //Integer OnOff=if HC[1] or HC[2] then 1 else 0;
-  //Integer Mu=1;
+  //Integer OnOff=if HC[1] or HC[2] then 1 else 0;
+  //Integer Mu=1;
   Real OnOffPmax=OnOff*Pmax;
   Real cond=lambda*sbase/dz;
   Real Slat[2];
@@ -141,52 +140,45 @@
 
   when Hyst<>pre(Hyst) then
       nMA=pre(nMA)+1;
-  end when;
-
-// Regulation
-  Hyst=if T[ncInj]<=T_sp-BP then 1 else (if T[ncInj]>= T_sp+BP then 0 else pre(Hyst));
-  OnOffSol=if T[ncSol]<=T_sp-0.2 then 1 else (if T[ncSol+1]>= T_sp+BP then 0 else pre(OnOffSol));
-
-// Distribution of powers transferred to the water per layer
-  for i in 1:nc loop
-    if i==ncInj then
-      puis[i]=OnOffPmax*Hyst;
-    elseif i==ncSol then
-      puis[i]=OnOffSol*max(0, -T_solar.Q_flow);
-    else
-      puis[i]=0;
-    end if;
-  end for;
-
-// Heat balance on the layer 1 after setting exchanges with the room (loss) and with upper and lower layers (conv)
-  perte[1]=U*Slat[2]*(T[1] - T_int);
+  end when;
+// Regulation
+  Hyst = if T[ncInj] <= T_sp - BP then 1 else if T[ncInj] >= T_sp + BP then 0 else pre(Hyst);
+  OnOffSol=if T[ncSol]<=T_sp-0.2 then 1 else (if T[ncSol+1]>= T_sp+BP then 0 else pre(OnOffSol));
+// Distribution of powers transferred to the water per layer
+  for i in 1:nc loop
+    if i == ncInj then
+      puis[i] = OnOffPmax * Hyst;
+    elseif i == ncSol then
+      puis[i] = OnOffSol * max(0, -T_solar.Q_flow);
+    else
+      puis[i] = 0;
+    end if;
+  end for;
+// Heat balance on the layer 1 after setting exchanges with the room (loss) and with upper and lower layers (conv)
+  perte[1] = U * Slat[2] * (T[1] - T_int);
   if nc>=2 then
     conv[1]=(if T[1]>T[2] then ku else kd)*(T[2]-T[1]);
   else
     conv[1]=0;
   end if;
-  rovcp*der(T[1]) = puis[1] - perte[1] + MCp*(T_cold_internal-T[1]) + conv[1] + (if nc==1 then 0 else cond*(T[2]-T[1]));
-
-  if nc>1 then
-// Heat balance on intermediate layers
-  for i in 2:nc-1 loop
-    perte[i]=U*Slat[1]*(T[i] - T_int);
-    conv[i]=(if T[i]>T[i+1] then ku else kd)*(T[i+1]-T[i]);
-    rovcp*der(T[i]) = puis[i] - perte[i] + MCp *(T[i-1]-T[i]) + conv[i]-conv[i-1] + cond*(T[i-1]+T[i+1]-2*T[i]);
-  end for;
-
-// Heat balance on the upper layer
-  perte[nc]=U*Slat[2]*(T[nc] - T_int);
-  conv[nc]=0;//*(if T[nc-1]>T[nc] then ku else kd)*(T[nc-1]-T[nc]);
-  rovcp*der(T[nc]) = puis[nc] - perte[nc] + MCp*(T[nc-1]-T[nc]) + 0 - conv[nc-1] + cond*(T[nc-1]-T[nc]);
-
-  end if;
-
-// Heat transfer fluid of the solar sensor exits the tank with the temperature of the layer ncSol
-  T_solar.T = T[ncSol];
-
-// Analysis data
-  Perte=sum(perte);
+  rovcp*der(T[1]) = puis[1] - perte[1] + MCp*(T_cold_internal-T[1]) + conv[1] + (if nc==1 then 0 else cond*(T[2]-T[1]));
+  if nc > 1 then
+// Heat balance on intermediate layers
+    for i in 2:nc - 1 loop
+      perte[i] = U * Slat[1] * (T[i] - T_int);
+      conv[i] = (if T[i] > T[i + 1] then ku else kd) * (T[i + 1] - T[i]);
+      rovcp * der(T[i]) = puis[i] - perte[i] + MCp * (T[i - 1] - T[i]) + conv[i] - conv[i - 1] + cond * (T[i - 1] + T[i + 1] - 2 * T[i]);
+    end for;
+// Heat balance on the upper layer
+    perte[nc] = U * Slat[2] * (T[nc] - T_int);
+    conv[nc] = 0;
+//*(if T[nc-1]>T[nc] then ku else kd)*(T[nc-1]-T[nc]);
+    rovcp * der(T[nc]) = puis[nc] - perte[nc] + MCp * (T[nc - 1] - T[nc]) + 0 - conv[nc - 1] + cond * (T[nc - 1] - T[nc]);
+  end if;
+// Heat transfer fluid of the solar sensor exits the tank with the temperature of the layer ncSol
+  T_solar.T = T[ncSol];
+// Analysis data
+  Perte = sum(perte);
   Pelec = puis[ncInj];
   der(Conso)=Pelec;
   Cons = Conso;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/DHW/Examples/DHWResistiveWaterHeater.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/DHW/Examples/DHWResistiveWaterHeater.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/DHW/Examples/DHWResistiveWaterHeater.mo"	2022-03-10 09:57:39.996144378 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/DHW/Examples/DHWResistiveWaterHeater.mo"	2022-03-10 09:58:00.792147015 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Systems.DHW.Examples;
+within BuildSysPro.Systems.DHW.Examples;
 model DHWResistiveWaterHeater
 
 extends Modelica.Icons.Example;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/DHW/HeatPump/Components/MixedWaterTank.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/DHW/HeatPump/Components/MixedWaterTank.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/DHW/HeatPump/Components/MixedWaterTank.mo"	2022-03-10 09:57:39.996144378 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/DHW/HeatPump/Components/MixedWaterTank.mo"	2022-03-10 09:58:00.700147002 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Systems.DHW.HeatPump.Components;
+within BuildSysPro.Systems.DHW.HeatPump.Components;
 model MixedWaterTank
   "Uniform water tank"
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/DHW/HeatPump/Components/StratifiedWaterTank.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/DHW/HeatPump/Components/StratifiedWaterTank.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/DHW/HeatPump/Components/StratifiedWaterTank.mo"	2022-03-10 09:57:39.996144378 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/DHW/HeatPump/Components/StratifiedWaterTank.mo"	2022-03-10 09:58:00.684147000 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Systems.DHW.HeatPump.Components;
+within BuildSysPro.Systems.DHW.HeatPump.Components;
 model StratifiedWaterTank
   "Stratified water tank"
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/DHW/HeatPump/Components/WaterHeaterHeatPumpController.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/DHW/HeatPump/Components/WaterHeaterHeatPumpController.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/DHW/HeatPump/Components/WaterHeaterHeatPumpController.mo"	2022-03-10 09:57:39.996144378 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/DHW/HeatPump/Components/WaterHeaterHeatPumpController.mo"	2022-03-10 09:58:00.668146998 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Systems.DHW.HeatPump.Components;
+within BuildSysPro.Systems.DHW.HeatPump.Components;
 model WaterHeaterHeatPumpController
   "Simple Hysteresis control with Time of Use switch and Auto mode"
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/DHW/HeatPump/Components/WaterHeaterHeatPumpPoly.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/DHW/HeatPump/Components/WaterHeaterHeatPumpPoly.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/DHW/HeatPump/Components/WaterHeaterHeatPumpPoly.mo"	2022-03-10 09:57:39.996144378 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/DHW/HeatPump/Components/WaterHeaterHeatPumpPoly.mo"	2022-03-10 09:58:00.648146997 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Systems.DHW.HeatPump.Components;
+within BuildSysPro.Systems.DHW.HeatPump.Components;
 model WaterHeaterHeatPumpPoly
   "Polynomial model of air-source heat pump for water heating"
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/DHW/HeatPump/Components/package.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/DHW/HeatPump/Components/package.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/DHW/HeatPump/Components/package.mo"	2022-03-10 09:57:39.996144378 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/DHW/HeatPump/Components/package.mo"	2022-03-10 09:58:00.708147003 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Systems.DHW.HeatPump;
+within BuildSysPro.Systems.DHW.HeatPump;
 package Components
 annotation (Documentation(info="
 
--------------------------------------------------------------

diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/DHW/HeatPump/HPWaterHeaterPoly_Stratified.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/DHW/HeatPump/HPWaterHeaterPoly_Stratified.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/DHW/HeatPump/HPWaterHeaterPoly_Stratified.mo"	2022-03-10 09:57:39.996144378 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/DHW/HeatPump/HPWaterHeaterPoly_Stratified.mo"	2022-03-10 09:58:00.628146994 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Systems.DHW.HeatPump;
+within BuildSysPro.Systems.DHW.HeatPump;
 model HPWaterHeaterPoly_Stratified
 
   // Draw-off scenario parameters
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/DHW/HeatPump/HPWaterHeaterPoly_Uniform.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/DHW/HeatPump/HPWaterHeaterPoly_Uniform.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/DHW/HeatPump/HPWaterHeaterPoly_Uniform.mo"	2022-03-10 09:57:39.996144378 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/DHW/HeatPump/HPWaterHeaterPoly_Uniform.mo"	2022-03-10 09:58:00.600146990 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Systems.DHW.HeatPump;
+within BuildSysPro.Systems.DHW.HeatPump;
 model HPWaterHeaterPoly_Uniform
 
   // Draw-off scenario parameters
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/DHW/Solar/SolarWaterHeater.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/DHW/Solar/SolarWaterHeater.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/DHW/Solar/SolarWaterHeater.mo"	2022-03-10 09:57:39.996144378 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/DHW/Solar/SolarWaterHeater.mo"	2022-03-10 09:58:00.564146985 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Systems.DHW.Solar;
+within BuildSysPro.Systems.DHW.Solar;
 model SolarWaterHeater
   "Individual solar hot water heater model derived from the combination of a solar thermal panel and a thermodynamic tank"
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/DHW/Solar/package.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/DHW/Solar/package.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/DHW/Solar/package.mo"	2022-03-10 09:57:39.996144378 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/DHW/Solar/package.mo"	2022-03-10 09:58:00.568146986 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Systems.DHW;
+within BuildSysPro.Systems.DHW;
 package Solar
 
 annotation (Documentation(info="
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Distribution/CapacitiveHydraulicPipe.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Distribution/CapacitiveHydraulicPipe.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Distribution/CapacitiveHydraulicPipe.mo"	2022-03-10 09:57:39.996144378 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Distribution/CapacitiveHydraulicPipe.mo"	2022-03-10 09:58:00.536146982 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Systems.Distribution;
+within BuildSysPro.Systems.Distribution;
 model CapacitiveHydraulicPipe
 
   Modelica.Blocks.Interfaces.RealInput WaterIn[2]
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Distribution/DistributionPipe.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Distribution/DistributionPipe.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Distribution/DistributionPipe.mo"	2022-03-10 09:57:39.996144378 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Distribution/DistributionPipe.mo"	2022-03-10 09:58:00.524146980 +0000
@@ -23,9 +23,9 @@
                                                   annotation(Dialog(enable=(Choix==2), group="Choice 2 : Estimation by boiler power"));
 
 protected
-  SI.MassFlowRate Debit; //Mass flow in the pipe
-SI.Power Qper; //Lost heat
-
+  SI.MassFlowRate Debit;   //Mass flow in the pipe
+  SI.Power Qper; 
+//Lost heat
 public
   Modelica.Blocks.Interfaces.RealOutput WaterOut[2]
     "Vector containing 1- the output fluid temperature (K), 2- the output fluid flow rate (kg/s)"
@@ -39,41 +39,35 @@
     "Heatport to connect to the thermal zone" annotation (Placement(
         transformation(extent={{-10,60},{10,80}}), iconTransformation(extent={{-10,
             60},{10,80}})));
-// -----------------------------------------------------------------------------------
-equation
-
-// Conservation of flow : WaterIn[2]=WaterOut[2]
-  Debit=WaterIn[2];
-
-// Calculation of the distribution pipe losses
-  if (L>0) then// CASE : KNOWN PIPE
-
-  // Calculation of the output temperature
-    if WaterIn[1] > T_int.T then
-      WaterOut[1] = max(T_int.T, WaterIn[1] - (WaterIn[1] - T_int.T)*(1 - exp(-
-        U*L/(Debit*CpLiq))));
-    else
-      WaterOut[1] = min(T_int.T, WaterIn[1] - (WaterIn[1] - T_int.T)*(1 - exp(-
-        U*L/(Debit*CpLiq))));
-    end if;
-  // Calculation of losses
-    Qper =Debit*CpLiq*(WaterIn[1] - WaterOut[1]);
-
-  else // CASE : DEFAULT VALUES
-  // Calculation of losses
-    Qper = Cperte*QfouNom;
-
-  // Calculation of the output temperature
-    if (Debit>1e-4) then
-      WaterOut[1] = WaterIn[1] - Qper/(Debit*CpLiq);
-    else
-      WaterOut[1] = T_int.T;
-    end if;
-
-end if;
 
-// Calculation of the recoverable heat part
-  T_int.Q_flow = -Qper*(1 - Rpnre);
+// -----------------------------------------------------------------------------------
+equation
+// Conservation of flow : WaterIn[2]=WaterOut[2]
+  Debit = WaterIn[2];
+// Calculation of the distribution pipe losses
+  if L > 0 then
+// CASE : KNOWN PIPE
+// Calculation of the output temperature
+    if WaterIn[1] > T_int.T then
+      WaterOut[1] = max(T_int.T, WaterIn[1] - (WaterIn[1] - T_int.T) * (1 - exp(-U * L / (Debit * CpLiq))));
+    else
+      WaterOut[1] = min(T_int.T, WaterIn[1] - (WaterIn[1] - T_int.T) * (1 - exp(-U * L / (Debit * CpLiq))));
+    end if;
+// Calculation of losses
+    Qper = Debit * CpLiq * (WaterIn[1] - WaterOut[1]);
+  else
+// CASE : DEFAULT VALUES
+// Calculation of losses
+    Qper = Cperte * QfouNom;
+// Calculation of the output temperature
+    if Debit > 1e-4 then
+      WaterOut[1] = WaterIn[1] - Qper / (Debit * CpLiq);
+    else
+      WaterOut[1] = T_int.T;
+    end if;
+  end if;
+// Calculation of the recoverable heat part
+  T_int.Q_flow = -Qper * (1 - Rpnre);
 
   connect(WaterIn[2], WaterOut[2]) annotation (Line(
       points={{-100,20},{100,20}},
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Distribution/Fan.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Distribution/Fan.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Distribution/Fan.mo"	2022-03-10 09:57:39.996144378 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Distribution/Fan.mo"	2022-03-10 09:58:00.512146978 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Systems.Distribution;
+within BuildSysPro.Systems.Distribution;
 model Fan
 
 // INPUT VARIABLES :
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Distribution/HydraulicPipe.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Distribution/HydraulicPipe.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Distribution/HydraulicPipe.mo"	2022-03-10 09:57:39.996144378 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Distribution/HydraulicPipe.mo"	2022-03-10 09:58:00.496146977 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Systems.Distribution;
+within BuildSysPro.Systems.Distribution;
 model HydraulicPipe "Modeling of a hot or cold water network"
 
   import      Modelica.Units.SI;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Distribution/PumpElecCons.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Distribution/PumpElecCons.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Distribution/PumpElecCons.mo"	2022-03-10 09:57:39.996144378 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Distribution/PumpElecCons.mo"	2022-03-10 09:58:00.412146966 +0000
@@ -1,24 +1,24 @@
 within BuildSysPro.Systems.Distribution;
 model PumpElecCons "Electric consumption of a pump"
 
-//  input Modelica.SIunits.MassFlowRate Me = 2.5 "Fluid mass flow";
-//  input Modelica.SIunits.Temp_C Te = 12.8 "Input temperature of the fluid";
+//  input Modelica.SIunits.MassFlowRate Me = 2.5 "Fluid mass flow";
+  //  input Modelica.SIunits.Temp_C Te = 12.8 "Input temperature of the fluid";
   import      Modelica.Units.SI;
 
-// Weighting coefficients //FFLP = C0 + C1. PLR + C2. PLR 2 + C3.PLR3"
+// Weighting coefficients //FFLP = C0 + C1. PLR + C2. PLR 2 + C3.PLR3"
   parameter Real C0=0.350712 annotation (Dialog(group="Regression coefficients of partial load performances"));
   parameter Real C1=0.3085     annotation (Dialog(group="Regression coefficients of partial load performances"));
   parameter Real C2=-0.541370 annotation (Dialog(group="Regression coefficients of partial load performances"));
   parameter Real C3=0.8810   annotation (Dialog(group="Regression coefficients of partial load performances"));
 
-// Rated parameters
+// Rated parameters
   parameter SI.Efficiency etaM = 0.85 "Motor efficiency" annotation (Dialog(group="Rated parameters"));
   parameter SI.VolumeFlowRate Vrat = 0.0001 "Volume flow rate" annotation (Dialog(group="Rated parameters"));
   parameter SI.Power Wprat = 20 "Total rated power" annotation (Dialog(group="Rated parameters"));
   parameter SI.Pressure DPrat = 89700 "Rated pression difference" annotation (Dialog(group="Rated parameters"));
   parameter SI.VolumeFlowRate VratMin=Vrat/10 "Minimum volume flow" annotation (Dialog(group="Rated parameters"));
 
-// Fluid characteristics
+// Fluid characteristics
   parameter SI.SpecificHeatCapacity CpLiq=4180 "Fluid specific heat capacity" annotation (Dialog(group="Fluid characteristics"));
   parameter SI.Density rhoLiq=998 "Fluid density" annotation (Dialog(group="Fluid characteristics"));
   parameter Real fmloss=0.5
@@ -50,35 +50,30 @@
         iconTransformation(extent={{-10,-10},{10,10}},
         rotation=270,
         origin={0,-90})));
-// -----------------------------------------------------------------------------------
-equation
 
-// Volume flow conservation : WaterIn[2]=WaterOut[2]
-  Debit=WaterIn[2];
-
-// The both following lines are used to set internal parameters and are independent
-// of component input values. In an hourly simulation, this block of code may
-// be skipped after the first call.
-  etaPM =  Vrat*DPrat/Wprat;
-  etaP =  etaPM / etaM;
-
-// Calculate the part load ratio based on rated flow
-  PLR =  abs(Debit) / rhoLiq / Vrat;
-
-// Calculate the fraction of full-load power based on rating point
-  FFLP =  C0+C1*PLR+C2*PLR^2+C3*PLR^3;
-
-// Calculate the actual pump shaft power and motor power
-  if Debit>VratMin*rhoLiq then
-    Pelec = Wprat*FFLP;
-    Wshaft = Pelec*etaM;
-  else
-    Pelec=0;
-    Wshaft=0;
-  end if;
-
-// Calculate the leaving fluid conditions
-  qLoss =  Wshaft*(1-etaP) + (Pelec-Wshaft)*fmloss;
+// -----------------------------------------------------------------------------------
+equation
+// Volume flow conservation : WaterIn[2]=WaterOut[2]
+  Debit = WaterIn[2];
+// The both following lines are used to set internal parameters and are independent
+// of component input values. In an hourly simulation, this block of code may
+// be skipped after the first call.
+  etaPM = Vrat * DPrat / Wprat;
+  etaP =  etaPM / etaM;
+// Calculate the part load ratio based on rated flow
+  PLR = abs(Debit) / rhoLiq / Vrat;
+// Calculate the fraction of full-load power based on rating point
+  FFLP = C0 + C1 * PLR + C2 * PLR ^ 2 + C3 * PLR ^ 3;
+// Calculate the actual pump shaft power and motor power
+  if Debit > VratMin * rhoLiq then
+    Pelec = Wprat * FFLP;
+    Wshaft = Pelec * etaM;
+  else
+    Pelec = 0;
+    Wshaft = 0;
+  end if;
+// Calculate the leaving fluid conditions
+  qLoss = Wshaft * (1 - etaP) + (Pelec - Wshaft) * fmloss;
   WaterOut[1] = WaterIn[1] + qLoss/Debit/CpLiq;
 
   connect(WaterIn[2], WaterOut[2]) annotation (Line(
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Distribution/Pump_fct.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Distribution/Pump_fct.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Distribution/Pump_fct.mo"	2022-03-10 09:57:39.996144378 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Distribution/Pump_fct.mo"	2022-03-10 09:58:00.392146963 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Systems.Distribution;
+within BuildSysPro.Systems.Distribution;
 function Pump_fct
   "Model of oriented pumps to calculate the consumption of air-conditioned buildings"
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Distribution/ThreeWayValveAndPump.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Distribution/ThreeWayValveAndPump.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Distribution/ThreeWayValveAndPump.mo"	2022-03-10 09:57:39.996144378 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Distribution/ThreeWayValveAndPump.mo"	2022-03-10 09:58:00.376146962 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Systems.Distribution;
+within BuildSysPro.Systems.Distribution;
 model ThreeWayValveAndPump "Three ways valve with water pump"
 
   parameter Modelica.Units.SI.Power Pe_cons_WP=30;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Distribution/ThreeWayValveFlow.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Distribution/ThreeWayValveFlow.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Distribution/ThreeWayValveFlow.mo"	2022-03-10 09:57:39.996144378 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Distribution/ThreeWayValveFlow.mo"	2022-03-10 09:58:00.332146957 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Systems.Distribution;
+within BuildSysPro.Systems.Distribution;
 model ThreeWayValveFlow
 
   parameter Modelica.Units.SI.MassFlowRate m_flow=0.01
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Distribution/ThreeWayValveTemperature.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Distribution/ThreeWayValveTemperature.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Distribution/ThreeWayValveTemperature.mo"	2022-03-10 09:57:39.996144378 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Distribution/ThreeWayValveTemperature.mo"	2022-03-10 09:58:00.316146954 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Systems.Distribution;
+within BuildSysPro.Systems.Distribution;
 model ThreeWayValveTemperature
 
   parameter Modelica.Units.SI.MassFlowRate m_flow=0.01
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Distribution/WaterCirculator.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Distribution/WaterCirculator.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Distribution/WaterCirculator.mo"	2022-03-10 09:57:39.996144378 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Distribution/WaterCirculator.mo"	2022-03-10 09:58:00.296146951 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Systems.Distribution;
+within BuildSysPro.Systems.Distribution;
 model WaterCirculator
 
   parameter Modelica.Units.SI.MassFlowRate m_flow=0.01
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Emission/ElectricHeater/JouleHeatingPIControlled.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Emission/ElectricHeater/JouleHeatingPIControlled.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Emission/ElectricHeater/JouleHeatingPIControlled.mo"	2022-03-10 09:57:39.996144378 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Emission/ElectricHeater/JouleHeatingPIControlled.mo"	2022-03-10 09:58:00.256146947 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Systems.HVAC.Emission.ElectricHeater;
+within BuildSysPro.Systems.HVAC.Emission.ElectricHeater;
 model JouleHeatingPIControlled "Electric convector with PI control"
 
   parameter Modelica.Units.SI.Power Pnom=1500 "Nominal power of the convector"
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Emission/Examples/RadiatorEN442_Test.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Emission/Examples/RadiatorEN442_Test.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Emission/Examples/RadiatorEN442_Test.mo"	2022-03-10 09:57:39.996144378 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Emission/Examples/RadiatorEN442_Test.mo"	2022-03-10 09:58:00.204146939 +0000
@@ -1,13 +1,13 @@
-within BuildSysPro.Systems.HVAC.Emission.Examples;
+within BuildSysPro.Systems.HVAC.Emission.Examples;
 model RadiatorEN442_Test "Example to test the HotWaterRadiator model"
   extends Modelica.Icons.Example;
   parameter Modelica.Units.SI.EnergyFlowRate Pnom=411;
   parameter Real nNom=1.225 "Slope at nominal point";
 
-    // Variables
+// Variables
   Modelica.Units.SI.Temperature Tinlet;
   Modelica.Units.SI.Temperature Toutlet;
-    // Components
+    // Components
   BuildSysPro.Systems.HVAC.Emission.Radiator.Radiator_EN442 Radiator(
     Pnom=Pnom,
     nNom=nNom,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Emission/RadiantFloor/RadiantHeatingFloor.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Emission/RadiantFloor/RadiantHeatingFloor.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Emission/RadiantFloor/RadiantHeatingFloor.mo"	2022-03-10 09:57:39.996144378 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Emission/RadiantFloor/RadiantHeatingFloor.mo"	2022-03-10 09:58:00.184146937 +0000
@@ -1,9 +1,9 @@
-within BuildSysPro.Systems.HVAC.Emission.RadiantFloor;
+within BuildSysPro.Systems.HVAC.Emission.RadiantFloor;
 model RadiantHeatingFloor
   "Elementary building block of a heating floor - without convective elements"
 
-// Choice of heating mode
-parameter Integer TypeChauffage=1 "Heating floor type" annotation(choices(choice=1
+// Choice of heating mode
+  parameter Integer TypeChauffage=1 "Heating floor type" annotation(choices(choice=1
         "Water circulation",
       choice=2 "Electrical resistance",radioButtons=true));
 
@@ -17,7 +17,7 @@
    parameter Integer nP=1
     "Number of the layer whose upper boundary is the site of power injection - must be between 2 layers!!!";
 
-// Parameters specific to a heating wall with water
+// Parameters specific to a heating wall with water
   parameter Modelica.Units.SI.Distance Ltube=100 "Floor heating coil length"
     annotation (Dialog(enable=TypeChauffage == 1));
   parameter Modelica.Units.SI.Distance DiametreInt=0.013
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Emission/Radiator/Components/BasedCharacteristicEquation.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Emission/Radiator/Components/BasedCharacteristicEquation.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Emission/Radiator/Components/BasedCharacteristicEquation.mo"	2022-03-10 09:57:39.996144378 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Emission/Radiator/Components/BasedCharacteristicEquation.mo"	2022-03-10 09:58:00.072146924 +0000
@@ -12,19 +12,19 @@
 
   parameter Real nNom=1.225 "Slope at nominal point"
     annotation(Dialog(group = "EN442 - Nominal point"));
-  // Other parameters
+  // Other parameters
   parameter Real FracRad(min=0, max=1) = 0.35 "Radiative fraction of heat"
     annotation(Dialog(group = "EN442 - Nominal point"));
 
   parameter Real Km=Pnom/DTnom^nNom
     "Km coefficient (sometimes refers as KS or UA coefficient) used in the Characteristic equation";
 
-    // Variables
+// Variables
   outer SI.Temperature   T_HWR(start=273.15+60)
     "Temperature of the hot water radiator";
 
 SI.EnergyFlowRate  Qtot "Heating power output from the radiator";
-  //Components
+  //Components
   BaseClasses.HeatTransfer.Interfaces.HeatPort_b   Rad
     "HeatPort for long wave radiation exchanges"     annotation (
       Placement(transformation(extent={{-30,70},{-10,90}}),
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Emission/Radiator/Components/BasedCharacteristicEquation1.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Emission/Radiator/Components/BasedCharacteristicEquation1.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Emission/Radiator/Components/BasedCharacteristicEquation1.mo"	2022-03-10 09:57:39.996144378 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Emission/Radiator/Components/BasedCharacteristicEquation1.mo"	2022-03-10 09:58:00.060146922 +0000
@@ -5,7 +5,7 @@
   extends
     BuildSysPro.Systems.HVAC.Emission.Radiator.Components.BasedCharacteristicEquation;
 
-   // Variables
+// Variables
    SI.TemperatureDifference DTam
     "Arithmetic mean temperature difference for radiation and convection";
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Emission/Radiator/Components/BasedCharacteristicEquation2.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Emission/Radiator/Components/BasedCharacteristicEquation2.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Emission/Radiator/Components/BasedCharacteristicEquation2.mo"	2022-03-10 09:57:39.996144378 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Emission/Radiator/Components/BasedCharacteristicEquation2.mo"	2022-03-10 09:58:00.048146921 +0000
@@ -6,7 +6,7 @@
   extends
     BuildSysPro.Systems.HVAC.Emission.Radiator.Components.BasedCharacteristicEquation;
 
-   // Variables
+// Variables
    SI.TemperatureDifference DTam_rad
     "Arithmetic mean temperature difference for radiation";
    SI.TemperatureDifference DTam_conv
@@ -20,14 +20,13 @@
  Real g0_conv "Internal variable returned by the f_pow function";
   Real g1_conv
     "Internal variable (corresponding to the derivative) returned by the f_pow function";
-equation
- // Radiative part
-    DTam_rad= T_HWR-Rad.T;
+equation
+// Radiative part
+  DTam_rad = T_HWR - Rad.T;
     (g0_rad,g1_rad)=BuildSysPro.Utilities.Math.f_Pow(abs(DTam_rad),0.1,nNom-1);
-    -Rad.Q_flow=FracRad*Km*DTam_rad*g0_rad;
-
-// Convective part
-   DTam_conv= T_HWR-Conv.T;
+    -Rad.Q_flow=FracRad*Km*DTam_rad*g0_rad;
+// Convective part
+  DTam_conv = T_HWR - Conv.T;
     (g0_conv,g1_conv)=BuildSysPro.Utilities.Math.f_Pow(abs(DTam_conv),0.1,nNom-1);
     -Conv.Q_flow=(1-FracRad)*Km*DTam_conv*g0_conv;
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Emission/Radiator/Components/CharacteristicEquation.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Emission/Radiator/Components/CharacteristicEquation.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Emission/Radiator/Components/CharacteristicEquation.mo"	2022-03-10 09:57:39.996144378 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Emission/Radiator/Components/CharacteristicEquation.mo"	2022-03-10 09:58:00.036146919 +0000
@@ -13,7 +13,7 @@
 
   parameter Real nNom=1.225 "Slope at nominal point"
     annotation(Dialog(group = "EN442 - Nominal point"));
-  // Other parameters
+  // Other parameters
   parameter Real FracRad(min=0, max=1) = 0.35 "Radiative fraction of heat"
     annotation(Dialog(group = "EN442 - Nominal point"));
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Emission/Radiator/HotWaterRadiator.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Emission/Radiator/HotWaterRadiator.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Emission/Radiator/HotWaterRadiator.mo"	2022-03-10 09:57:39.996144378 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Emission/Radiator/HotWaterRadiator.mo"	2022-03-10 09:58:00.020146916 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Systems.HVAC.Emission.Radiator;
+within BuildSysPro.Systems.HVAC.Emission.Radiator;
 model HotWaterRadiator "Hot water radiator"
 
   import      Modelica.Units.SI;
@@ -68,35 +68,32 @@
   Modelica.Blocks.Interfaces.RealOutput WaterOut[2]
     "Vector containing 1- the output fluid temperature (K), 2- the output fluid flow rate (kg/s)"
     annotation (Placement(transformation(extent={{80,-60},{100,-40}})));
-equation
-  // Heat capacity of an element
-  Ci = (Cmetal + Ceau)/N;
-
-  WaterOut[2] = WaterIn[2];
-
-// Temperatures are fixed
-  Ta           = Conv.T;
+equation
+// Heat capacity of an element
+  Ci = (Cmetal + Ceau) / N;
+
+  WaterOut[2] = WaterIn[2];
+// Temperatures are fixed
+  Ta = Conv.T;
   Te[1]        =WaterIn[1];
-  WaterOut[1] = TRad[N];
-
-// Thermal balance of an element i
-for i in 1:N loop
-  Te[i+1]  = TRad[i];
-  DeltaT[i]= abs(TRad[i]-Ta);
-  if TRad[i]>Ta then
-      P[i] = CoeffCorrectif*Pnom*(DeltaT[i]/DeltaTnom)^nNom/N;
-  else // Particular case of air heating the radiator
-      P[i] = -Pnom*(DeltaT[i]/DeltaTnom)/N;
-  end if;
-    WaterIn[2]*CpEau*(Te[i] - TRad[i]) = P[i] + Ci*der(TRad[i]);
-end for;
-
-// Means
- Te_m= sum(TRad)/N;
- DeltaT_m= sum(DeltaT)/N;
-
-// Repartition of heating between radiative and convective
-  Ptot        = sum(P);
+  WaterOut[1] = TRad[N];
+// Thermal balance of an element i
+  for i in 1:N loop
+    Te[i + 1] = TRad[i];
+    DeltaT[i] = abs(TRad[i] - Ta);
+    if TRad[i] > Ta then
+      P[i] = CoeffCorrectif * Pnom * (DeltaT[i] / DeltaTnom) ^ nNom / N;
+    else
+// Particular case of air heating the radiator
+      P[i] = -Pnom * (DeltaT[i] / DeltaTnom) / N;
+    end if;
+    WaterIn[2] * CpEau * (Te[i] - TRad[i]) = P[i] + Ci * der(TRad[i]);
+  end for;
+// Means
+  Te_m = sum(TRad) / N;
+ DeltaT_m= sum(DeltaT)/N;
+// Repartition of heating between radiative and convective
+  Ptot = sum(P);
   Rad.Q_flow  = -FracRad*Ptot;
   Conv.Q_flow = -(1-FracRad)*Ptot;
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Emission/Radiator/HotWaterRadiatorRegul.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Emission/Radiator/HotWaterRadiatorRegul.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Emission/Radiator/HotWaterRadiatorRegul.mo"	2022-03-10 09:57:39.996144378 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Emission/Radiator/HotWaterRadiatorRegul.mo"	2022-03-10 09:57:59.980146911 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Systems.HVAC.Emission.Radiator;
+within BuildSysPro.Systems.HVAC.Emission.Radiator;
 model HotWaterRadiatorRegul "Hot water radiator with control"
 
   import      Modelica.Units.SI;
@@ -77,33 +77,30 @@
   Modelica.Blocks.Interfaces.RealOutput WaterOut[2]
     "Vector containing 1- the output fluid temperature (K), 2- the output fluid flow rate (kg/s)"
     annotation (Placement(transformation(extent={{80,-60},{100,-40}})));
-equation
-// Heat capacity of an element
-  Ci = (Cmetal + Ceau)/N;
-
-// Water flow rate varies depending on room heating needs, and can not exceed nominal water flow rate
-  Debit        = min(1,max(Regulation,0))*DebitNom;
-  WaterOut[2] = Debit;
-
-// Temperatures are fixed
-  Ta           = Conv.T;
+equation
+// Heat capacity of an element
+  Ci = (Cmetal + Ceau) / N;
+// Water flow rate varies depending on room heating needs, and can not exceed nominal water flow rate
+  Debit = min(1, max(Regulation, 0)) * DebitNom;
+  WaterOut[2] = Debit;
+// Temperatures are fixed
+  Ta = Conv.T;
   Te[1]        =WaterIn[1];
-  WaterOut[1] = TRad[N];
-
-// Thermal balance of an element i
-for i in 1:N loop
-  Te[i+1]  = TRad[i];
-  DeltaT[i]= abs(TRad[i]-Ta);
-  if TRad[i]>Ta then
-      P[i] = CoeffCorrectif*Pnom*(DeltaT[i]/DeltaTnom)^nNom/N;
-  else // Particular case of air heating the radiator
-      P[i] = -Pnom*(DeltaT[i]/DeltaTnom)/N;
-  end if;
-  Debit*CpEau*(Te[i]-TRad[i]) = P[i] + Ci*der(TRad[i]);
-end for;
-
-// Repartition of heating between radiative and convective
-  Ptot        = sum(P);
+  WaterOut[1] = TRad[N];
+// Thermal balance of an element i
+  for i in 1:N loop
+    Te[i + 1] = TRad[i];
+    DeltaT[i] = abs(TRad[i] - Ta);
+    if TRad[i] > Ta then
+      P[i] = CoeffCorrectif * Pnom * (DeltaT[i] / DeltaTnom) ^ nNom / N;
+    else
+// Particular case of air heating the radiator
+      P[i] = -Pnom * (DeltaT[i] / DeltaTnom) / N;
+    end if;
+    Debit * CpEau * (Te[i] - TRad[i]) = P[i] + Ci * der(TRad[i]);
+  end for;
+// Repartition of heating between radiative and convective
+  Ptot = sum(P);
   Rad.Q_flow  = -FracRad*Ptot;
   Conv.Q_flow = -(1-FracRad)*Ptot;
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Emission/Radiator/HotWaterRadiatorRegulDistrib.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Emission/Radiator/HotWaterRadiatorRegulDistrib.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Emission/Radiator/HotWaterRadiatorRegulDistrib.mo"	2022-03-10 09:57:39.996144378 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Emission/Radiator/HotWaterRadiatorRegulDistrib.mo"	2022-03-10 09:57:59.932146905 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Systems.HVAC.Emission.Radiator;
+within BuildSysPro.Systems.HVAC.Emission.Radiator;
 model HotWaterRadiatorRegulDistrib
   "Hot water radiator with control and distribution"
 
@@ -64,18 +64,15 @@
     annotation (Placement(transformation(extent={{92,-78},{112,-58}}),
         iconTransformation(extent={{92,-80},{112,-60}})));
 
-equation
-  // Water flow rate conservation
-  WaterOut[2] = WaterIn[2];
-
-// if the water flow is too low, heating needs are made null beacause
-// - there is an error of dimensioning
-// - distribution system is off and the radiator should not dissipate heat
-  radiateurNF.Regulation=if DebitNom < WaterIn[2] then Regulation else 0;
-
-// Output temperature is the weighted mean by water flows : on the output of the radiator and on the distribution system
-  WaterOut[1] = (WaterIn[1]*(WaterIn[2] - radiateurNF.WaterOut[2]) +
-    radiateurNF.WaterOut[1]*radiateurNF.WaterOut[2])/WaterOut[2];
+equation
+// Water flow rate conservation
+  WaterOut[2] = WaterIn[2];
+// if the water flow is too low, heating needs are made null beacause
+// - there is an error of dimensioning
+// - distribution system is off and the radiator should not dissipate heat
+  radiateurNF.Regulation = if DebitNom < WaterIn[2] then Regulation else 0;
+// Output temperature is the weighted mean by water flows : on the output of the radiator and on the distribution system
+  WaterOut[1] = (WaterIn[1] * (WaterIn[2] - radiateurNF.WaterOut[2]) + radiateurNF.WaterOut[1] * radiateurNF.WaterOut[2]) / WaterOut[2];
 
   connect(radiateurNF.Conv, Conv) annotation (Line(
       points={{18,25},{30,25},{30,70}},
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Emission/Radiator/Radiator_EN442.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Emission/Radiator/Radiator_EN442.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Emission/Radiator/Radiator_EN442.mo"	2022-03-10 09:57:39.996144378 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Emission/Radiator/Radiator_EN442.mo"	2022-03-10 09:57:59.896146901 +0000
@@ -1,20 +1,18 @@
-within BuildSysPro.Systems.HVAC.Emission.Radiator;
+within BuildSysPro.Systems.HVAC.Emission.Radiator;
 model Radiator_EN442 "Radiator model based on the EN442 standard"
 
   import      Modelica.Units.SI;
   extends
     BuildSysPro.Systems.HVAC.Emission.Radiator.Components.CharacteristicEquation;
 
-  // Parameters
-
+// Parameters
   /*parameter Integer Type=2 
-    "Type de radiateur déterminant l'inertie (masse à sec et volume d'eau) par une corrélation sur la puissance nominale"
-    annotation(Dialog(group="Technologies de radiateur"), choices(
-                choice=1 "Radiateur en fonte (inertie forte)",
-                choice=2 "Radiateur en aluminium (inertie intermédiaire)",
-                choice=3 
-        "Radiateur en panneau acier (inertie légèrement inférieure à l'aluminium)"));*/
-
+      "Type de radiateur déterminant l'inertie (masse à sec et volume d'eau) par une corrélation sur la puissance nominale"
+      annotation(Dialog(group="Technologies de radiateur"), choices(
+                  choice=1 "Radiateur en fonte (inertie forte)",
+                  choice=2 "Radiateur en aluminium (inertie intermédiaire)",
+                  choice=3 
+          "Radiateur en panneau acier (inertie légèrement inférieure à l'aluminium)"));*/
     parameter Boolean useInertia=false "Steady state modelling of dynamics"
   annotation(Dialog(group="Options",compact=true),choices(choice=false
         "Steady state",                                                               choice=true "Dynamic",
@@ -27,16 +25,14 @@
   parameter SI.SpecificHeatCapacity cpBody=500
     "Specific heat capacity of the radiator body (ex. 500J/kg/K for cast iron)" annotation(Dialog(tab="Dynamic"));
 
-    // Variables
-
+// Variables
   SI.TemperatureDifference DTlm=(WaterIn[1] - WaterOut[1])/Modelica.Math.log((
       WaterIn[1] - (Conv.T + Rad.T)/2)/(WaterOut[1] - (Conv.T + Rad.T)/2))
     "Logaritmic mean temperature difference, given for information, EN442 being based on arithmetic mean temperature difference";
 inner SI.Temperature   T_HWR(start=273.15+60)
     "Temperature of the hot water radiator";
 
-// Components
-
+// Components
   Modelica.Blocks.Interfaces.RealInput WaterIn[2](start={330,1})
     "1:Temp / 2:m_flow" annotation (Placement(transformation(extent={{-90,42},{-70,
             62}}), iconTransformation(extent={{-100,40},{-80,60}})));
@@ -45,24 +41,20 @@
             -40}}), iconTransformation(extent={{80,-60},{100,-40}})));
 
 equation
-  assert((WaterIn[1] - Conv.T)/(WaterOut[1] - Conv.T) < 3, "Arithmetic mean temperature difference assumption leads to a deviation exceeding 5% (compared to LMTD)");
-
-  // Energy balance
-  if not useInertia then
-   0=WaterIn[2]*Medium.cp_const*(WaterIn[1] - WaterOut[1]) - radEqua.Qtot;
-   T_HWR=(WaterIn[1] + WaterOut[1])/2;
-
-  else
-    (MediumMass*Medium.cp_const*WaterOut[1] + BodyMass*cpBody)*der(T_HWR) =
-      WaterIn[2]*Medium.cp_const*(WaterIn[1] - WaterOut[1]) - radEqua.Qtot;
-  //   T_HWR= (WaterIn[1]+WaterOut[1])/2; // Assure la cohérence de puissance entre le régime statique et dynamique
-   T_HWR=WaterOut[1];   // Assure la continuité de la température de radiateur.
-   //En revanche il faut intégrer une discrétisation sinon les conditions nominales ne fournissent pas
-  end if;
-
-   // Continuity equation
+  assert((WaterIn[1] - Conv.T)/(WaterOut[1] - Conv.T) < 3, "Arithmetic mean temperature difference assumption leads to a deviation exceeding 5% (compared to LMTD)");
+// Energy balance
+  if not useInertia then
+    0 = WaterIn[2] * Medium.cp_const * (WaterIn[1] - WaterOut[1]) - radEqua.Qtot;
+    T_HWR = (WaterIn[1] + WaterOut[1]) / 2;
+  else
+    (MediumMass * Medium.cp_const * WaterOut[1] + BodyMass * cpBody) * der(T_HWR) = WaterIn[2] * Medium.cp_const * (WaterIn[1] - WaterOut[1]) - radEqua.Qtot;
+//   T_HWR= (WaterIn[1]+WaterOut[1])/2; // Assure la cohérence de puissance entre le régime statique et dynamique
+    T_HWR = WaterOut[1];
+// Assure la continuité de la température de radiateur.
+//En revanche il faut intégrer une discrétisation sinon les conditions nominales ne fournissent pas
+  end if;
+// Continuity equation
   WaterIn[2] = WaterOut[2];
-
   annotation (Icon(coordinateSystem(preserveAspectRatio=false), graphics={
         Rectangle(
           extent={{-80,54},{-74,48}},
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/HeatExchangers/Air2AirSimplifiedHeatEx.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/HeatExchangers/Air2AirSimplifiedHeatEx.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/HeatExchangers/Air2AirSimplifiedHeatEx.mo"	2022-03-10 09:57:39.996144378 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/HeatExchangers/Air2AirSimplifiedHeatEx.mo"	2022-03-10 09:57:59.856146895 +0000
@@ -1,10 +1,10 @@
-within BuildSysPro.Systems.HVAC.HeatExchangers;
+within BuildSysPro.Systems.HVAC.HeatExchangers;
 model Air2AirSimplifiedHeatEx
 
 extends BuildSysPro.BaseClasses.HeatTransfer.Interfaces.Element1D;
 
-// Control parameters
-parameter Boolean use_Qv_in=false "Volume flow controlled"
+// Control parameters
+  parameter Boolean use_Qv_in=false "Volume flow controlled"
 annotation(Evaluate=true,HideResult=true,Dialog(group="Control"),
 choices(choice=true "yes", choice=false "no (constant)", radioButtons=true));
 parameter Boolean use_Efficacite_in=false "Efficiency controlled"
@@ -15,13 +15,13 @@
 parameter Real Efficacite=0.5 "Constant exchanger efficiency [0-1]"
     annotation(Dialog(group="Control",enable=not use_Efficacite_in));
 
-// Air properties
+// Air properties
   parameter Modelica.Units.SI.Density rho=1.24 "Air density"
     annotation (Dialog(group="Air properties"));
   parameter Modelica.Units.SI.SpecificHeatCapacity Cp=1005
     "Specific heat capacity of air" annotation (Dialog(group="Air properties"));
 
-// Public connectors
+// Public connectors
   Modelica.Blocks.Interfaces.RealInput Qv_in if use_Qv_in
     "Scenario of controlled ventilation rate [m3/h]"
                                      annotation (Placement(
@@ -43,7 +43,7 @@
 
   Modelica.Units.SI.Temperature Tentree "Inlet temperature of the exchanger";
 
-// Internal connectors
+// Internal connectors
 protected
   Modelica.Blocks.Interfaces.RealInput Qv_in_internal
     "Internal connector required in the case of conditional connection";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/Boiler/Boiler.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/Boiler/Boiler.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/Boiler/Boiler.mo"	2022-03-10 09:57:39.996144378 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/Boiler/Boiler.mo"	2022-03-10 09:57:59.804146889 +0000
@@ -1,467 +1,220 @@
-within BuildSysPro.Systems.HVAC.Production.Boiler;
-model Boiler
-
-  import      Modelica.Units.SI;
-  import BuildSysPro.BaseClasses.Media.OLD_THERMHYGAERO.AirFunctions.Psat;
-
-  parameter Real PCSI=1.11
-    "Ratio gross (high) heating value / net (low) heating value defined according to the fuel";
-  parameter SI.Temperature Tnom=273.15+70 "Nominal temperature"
-                           annotation(Dialog(group = "Parameters provided on ATITA basis"));
-  parameter Real PLRnom=100 "Nominal loading rate (%)"         annotation(Dialog(group = "Parameters provided on ATITA basis"));
-  parameter SI.Power Pnom=17300 "Nominal power" annotation(Dialog(group = "Parameters provided on ATITA basis"));
-  parameter Real etaNom=97.4 "Nominal net heating value efficiency (%)"        annotation(Dialog(group = "Parameters provided on ATITA basis"));
-  parameter SI.Temperature TInt=273.15+33 "Intermediate temperature"
-                                 annotation(Dialog(group = "Parameters provided on ATITA basis"));
-  parameter Real PLRInt=30 "Intermediate loading rate (%)"     annotation(Dialog(group = "Parameters provided on ATITA basis"));
-  parameter SI.Power PInt=5190 "Intermediate power"           annotation(Dialog(group = "Parameters provided on ATITA basis"));
-  parameter Real etaInt=107.2 "Intermediate net heating value efficiency (%)"  annotation(Dialog(group = "Parameters provided on ATITA basis"));
-  parameter SI.Power PertesT30K = 60 "Stop losses" annotation(Dialog(group = "Parameters provided on ATITA basis"));
-  parameter SI.VolumeFlowRate V_flow= 1.02/3600 "Volume of water in the boiler"
-                                                                  annotation(Dialog(group = "Parameters provided on ATITA basis"));
-  parameter Modelica.Units.SI.Volume Veau(displayUnit="l") = 2.8E-3
-    "Volume d'eau contenue dans la chaudière"
-    annotation (Dialog(group="Parameters provided on ATITA basis"));
-  parameter SI.Mass mSec = 35 "Dry weight"                       annotation(Dialog(group = "Parameters provided on ATITA basis"));
-  parameter SI.Power Paux = 24
-    "Electrical power of auxiliary on nominal power (out circulation pump)"
-     annotation(Dialog(group = "Parameters provided on ATITA basis"));
-  parameter SI.Power Pveille = 5.2 "Standby power (out circulation pump)"
-     annotation(Dialog(group = "Parameters provided on ATITA basis"));
-  parameter SI.Power Pcirculateur = 37
-    "Water circulation pump electrical power"
-     annotation(Dialog(group = "Parameters provided on ATITA basis"));
-
-  parameter Real DetaPLR = 1
-    "Efficiency gap at Tint between PLRnom (Part Load Ratio) and PLRInt (between 0 and 2% depending on the machine)"
-     annotation(Dialog(tab = "Other parameters",group="Performance"));
-  parameter Real PLRmin = PLRInt "Minimum loading rate"
-     annotation(Dialog(tab = "Other parameters",group="Performance"));
-  parameter SI.Time TimePrePurge=30 "Pre-purge duration"
-     annotation(Dialog(tab = "Other parameters",group="Performance"));
-  parameter SI.Time TimeCycle(displayUnit="min")=300
-    "Minimum duration of a cycle (anti-short cycle)"
-     annotation(Dialog(tab = "Other parameters",group="Performance"));
-  parameter SI.Time TimeCirculateur(displayUnit="min")=600
-    "Operating time of the circulation pump after a combustion cycle"
-     annotation(Dialog(tab = "Other parameters",group="Performance"));
-  parameter SI.SpecificHeatCapacity CpE = 4180
-    "Specific heat capacity of water"
-     annotation(Dialog(tab = "Other parameters",group="Fluids properties"));
-  parameter SI.Density rhoE = 1000 "Density of water"
-     annotation(Dialog(tab = "Other parameters",group="Fluids properties"));
-  parameter SI.VolumeFlowRate V_flowAir = 6.7E-3 * (Pnom/20000)
-    "Pre-purge: nominal flow rate of air (nominal value from [Kemna 2007])"
-     annotation(Dialog(tab = "Other parameters",group="Fluids properties"));
-  parameter SI.SpecificHeatCapacity CpA = 1000 "Capacité thermique de l'air"
-     annotation(Dialog(tab = "Other parameters",group="Fluids properties"));
-  parameter SI.Density rhoA = 1.2 "Specific heat capacity of air"
-     annotation(Dialog(tab = "Other parameters",group="Fluids properties"));
-
-protected
-  parameter SI.ThermalConductance UA=PertesT30K/30
-    "Conduction through the envelope";
-  parameter SI.Pressure Pref = 101300 "Reference pressure";
-  parameter SI.Temperature Tref = 15 + 273.15 "Reference temperature";
-  parameter Real lambda = 0.01
-    "Offset variable of weighting coefficients sigmas";
-  discrete SI.Time Time0(start=0) "Beginning of the boiler cycle";
-  discrete SI.Time TimeF(start=0) "End of the boiler cycle";
-
-public
-  Real etaRP "Efficiency in steady state at T and operational PLR";
-  SI.Power QaFournir "Thermal power to provide";
-  Integer NbCycle(start=0);
-
-protected
-  SI.Temperature Tc
-    "Temperature of Sensitive and Latent characteristic intersection";
-  SI.Temperature Te=WaterIn[1]
-    "Water-return temperature (i.e. water inlet temperature)";
-  //EQUAL TO THE ENTRY PORT
-  Real a1=(etaNom-100)/(Tnom-Tref)
-    "Slope of the line characterizing the sensitive part";
-  Real etaSens;
-  Real etaCond30;
-  Real etaCond;
-  Real sigmaSens;
-  Real sigmaCond;
-  Real a;
-  SI.MassFlowRate Debit
-    "Water mass flow to the circulation pump, therefore in the boiler";
-
-public
-  Modelica.Blocks.Interfaces.RealInput PLR(min=0, max=100)
-    "Part load ratio (0-100%)"
-    annotation (Placement(transformation(extent={{-20,-20},{20,20}},
-          rotation=270,
-        origin={0,100}), iconTransformation(
-        extent={{-10,-10},{10,10}},
-        rotation=270,
-        origin={0,90})));
-  Modelica.Thermal.HeatTransfer.Components.ThermalConductor ConductanceEnv(G=UA)
-    "Thermal resistance of the boiler casing"
-    annotation (Placement(transformation(extent={{-10,-10},{10,10}},
-        rotation=270,
-        origin={0,32})));
-  Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_a T_int
-    "Ambient temperature of the place where the boiler is located" annotation (
-      Placement(transformation(extent={{40,50},{60,70}}, rotation=0),
-        iconTransformation(extent={{50,70},{70,90}})));
-  Modelica.Thermal.HeatTransfer.Components.HeatCapacitor CpChau(
-      C=500*mSec) "Boiler thermal capacity (dry weight)"
-    annotation (Placement(transformation(extent={{-40,0},{-20,20}})));
-  BuildSysPro.BaseClasses.HeatTransfer.Sources.PrescribedHeatFlow preHeaFlo
-    annotation (Placement(transformation(
-        extent={{-5.75,-5.75},{5.75,5.75}},
-        rotation=0,
-        origin={-14.25,-80.25})));
-  Modelica.Blocks.Sources.RealExpression QaFournirExp(y=QaFournir)
-    annotation (Placement(transformation(extent={{-62,-90},{-42,-70}})));
-  Modelica.Blocks.Interfaces.RealOutput Pgaz
-    "Thermal power provided by gas combustion"
-    annotation (Placement(transformation(extent={{92,16},{112,36}}),
-        iconTransformation(extent={{92,16},{112,36}})));
-  Modelica.Blocks.Interfaces.RealOutput Pelec
-    "Electrical power consumed (auxiliary ...)"
-    annotation (Placement(transformation(extent={{92,40},{112,60}}),
-        iconTransformation(extent={{92,-16},{112,4}})));
-  Modelica.Thermal.HeatTransfer.Components.HeatCapacitor CpEau(C=CpE*rhoE*Veau)
-    "Heat capacity of the water volume"
-    annotation (Placement(transformation(extent={{20,0},{40,20}})));
-  BuildSysPro.BaseClasses.HeatTransfer.Sources.PrescribedHeatFlow preHeaFlo1
-    annotation (Placement(transformation(
-        extent={{-5.75,-5.75},{5.75,5.75}},
-        rotation=0,
-        origin={-34.25,-40.25})));
-  Modelica.Blocks.Sources.RealExpression BilanEau(y=Debit*CpE*(WaterIn[1] -
-        WaterOut[1]))
-    annotation (Placement(transformation(extent={{-80,-50},{-60,-30}})));
-  Modelica.Blocks.Sources.RealExpression DebitExp(y=Debit)
-    annotation (Placement(transformation(extent={{40,-40},{60,-24}})));
-  Modelica.Thermal.HeatTransfer.Sensors.TemperatureSensor temperatureSensor
-    annotation (Placement(transformation(extent={{46,-54},{60,-40}})));
-  Modelica.Blocks.Interfaces.BooleanInput SaisonChauffe annotation (Placement(
-        transformation(
-        extent={{-20,-20},{20,20}},
-        rotation=270,
-        origin={-30,100}), iconTransformation(
-        extent={{-10,-10},{10,10}},
-        rotation=270,
-        origin={-70,90})));
-
-protected
-  Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_b port_b1
-    annotation (Placement(transformation(extent={{2,2},{-2,-2}})));
-public
-  Modelica.Blocks.Interfaces.RealInput WaterIn[2]
-    "Vector containing 1- the input fluid temperature (K), 2- the input fluid flow rate (kg/s)"
-    annotation (Placement(transformation(extent={{-128,-60},{-88,-20}}),
-        iconTransformation(extent={{-110,-50},{-90,-30}})));
-  Modelica.Blocks.Interfaces.RealOutput WaterOut[2]
-    "Vector containing 1- the output fluid temperature (K), 2- the output fluid flow rate (kg/s)"
-    annotation (Placement(transformation(extent={{92,-50},{112,-30}}),
-        iconTransformation(extent={{92,-50},{112,-30}})));
-initial equation
-
-algorithm
-if SaisonChauffe then  //The boiler is launched for PLR > PLRmin
-  //Determination of the efficiency for the law without condensation
-  etaSens   :=etaNom + a1*(Te - Tnom);
-  //Determination of the efficiency for the law characterizing the condensation
-  etaCond30 :=etaInt + (100*PCSI - etaInt)*(1 - Psat(Te)/Psat(TInt)*TInt/Te);
-  etaCond   :=etaCond30 - DetaPLR*(Tc - Te)/(Tc - TInt)*(PLR - PLRInt)/(PLRnom -
-      PLRInt);
-  //Determination of the efficiency in steady state
-  sigmaSens :=1/(1 + exp(Tc - Te - lambda));
-  sigmaCond :=1 - 1/(1 + exp(Tc - Te + lambda));
-  etaRP     :=sigmaSens*etaSens + sigmaCond*etaCond;
-  if PLR>PLRmin then
-    if noEvent(time <= Time0+TimePrePurge) then
-      a:=1;//Pre-purge
-      Pelec:=Paux + Pcirculateur;
-      QaFournir :=V_flowAir*rhoA*CpA*(15+273.15 - CpEau.port.T);//seems negligible, delete ??? YES based on parametric study, delete the entry T which is set at 15°C
-        Pgaz
-          :=0;
-
-    else
-      a:=2;//Combustion
-      //It is considered that half of the nominal electric power depends on the fan which depends on the load rate (PLR)
-      Pelec:=Paux*(0.5 + 0.5*PLR/100) + Pcirculateur;
-      //Manufacturers data already integrate losses through the envelope so when running, the term corresponding to losses through the envelope is added
-      QaFournir :=PInt + (PLR - PLRInt)/(PLRnom - PLRInt)*(Pnom - PInt) + abs(ConductanceEnv.Q_flow);
-        Pgaz
-          :=QaFournir*100/etaRP;//Efficiency (%)
-    end if;
-  else
-    if noEvent(time <= Time0+TimePrePurge+TimeCycle) then
-      a:=3; //Anti-short cycles at minimal power
-      Pelec:=Paux*(0.5 + PLRmin/100) + Pcirculateur;
-      QaFournir :=PInt + abs(ConductanceEnv.Q_flow);
-        Pgaz
-          :=QaFournir*100/etaRP;//Efficiency (%)
-    elseif noEvent(time < max(TimeF,Time0+TimePrePurge+TimeCycle)+TimeCirculateur) then
-        a:=4;//Burner off but circulator in operation
-        Pelec:=Pveille + Pcirculateur;
-        QaFournir:=0;
-        Pgaz:=0;
-    else
-        a:=5;//Burner off and circulator cut off
-        Pelec:=Pveille;
-        QaFournir:=0;
-        Pgaz:=0;
-    end if;
-  end if;
-else
-  a:=0;//Seasonal shutdown
-  Pelec:=0;
-  QaFournir:=0;
-    Pgaz
-      :=0;
-end if;
-
-equation
-  Debit = if a < 1 or a > 4 then 0 else V_flow * rhoE;
-  //Intersection point Tc determination
-  etaNom+a1*(Tc-Tnom) = etaInt+(100*PCSI-etaInt)*(1-Psat(Tc)/Psat(TInt)*TInt/Tc);
-
-  when PLR >= PLRmin then
-    Time0 = time;
-  end when;
-  when PLR <= PLRmin then
-    TimeF = time;
-  end when;
-
-  when Pgaz<0.1*PInt then
-    NbCycle = pre(NbCycle) + 1;
-  end when;
-
-  connect(ConductanceEnv.port_a, T_int) annotation (Line(
-      points={{1.83697e-015,42},{0,60},{50,60}},
-      color={191,0,0},
-      smooth=Smooth.None));
-  connect(QaFournirExp.y, preHeaFlo.Q_flow)      annotation (Line(
-      points={{-41,-80},{-20,-80},{-20,-80.25},{-20,-80.25}},
-      color={0,0,127},
-      smooth=Smooth.None));
-  connect(BilanEau.y, preHeaFlo1.Q_flow)         annotation (Line(
-      points={{-59,-40},{-38,-40},{-38,-40.25},{-40,-40.25}},
-      color={0,0,127},
-      smooth=Smooth.None));
-  connect(preHeaFlo1.port, CpEau.port)   annotation (Line(
-      points={{-28.5,-40.25},{30,-40.25},{30,0}},
-      color={191,0,0},
-      smooth=Smooth.None));
-  connect(CpEau.port, temperatureSensor.port)   annotation (Line(
-      points={{30,0},{30,-47},{46,-47}},
-      color={191,0,0},
-      smooth=Smooth.None));
-
-  connect(ConductanceEnv.port_b, port_b1) annotation (Line(
-      points={{-1.77636e-015,22},{0,22},{0,0}},
-      color={191,0,0},
-      smooth=Smooth.None));
-  connect(port_b1, CpEau.port) annotation (Line(
-      points={{0,0},{30,0}},
-      color={191,0,0},
-      smooth=Smooth.None));
-  connect(port_b1, CpChau.port) annotation (Line(
-      points={{0,0},{-30,0}},
-      color={191,0,0},
-      smooth=Smooth.None));
-  connect(preHeaFlo.port, port_b1) annotation (Line(
-      points={{-8.5,-80.25},{0,-80.25},{0,0}},
-      color={191,0,0},
-      smooth=Smooth.None));
-  connect(temperatureSensor.T, WaterOut[1]) annotation (Line(
-      points={{60,-47},{80,-47},{80,-45},{102,-45}},
-      color={0,0,127},
-      smooth=Smooth.None));
-  connect(DebitExp.y, WaterOut[2]) annotation (Line(
-      points={{61,-32},{80,-32},{80,-35},{102,-35}},
-      color={0,0,127},
-      smooth=Smooth.None));
-  annotation (Diagram(coordinateSystem(preserveAspectRatio=false,extent={{-100,
-            -100},{100,100}})),  Icon(coordinateSystem(preserveAspectRatio=false,
-          extent={{-100,-100},{100,100}}),
-                                      graphics={
-        Text(
-          extent={{-32,96},{-8,86}},
-          lineColor={0,0,127},
-          textString="PLR"),
-        Rectangle(
-          extent={{-100,60},{100,-80}},
-          lineColor={245,0,0},
-          lineThickness=1,
-          fillColor={215,215,215},
-          fillPattern=FillPattern.Solid),
-        Text(
-          extent={{44,28},{90,18}},
-          lineColor={0,0,255},
-          textString="Gas consumption"),
-        Text(
-          extent={{40,-2},{90,-12}},
-          lineColor={0,0,255},
-          textString="Elec consumption"),
-        Polygon(
-          points={{-58,-86},{-58,-86},{-50,-76},{-42,-86},{-44,-94},{-48,-96},{-56,
-              -94},{-58,-86},{-58,-86}},
-          smooth=Smooth.None,
-          fillColor={255,255,0},
-          fillPattern=FillPattern.Solid,
-          pattern=LinePattern.None),
-        Polygon(
-          points={{-54,-90},{-54,-90},{-50,-82},{-44,-90},{-46,-94},{-48,-96},{-52,
-              -94},{-54,-90},{-54,-90}},
-          lineColor={255,128,0},
-          smooth=Smooth.None,
-          fillPattern=FillPattern.VerticalCylinder,
-          fillColor={255,0,0},
-          lineThickness=1),
-        Polygon(
-          points={{-38,-86},{-38,-86},{-30,-76},{-22,-86},{-24,-94},{-28,-96},{-36,
-              -94},{-38,-86},{-38,-86}},
-          smooth=Smooth.None,
-          fillColor={255,255,0},
-          fillPattern=FillPattern.Solid,
-          pattern=LinePattern.None),
-        Polygon(
-          points={{-34,-90},{-34,-90},{-30,-82},{-24,-90},{-26,-94},{-28,-96},{-32,
-              -94},{-34,-90},{-34,-90}},
-          lineColor={255,128,0},
-          smooth=Smooth.None,
-          fillPattern=FillPattern.VerticalCylinder,
-          fillColor={255,0,0},
-          lineThickness=1),
-        Polygon(
-          points={{-18,-86},{-18,-86},{-10,-76},{-2,-86},{-4,-94},{-8,-96},{-16,
-              -94},{-18,-86},{-18,-86}},
-          smooth=Smooth.None,
-          fillColor={255,255,0},
-          fillPattern=FillPattern.Solid,
-          pattern=LinePattern.None),
-        Polygon(
-          points={{-14,-90},{-14,-90},{-10,-82},{-4,-90},{-6,-94},{-8,-96},{-12,
-              -94},{-14,-90},{-14,-90}},
-          lineColor={255,128,0},
-          smooth=Smooth.None,
-          fillPattern=FillPattern.VerticalCylinder,
-          fillColor={255,0,0},
-          lineThickness=1),
-        Polygon(
-          points={{2,-86},{2,-86},{10,-76},{18,-86},{16,-94},{12,-96},{4,-94},{2,
-              -86},{2,-86}},
-          smooth=Smooth.None,
-          fillColor={255,255,0},
-          fillPattern=FillPattern.Solid,
-          pattern=LinePattern.None),
-        Polygon(
-          points={{6,-90},{6,-90},{10,-82},{16,-90},{14,-94},{12,-96},{8,-94},{6,
-              -90},{6,-90}},
-          lineColor={255,128,0},
-          smooth=Smooth.None,
-          fillPattern=FillPattern.VerticalCylinder,
-          fillColor={255,0,0},
-          lineThickness=1),
-        Polygon(
-          points={{22,-86},{22,-86},{30,-76},{38,-86},{36,-94},{32,-96},{24,-94},
-              {22,-86},{22,-86}},
-          smooth=Smooth.None,
-          fillColor={255,255,0},
-          fillPattern=FillPattern.Solid,
-          pattern=LinePattern.None),
-        Polygon(
-          points={{26,-90},{26,-90},{30,-82},{36,-90},{34,-94},{32,-96},{28,-94},
-              {26,-90},{26,-90}},
-          lineColor={255,128,0},
-          smooth=Smooth.None,
-          fillPattern=FillPattern.VerticalCylinder,
-          fillColor={255,0,0},
-          lineThickness=1),
-        Polygon(
-          points={{42,-86},{42,-86},{50,-76},{58,-86},{56,-94},{52,-96},{44,-94},
-              {42,-86},{42,-86}},
-          smooth=Smooth.None,
-          fillColor={255,255,0},
-          fillPattern=FillPattern.Solid,
-          pattern=LinePattern.None),
-        Polygon(
-          points={{46,-90},{46,-90},{50,-82},{56,-90},{54,-94},{52,-96},{48,-94},
-              {46,-90},{46,-90}},
-          lineColor={255,128,0},
-          smooth=Smooth.None,
-          fillPattern=FillPattern.VerticalCylinder,
-          fillColor={255,0,0},
-          lineThickness=1),
-        Polygon(
-          points={{64,-86},{64,-86},{72,-76},{80,-86},{78,-94},{74,-96},{66,-94},
-              {64,-86},{64,-86}},
-          smooth=Smooth.None,
-          fillColor={255,255,0},
-          fillPattern=FillPattern.Solid,
-          pattern=LinePattern.None),
-        Polygon(
-          points={{68,-90},{68,-90},{72,-82},{78,-90},{76,-94},{74,-96},{70,-94},
-              {68,-90},{68,-90}},
-          lineColor={255,128,0},
-          smooth=Smooth.None,
-          fillPattern=FillPattern.VerticalCylinder,
-          fillColor={255,0,0},
-          lineThickness=1),
-        Polygon(
-          points={{-78,-86},{-78,-86},{-70,-76},{-62,-86},{-64,-94},{-68,-96},{-76,
-              -94},{-78,-86},{-78,-86}},
-          smooth=Smooth.None,
-          fillColor={255,255,0},
-          fillPattern=FillPattern.Solid,
-          pattern=LinePattern.None),
-        Polygon(
-          points={{-74,-90},{-74,-90},{-70,-82},{-64,-90},{-66,-94},{-68,-96},{-72,
-              -94},{-74,-90},{-74,-90}},
-          lineColor={255,128,0},
-          smooth=Smooth.None,
-          fillPattern=FillPattern.VerticalCylinder,
-          fillColor={255,0,0},
-          lineThickness=1),
-        Rectangle(
-          extent={{-82,-30},{-40,-50}},
-          lineColor={0,0,255},
-          fillPattern=FillPattern.Solid,
-          fillColor={0,0,255}),
-        Ellipse(
-          extent={{78,-30},{90,-50}},
-          lineColor={0,0,255},
-          fillColor={0,0,255},
-          fillPattern=FillPattern.Solid),
-        Ellipse(
-          extent={{-86,-30},{-78,-50}},
-          lineColor={0,0,255},
-          fillColor={85,170,255},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{40,-30},{84,-50}},
-          lineColor={0,0,255},
-          fillPattern=FillPattern.Solid,
-          fillColor={0,0,255}),
-        Rectangle(
-          extent={{-40,-30},{40,-50}},
-          lineColor={0,0,255},
-          pattern=LinePattern.Dash),
-        Polygon(
-          points={{10,-20},{-2,16},{6,16},{-8,22},{-10,10},{-6,14},{6,
-              -22},{10,-20}},
-          smooth=Smooth.None,
-          fillColor={255,0,0},
-          fillPattern=FillPattern.Solid,
-          pattern=LinePattern.None,
-          origin={12,-62},
-          rotation=360),
-        Text(
-          extent={{-98,54},{-74,44}},
-          lineColor={0,0,127},
-          textString="Text")}),
-defaultComponentName="boi",
-Documentation(info="
+within BuildSysPro.Systems.HVAC.Production.Boiler;
+
+model Boiler
+  import Modelica.Units.SI;
+  import BuildSysPro.BaseClasses.Media.OLD_THERMHYGAERO.AirFunctions.Psat;
+  parameter Real PCSI = 1.11 "Ratio gross (high) heating value / net (low) heating value defined according to the fuel";
+  parameter SI.Temperature Tnom = 273.15 + 70 "Nominal temperature" annotation(
+    Dialog(group = "Parameters provided on ATITA basis"));
+  parameter Real PLRnom = 100 "Nominal loading rate (%)" annotation(
+    Dialog(group = "Parameters provided on ATITA basis"));
+  parameter SI.Power Pnom = 17300 "Nominal power" annotation(
+    Dialog(group = "Parameters provided on ATITA basis"));
+  parameter Real etaNom = 97.4 "Nominal net heating value efficiency (%)" annotation(
+    Dialog(group = "Parameters provided on ATITA basis"));
+  parameter SI.Temperature TInt = 273.15 + 33 "Intermediate temperature" annotation(
+    Dialog(group = "Parameters provided on ATITA basis"));
+  parameter Real PLRInt = 30 "Intermediate loading rate (%)" annotation(
+    Dialog(group = "Parameters provided on ATITA basis"));
+  parameter SI.Power PInt = 5190 "Intermediate power" annotation(
+    Dialog(group = "Parameters provided on ATITA basis"));
+  parameter Real etaInt = 107.2 "Intermediate net heating value efficiency (%)" annotation(
+    Dialog(group = "Parameters provided on ATITA basis"));
+  parameter SI.Power PertesT30K = 60 "Stop losses" annotation(
+    Dialog(group = "Parameters provided on ATITA basis"));
+  parameter SI.VolumeFlowRate V_flow = 1.02 / 3600 "Volume of water in the boiler" annotation(
+    Dialog(group = "Parameters provided on ATITA basis"));
+  parameter Modelica.Units.SI.Volume Veau(displayUnit = "l") = 2.8E-3 "Volume d'eau contenue dans la chaudière" annotation(
+    Dialog(group = "Parameters provided on ATITA basis"));
+  parameter SI.Mass mSec = 35 "Dry weight" annotation(
+    Dialog(group = "Parameters provided on ATITA basis"));
+  parameter SI.Power Paux = 24 "Electrical power of auxiliary on nominal power (out circulation pump)" annotation(
+    Dialog(group = "Parameters provided on ATITA basis"));
+  parameter SI.Power Pveille = 5.2 "Standby power (out circulation pump)" annotation(
+    Dialog(group = "Parameters provided on ATITA basis"));
+  parameter SI.Power Pcirculateur = 37 "Water circulation pump electrical power" annotation(
+    Dialog(group = "Parameters provided on ATITA basis"));
+  parameter Real DetaPLR = 1 "Efficiency gap at Tint between PLRnom (Part Load Ratio) and PLRInt (between 0 and 2% depending on the machine)" annotation(
+    Dialog(tab = "Other parameters", group = "Performance"));
+  parameter Real PLRmin = PLRInt "Minimum loading rate" annotation(
+    Dialog(tab = "Other parameters", group = "Performance"));
+  parameter SI.Time TimePrePurge = 30 "Pre-purge duration" annotation(
+    Dialog(tab = "Other parameters", group = "Performance"));
+  parameter SI.Time TimeCycle(displayUnit = "min") = 300 "Minimum duration of a cycle (anti-short cycle)" annotation(
+    Dialog(tab = "Other parameters", group = "Performance"));
+  parameter SI.Time TimeCirculateur(displayUnit = "min") = 600 "Operating time of the circulation pump after a combustion cycle" annotation(
+    Dialog(tab = "Other parameters", group = "Performance"));
+  parameter SI.SpecificHeatCapacity CpE = 4180 "Specific heat capacity of water" annotation(
+    Dialog(tab = "Other parameters", group = "Fluids properties"));
+  parameter SI.Density rhoE = 1000 "Density of water" annotation(
+    Dialog(tab = "Other parameters", group = "Fluids properties"));
+  parameter SI.VolumeFlowRate V_flowAir = 6.7E-3 * (Pnom / 20000) "Pre-purge: nominal flow rate of air (nominal value from [Kemna 2007])" annotation(
+    Dialog(tab = "Other parameters", group = "Fluids properties"));
+  parameter SI.SpecificHeatCapacity CpA = 1000 "Capacité thermique de l'air" annotation(
+    Dialog(tab = "Other parameters", group = "Fluids properties"));
+  parameter SI.Density rhoA = 1.2 "Specific heat capacity of air" annotation(
+    Dialog(tab = "Other parameters", group = "Fluids properties"));
+protected
+  parameter SI.ThermalConductance UA = PertesT30K / 30 "Conduction through the envelope";
+  parameter SI.Pressure Pref = 101300 "Reference pressure";
+  parameter SI.Temperature Tref = 15 + 273.15 "Reference temperature";
+  parameter Real lambda = 0.01 "Offset variable of weighting coefficients sigmas";
+  discrete SI.Time Time0(start = 0) "Beginning of the boiler cycle";
+  discrete SI.Time TimeF(start = 0) "End of the boiler cycle";
+public
+  Real etaRP "Efficiency in steady state at T and operational PLR";
+  SI.Power QaFournir "Thermal power to provide";
+  Integer NbCycle(start = 0);
+protected
+  SI.Temperature Tc "Temperature of Sensitive and Latent characteristic intersection";
+  SI.Temperature Te = WaterIn[1] "Water-return temperature (i.e. water inlet temperature)";
+  //EQUAL TO THE ENTRY PORT
+  Real a1 = (etaNom - 100) / (Tnom - Tref) "Slope of the line characterizing the sensitive part";
+  Real etaSens;
+  Real etaCond30;
+  Real etaCond;
+  Real sigmaSens;
+  Real sigmaCond;
+  Real a;
+  SI.MassFlowRate Debit "Water mass flow to the circulation pump, therefore in the boiler";
+public
+  Modelica.Blocks.Interfaces.RealInput PLR(min = 0, max = 100) "Part load ratio (0-100%)" annotation(
+    Placement(transformation(extent = {{-20, -20}, {20, 20}}, rotation = 270, origin = {0, 100}), iconTransformation(extent = {{-10, -10}, {10, 10}}, rotation = 270, origin = {0, 90})));
+  Modelica.Thermal.HeatTransfer.Components.ThermalConductor ConductanceEnv(G = UA) "Thermal resistance of the boiler casing" annotation(
+    Placement(transformation(extent = {{-10, -10}, {10, 10}}, rotation = 270, origin = {0, 32})));
+  Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_a T_int "Ambient temperature of the place where the boiler is located" annotation(
+    Placement(transformation(extent = {{40, 50}, {60, 70}}, rotation = 0), iconTransformation(extent = {{50, 70}, {70, 90}})));
+  Modelica.Thermal.HeatTransfer.Components.HeatCapacitor CpChau(C = 500 * mSec) "Boiler thermal capacity (dry weight)" annotation(
+    Placement(transformation(extent = {{-40, 0}, {-20, 20}})));
+  BuildSysPro.BaseClasses.HeatTransfer.Sources.PrescribedHeatFlow preHeaFlo annotation(
+    Placement(transformation(extent = {{-5.75, -5.75}, {5.75, 5.75}}, rotation = 0, origin = {-14.25, -80.25})));
+  Modelica.Blocks.Sources.RealExpression QaFournirExp(y = QaFournir) annotation(
+    Placement(transformation(extent = {{-62, -90}, {-42, -70}})));
+  Modelica.Blocks.Interfaces.RealOutput Pgaz "Thermal power provided by gas combustion" annotation(
+    Placement(transformation(extent = {{92, 16}, {112, 36}}), iconTransformation(extent = {{92, 16}, {112, 36}})));
+  Modelica.Blocks.Interfaces.RealOutput Pelec "Electrical power consumed (auxiliary ...)" annotation(
+    Placement(transformation(extent = {{92, 40}, {112, 60}}), iconTransformation(extent = {{92, -16}, {112, 4}})));
+  Modelica.Thermal.HeatTransfer.Components.HeatCapacitor CpEau(C = CpE * rhoE * Veau) "Heat capacity of the water volume" annotation(
+    Placement(transformation(extent = {{20, 0}, {40, 20}})));
+  BuildSysPro.BaseClasses.HeatTransfer.Sources.PrescribedHeatFlow preHeaFlo1 annotation(
+    Placement(transformation(extent = {{-5.75, -5.75}, {5.75, 5.75}}, rotation = 0, origin = {-34.25, -40.25})));
+  Modelica.Blocks.Sources.RealExpression BilanEau(y = Debit * CpE * (WaterIn[1] - WaterOut[1])) annotation(
+    Placement(transformation(extent = {{-80, -50}, {-60, -30}})));
+  Modelica.Blocks.Sources.RealExpression DebitExp(y = Debit) annotation(
+    Placement(transformation(extent = {{40, -40}, {60, -24}})));
+  Modelica.Thermal.HeatTransfer.Sensors.TemperatureSensor temperatureSensor annotation(
+    Placement(transformation(extent = {{46, -54}, {60, -40}})));
+  Modelica.Blocks.Interfaces.BooleanInput SaisonChauffe annotation(
+    Placement(transformation(extent = {{-20, -20}, {20, 20}}, rotation = 270, origin = {-30, 100}), iconTransformation(extent = {{-10, -10}, {10, 10}}, rotation = 270, origin = {-70, 90})));
+protected
+  Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_b port_b1 annotation(
+    Placement(transformation(extent = {{2, 2}, {-2, -2}})));
+public
+  Modelica.Blocks.Interfaces.RealInput WaterIn[2] "Vector containing 1- the input fluid temperature (K), 2- the input fluid flow rate (kg/s)" annotation(
+    Placement(transformation(extent = {{-128, -60}, {-88, -20}}), iconTransformation(extent = {{-110, -50}, {-90, -30}})));
+  Modelica.Blocks.Interfaces.RealOutput WaterOut[2] "Vector containing 1- the output fluid temperature (K), 2- the output fluid flow rate (kg/s)" annotation(
+    Placement(transformation(extent = {{92, -50}, {112, -30}}), iconTransformation(extent = {{92, -50}, {112, -30}})));
+initial equation
+
+algorithm
+  if SaisonChauffe then
+    etaSens := etaNom + a1 * (Te - Tnom);
+    etaCond30 := etaInt + (100 * PCSI - etaInt) * (1 - Psat(Te) / Psat(TInt) * TInt / Te);
+    etaCond := etaCond30 - DetaPLR * (Tc - Te) / (Tc - TInt) * (PLR - PLRInt) / (PLRnom - PLRInt);
+    sigmaSens := 1 / (1 + exp(Tc - Te - lambda));
+    sigmaCond := 1 - 1 / (1 + exp(Tc - Te + lambda));
+    etaRP := sigmaSens * etaSens + sigmaCond * etaCond;
+    if PLR > PLRmin then
+      if noEvent(time <= Time0 + TimePrePurge) then
+        a := 1;
+        Pelec := Paux + Pcirculateur;
+        QaFournir := V_flowAir * rhoA * CpA * (15 + 273.15 - CpEau.port.T);
+        Pgaz := 0;
+      else
+        a := 2;
+        Pelec := Paux * (0.5 + 0.5 * PLR / 100) + Pcirculateur;
+        QaFournir := PInt + (PLR - PLRInt) / (PLRnom - PLRInt) * (Pnom - PInt) + abs(ConductanceEnv.Q_flow);
+        Pgaz := QaFournir * 100 / etaRP;
+      end if;
+    else
+      if noEvent(time <= Time0 + TimePrePurge + TimeCycle) then
+        a := 3;
+        Pelec := Paux * (0.5 + PLRmin / 100) + Pcirculateur;
+        QaFournir := PInt + abs(ConductanceEnv.Q_flow);
+        Pgaz := QaFournir * 100 / etaRP;
+      elseif noEvent(time < max(TimeF, Time0 + TimePrePurge + TimeCycle) + TimeCirculateur) then
+        a := 4;
+        Pelec := Pveille + Pcirculateur;
+        QaFournir := 0;
+        Pgaz := 0;
+      else
+        a := 5;
+        Pelec := Pveille;
+        QaFournir := 0;
+        Pgaz := 0;
+      end if;
+    end if;
+  else
+    a := 0;
+    Pelec := 0;
+    QaFournir := 0;
+    Pgaz := 0;
+  end if;
+//The boiler is launched for PLR > PLRmin
+//Determination of the efficiency for the law without condensation
+//Determination of the efficiency for the law characterizing the condensation
+//Determination of the efficiency in steady state
+//Pre-purge
+//seems negligible, delete ??? YES based on parametric study, delete the entry T which is set at 15°C
+//Combustion
+//It is considered that half of the nominal electric power depends on the fan which depends on the load rate (PLR)
+//Manufacturers data already integrate losses through the envelope so when running, the term corresponding to losses through the envelope is added
+//Efficiency (%)
+//Anti-short cycles at minimal power
+//Efficiency (%)
+//Burner off but circulator in operation
+//Burner off and circulator cut off
+//Seasonal shutdown
+equation
+  Debit = if a < 1 or a > 4 then 0 else V_flow * rhoE;
+//Intersection point Tc determination
+  etaNom + a1 * (Tc - Tnom) = etaInt + (100 * PCSI - etaInt) * (1 - Psat(Tc) / Psat(TInt) * TInt / Tc);
+  when PLR >= PLRmin then
+    Time0 = time;
+  end when;
+  when PLR <= PLRmin then
+    TimeF = time;
+  end when;
+  when Pgaz < 0.1 * PInt then
+    NbCycle = pre(NbCycle) + 1;
+  end when;
+  connect(ConductanceEnv.port_a, T_int) annotation(
+    Line(points = {{1.83697e-015, 42}, {0, 60}, {50, 60}}, color = {191, 0, 0}, smooth = Smooth.None));
+  connect(QaFournirExp.y, preHeaFlo.Q_flow) annotation(
+    Line(points = {{-41, -80}, {-20, -80}, {-20, -80.25}, {-20, -80.25}}, color = {0, 0, 127}, smooth = Smooth.None));
+  connect(BilanEau.y, preHeaFlo1.Q_flow) annotation(
+    Line(points = {{-59, -40}, {-38, -40}, {-38, -40.25}, {-40, -40.25}}, color = {0, 0, 127}, smooth = Smooth.None));
+  connect(preHeaFlo1.port, CpEau.port) annotation(
+    Line(points = {{-28.5, -40.25}, {30, -40.25}, {30, 0}}, color = {191, 0, 0}, smooth = Smooth.None));
+  connect(CpEau.port, temperatureSensor.port) annotation(
+    Line(points = {{30, 0}, {30, -47}, {46, -47}}, color = {191, 0, 0}, smooth = Smooth.None));
+  connect(ConductanceEnv.port_b, port_b1) annotation(
+    Line(points = {{-1.77636e-015, 22}, {0, 22}, {0, 0}}, color = {191, 0, 0}, smooth = Smooth.None));
+  connect(port_b1, CpEau.port) annotation(
+    Line(points = {{0, 0}, {30, 0}}, color = {191, 0, 0}, smooth = Smooth.None));
+  connect(port_b1, CpChau.port) annotation(
+    Line(points = {{0, 0}, {-30, 0}}, color = {191, 0, 0}, smooth = Smooth.None));
+  connect(preHeaFlo.port, port_b1) annotation(
+    Line(points = {{-8.5, -80.25}, {0, -80.25}, {0, 0}}, color = {191, 0, 0}, smooth = Smooth.None));
+  connect(temperatureSensor.T, WaterOut[1]) annotation(
+    Line(points = {{60, -47}, {80, -47}, {80, -45}, {102, -45}}, color = {0, 0, 127}, smooth = Smooth.None));
+  connect(DebitExp.y, WaterOut[2]) annotation(
+    Line(points = {{61, -32}, {80, -32}, {80, -35}, {102, -35}}, color = {0, 0, 127}, smooth = Smooth.None));
+  annotation(
+    Diagram(coordinateSystem(preserveAspectRatio = false, extent = {{-100, -100}, {100, 100}})),
+    Icon(coordinateSystem(preserveAspectRatio = false, extent = {{-100, -100}, {100, 100}}), graphics = {Text(extent = {{-32, 96}, {-8, 86}}, lineColor = {0, 0, 127}, textString = "PLR"), Rectangle(extent = {{-100, 60}, {100, -80}}, lineColor = {245, 0, 0}, lineThickness = 1, fillColor = {215, 215, 215}, fillPattern = FillPattern.Solid), Text(extent = {{44, 28}, {90, 18}}, lineColor = {0, 0, 255}, textString = "Gas consumption"), Text(extent = {{40, -2}, {90, -12}}, lineColor = {0, 0, 255}, textString = "Elec consumption"), Polygon(points = {{-58, -86}, {-58, -86}, {-50, -76}, {-42, -86}, {-44, -94}, {-48, -96}, {-56, -94}, {-58, -86}, {-58, -86}}, smooth = Smooth.None, fillColor = {255, 255, 0}, fillPattern = FillPattern.Solid, pattern = LinePattern.None), Polygon(points = {{-54, -90}, {-54, -90}, {-50, -82}, {-44, -90}, {-46, -94}, {-48, -96}, {-52, -94}, {-54, -90}, {-54, -90}}, lineColor = {255, 128, 0}, smooth = Smooth.None, fillPattern = FillPattern.VerticalCylinder, fillColor = {255, 0, 0}, lineThickness = 1), Polygon(points = {{-38, -86}, {-38, -86}, {-30, -76}, {-22, -86}, {-24, -94}, {-28, -96}, {-36, -94}, {-38, -86}, {-38, -86}}, smooth = Smooth.None, fillColor = {255, 255, 0}, fillPattern = FillPattern.Solid, pattern = LinePattern.None), Polygon(points = {{-34, -90}, {-34, -90}, {-30, -82}, {-24, -90}, {-26, -94}, {-28, -96}, {-32, -94}, {-34, -90}, {-34, -90}}, lineColor = {255, 128, 0}, smooth = Smooth.None, fillPattern = FillPattern.VerticalCylinder, fillColor = {255, 0, 0}, lineThickness = 1), Polygon(points = {{-18, -86}, {-18, -86}, {-10, -76}, {-2, -86}, {-4, -94}, {-8, -96}, {-16, -94}, {-18, -86}, {-18, -86}}, smooth = Smooth.None, fillColor = {255, 255, 0}, fillPattern = FillPattern.Solid, pattern = LinePattern.None), Polygon(points = {{-14, -90}, {-14, -90}, {-10, -82}, {-4, -90}, {-6, -94}, {-8, -96}, {-12, -94}, {-14, -90}, {-14, -90}}, lineColor = {255, 128, 0}, smooth = Smooth.None, fillPattern = FillPattern.VerticalCylinder, fillColor = {255, 0, 0}, lineThickness = 1), Polygon(points = {{2, -86}, {2, -86}, {10, -76}, {18, -86}, {16, -94}, {12, -96}, {4, -94}, {2, -86}, {2, -86}}, smooth = Smooth.None, fillColor = {255, 255, 0}, fillPattern = FillPattern.Solid, pattern = LinePattern.None), Polygon(points = {{6, -90}, {6, -90}, {10, -82}, {16, -90}, {14, -94}, {12, -96}, {8, -94}, {6, -90}, {6, -90}}, lineColor = {255, 128, 0}, smooth = Smooth.None, fillPattern = FillPattern.VerticalCylinder, fillColor = {255, 0, 0}, lineThickness = 1), Polygon(points = {{22, -86}, {22, -86}, {30, -76}, {38, -86}, {36, -94}, {32, -96}, {24, -94}, {22, -86}, {22, -86}}, smooth = Smooth.None, fillColor = {255, 255, 0}, fillPattern = FillPattern.Solid, pattern = LinePattern.None), Polygon(points = {{26, -90}, {26, -90}, {30, -82}, {36, -90}, {34, -94}, {32, -96}, {28, -94}, {26, -90}, {26, -90}}, lineColor = {255, 128, 0}, smooth = Smooth.None, fillPattern = FillPattern.VerticalCylinder, fillColor = {255, 0, 0}, lineThickness = 1), Polygon(points = {{42, -86}, {42, -86}, {50, -76}, {58, -86}, {56, -94}, {52, -96}, {44, -94}, {42, -86}, {42, -86}}, smooth = Smooth.None, fillColor = {255, 255, 0}, fillPattern = FillPattern.Solid, pattern = LinePattern.None), Polygon(points = {{46, -90}, {46, -90}, {50, -82}, {56, -90}, {54, -94}, {52, -96}, {48, -94}, {46, -90}, {46, -90}}, lineColor = {255, 128, 0}, smooth = Smooth.None, fillPattern = FillPattern.VerticalCylinder, fillColor = {255, 0, 0}, lineThickness = 1), Polygon(points = {{64, -86}, {64, -86}, {72, -76}, {80, -86}, {78, -94}, {74, -96}, {66, -94}, {64, -86}, {64, -86}}, smooth = Smooth.None, fillColor = {255, 255, 0}, fillPattern = FillPattern.Solid, pattern = LinePattern.None), Polygon(points = {{68, -90}, {68, -90}, {72, -82}, {78, -90}, {76, -94}, {74, -96}, {70, -94}, {68, -90}, {68, -90}}, lineColor = {255, 128, 0}, smooth = Smooth.None, fillPattern = FillPattern.VerticalCylinder, fillColor = {255, 0, 0}, lineThickness = 1), Polygon(points = {{-78, -86}, {-78, -86}, {-70, -76}, {-62, -86}, {-64, -94}, {-68, -96}, {-76, -94}, {-78, -86}, {-78, -86}}, smooth = Smooth.None, fillColor = {255, 255, 0}, fillPattern = FillPattern.Solid, pattern = LinePattern.None), Polygon(points = {{-74, -90}, {-74, -90}, {-70, -82}, {-64, -90}, {-66, -94}, {-68, -96}, {-72, -94}, {-74, -90}, {-74, -90}}, lineColor = {255, 128, 0}, smooth = Smooth.None, fillPattern = FillPattern.VerticalCylinder, fillColor = {255, 0, 0}, lineThickness = 1), Rectangle(extent = {{-82, -30}, {-40, -50}}, lineColor = {0, 0, 255}, fillPattern = FillPattern.Solid, fillColor = {0, 0, 255}), Ellipse(extent = {{78, -30}, {90, -50}}, lineColor = {0, 0, 255}, fillColor = {0, 0, 255}, fillPattern = FillPattern.Solid), Ellipse(extent = {{-86, -30}, {-78, -50}}, lineColor = {0, 0, 255}, fillColor = {85, 170, 255}, fillPattern = FillPattern.Solid), Rectangle(extent = {{40, -30}, {84, -50}}, lineColor = {0, 0, 255}, fillPattern = FillPattern.Solid, fillColor = {0, 0, 255}), Rectangle(extent = {{-40, -30}, {40, -50}}, lineColor = {0, 0, 255}, pattern = LinePattern.Dash), Polygon(points = {{10, -20}, {-2, 16}, {6, 16}, {-8, 22}, {-10, 10}, {-6, 14}, {6, -22}, {10, -20}}, smooth = Smooth.None, fillColor = {255, 0, 0}, fillPattern = FillPattern.Solid, pattern = LinePattern.None, origin = {12, -62}, rotation = 360), Text(extent = {{-98, 54}, {-74, 44}}, lineColor = {0, 0, 127}, textString = "Text")}),
+    defaultComponentName = "boi",
+    Documentation(info = "
 
It is a dynamic model of modulating condensing boiler.

 
Hypothesis and equations

 
The gas consumption prediction model is estimated with a grey box model. Electric consumption is determined according to the consumption of the various operation phases of the boiler (purging, pump, power on/off, standby, etc).

@@ -490,10 +243,10 @@
 BuildSysPro version 3.5.0

 Author : Hubert BLERVAQUE, Sila FILFLI, EDF (2013)

 --------------------------------------------------------------

-",                                                                    revisions="
+", revisions = "
 
Benoît Charrier 05/2015 : Suppression des connecteurs T & m_flow.

 
Benoît Charrier 01/2016 : Passage du calcul du débit en equation pour compatibilité OpenModelica.

-"),
-    experiment(StopTime=5000, Interval=600),
-    __Dymola_experimentSetupOutput);
-end Boiler;
+"),
+    experiment(StopTime = 5000, Interval = 600),
+    __Dymola_experimentSetupOutput);
+end Boiler;
\ No newline at end of file
Only in converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/Boiler: Boiler.mo.after
Only in converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/Boiler: Boiler.mo.before
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/HeatPump/FixedSpeed/Examples/MozartAAHPHeating.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/HeatPump/FixedSpeed/Examples/MozartAAHPHeating.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/HeatPump/FixedSpeed/Examples/MozartAAHPHeating.mo"	2022-03-10 09:57:39.996144378 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/HeatPump/FixedSpeed/Examples/MozartAAHPHeating.mo"	2022-03-10 09:57:59.452146844 +0000
@@ -1,9 +1,9 @@
 within BuildSysPro.Systems.HVAC.Production.HeatPump.FixedSpeed.Examples;
 model MozartAAHPHeating
 extends Modelica.Icons.Example;
-//  Modelica.SIunits.Conversions.NonSIunits.Time_day day=time/24/3600;
+  //  Modelica.SIunits.Conversions.NonSIunits.Time_day day=time/24/3600;
   Modelica.Units.NonSI.Time_hour hour=time/3600;
-//  Modelica.SIunits.Conversions.NonSIunits.Time_minute minute=time/60;
+  //  Modelica.SIunits.Conversions.NonSIunits.Time_minute minute=time/60;
   Modelica.Units.SI.Energy CONSO;
   Modelica.Units.SI.Energy ChaleurFournie;
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/HeatPump/FixedSpeed/HPHeatingAir2Air.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/HeatPump/FixedSpeed/HPHeatingAir2Air.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/HeatPump/FixedSpeed/HPHeatingAir2Air.mo"	2022-03-10 09:57:39.996144378 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/HeatPump/FixedSpeed/HPHeatingAir2Air.mo"	2022-03-10 09:57:59.432146842 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Systems.HVAC.Production.HeatPump.FixedSpeed;
+within BuildSysPro.Systems.HVAC.Production.HeatPump.FixedSpeed;
 model HPHeatingAir2Air
   "Intermittently controlled air to air HP - heating mode only"
 
@@ -7,7 +7,7 @@
                 choice=1 "Default: an operating point of 7°C/20°C",
                 choice=2 "Expert: 3 operating points"));
 
-// Parameterization based on the HP default template : Choice 1
+// Parameterization based on the HP default template : Choice 1
   parameter Modelica.Units.SI.Power Qnom=1380.87
     "Nominal heating power in Enom temperature conditions"
     annotation (Dialog(enable=(Choix == 1), group="Parameterization choice 1"));
@@ -15,7 +15,7 @@
     "Nominal coefficient of performance in Enom temperature conditions"
     annotation (Dialog(enable=(Choix==1), group="Parameterization choice 1"));
 
-// Expert parameterization : Choice 2
+// Expert parameterization : Choice 2
   parameter Real Enom[4] = {7,20,329.982,1380.87}
     "Nominal manufacturer data: {Text(°C), ToutputHP(°C), Electric power consumed (W), Supplied heat (W)}"
     annotation (Dialog(enable=(Choix==2), group="Parameterization choice 2"));
@@ -26,7 +26,7 @@
     "Manufacturer data: {Text(°C), ToutputHP(°C), Electric power consumed (W), Supplied heat (W)}"
     annotation (Dialog(enable=(Choix==2), group="Parameterization choice 2"));
 
-// Other parameters common to the different choices
+// Other parameters common to the different choices
   parameter Modelica.Units.SI.Power QfanextRat=0
     "Outdoor fan power, if QfanextRat included in Qa then choose 0"
     annotation (Dialog(group="Other parameters"));
@@ -112,43 +112,39 @@
         extent={{-20,-20},{20,20}},
         rotation=270,
         origin={-58,92})));
-equation
-// Machine performance according to the parameterization method selected by the user
-  if Choix==1 then
-    QcRat=Qnom;
-    QaRatC=Qnom/COPnom;
-    C1 = -2.94982;
-    C2 =  4.16648;
-    D1 =  0.0154996;
-    D2 = -0.0385624;
-  else
-    QcRat=Enom[4];
-    QaRatC=Enom[3];
-    D2=((E1[1]-Enom[1])*(E2[2]-Enom[2]))/(((E1[1]-Enom[1])*(E2[2]-Enom[2])-(E2[1]-Enom[1])*(E1[2]-Enom[2]))*(E2[2]-Enom[2]))*(E2[4]/Enom[4]-1-(E2[1]-Enom[1])/(E1[1]-Enom[1])*(E1[4]/Enom[4]-1));
-    D1=(E1[4]/Enom[4]-1-D2*(E1[2]-Enom[2]))/(E1[1]-Enom[1]);
-    C2=((E2[3]/E2[4])/(Enom[3]/Enom[4])-1-Dt2/Dt1*((E1[3]/E1[4])/(Enom[3]/Enom[4])-1))/(Dt2*Dt2-Dt1*Dt2);
-    C1=((E1[3]/E1[4])/(Enom[3]/Enom[4])-1-C2*Dt1*Dt1)/Dt1;
-  end if;
-
-// Calculate required energy rates at full load for no-rating conditions
-    Qcflssdegi =QcRat*(1 + D1*(T_ext - TextRatC) + D2*(T_int - TintRatC));
-
-// Defrost losses when Text < 2°C
-  if (T_ext > 275.15) then
-      Qcfl = Qcflssdegi;
-    else
-      Qcfl = Cdegi*Qcflssdegi;
-    end if;
-
-// Calculate non-dimensionnal temperature difference
-    Dt =T_ext/T_int - TextRatC/TintRatC;
-// Calculate consumed energy rates at full load for no-rating conditions
-    Qafl = Qcflssdegi*(QaRatC/QcRat)*(1 + C1*Dt + C2*Dt*Dt);
-
-// Two minimum time periods protect the machin
-     when pre(v) then
-       tOn=time;
-     end when;
+equation
+// Machine performance according to the parameterization method selected by the user
+  if Choix == 1 then
+    QcRat = Qnom;
+    QaRatC = Qnom / COPnom;
+    C1 = -2.94982;
+    C2 = 4.16648;
+    D1 = 0.0154996;
+    D2 = -0.0385624;
+  else
+    QcRat = Enom[4];
+    QaRatC = Enom[3];
+    D2 = (E1[1] - Enom[1]) * (E2[2] - Enom[2]) / (((E1[1] - Enom[1]) * (E2[2] - Enom[2]) - (E2[1] - Enom[1]) * (E1[2] - Enom[2])) * (E2[2] - Enom[2])) * (E2[4] / Enom[4] - 1 - (E2[1] - Enom[1]) / (E1[1] - Enom[1]) * (E1[4] / Enom[4] - 1));
+    D1 = (E1[4] / Enom[4] - 1 - D2 * (E1[2] - Enom[2])) / (E1[1] - Enom[1]);
+    C2 = (E2[3] / E2[4] / (Enom[3] / Enom[4]) - 1 - Dt2 / Dt1 * (E1[3] / E1[4] / (Enom[3] / Enom[4]) - 1)) / (Dt2 * Dt2 - Dt1 * Dt2);
+    C1 = (E1[3] / E1[4] / (Enom[3] / Enom[4]) - 1 - C2 * Dt1 * Dt1) / Dt1;
+  end if;
+// Calculate required energy rates at full load for no-rating conditions
+  Qcflssdegi = QcRat * (1 + D1 * (T_ext - TextRatC) + D2 * (T_int - TintRatC));
+// Defrost losses when Text < 2°C
+  if T_ext > 275.15 then
+    Qcfl = Qcflssdegi;
+  else
+    Qcfl = Cdegi * Qcflssdegi;
+  end if;
+// Calculate non-dimensionnal temperature difference
+  Dt = T_ext / T_int - TextRatC / TintRatC;
+// Calculate consumed energy rates at full load for no-rating conditions
+  Qafl = Qcflssdegi * (QaRatC / QcRat) * (1 + C1 * Dt + C2 * Dt * Dt);
+// Two minimum time periods protect the machin
+  when pre(v) then
+    tOn = time;
+  end when;
      dtOn=time-tOn;
 
      w = not v;
@@ -157,23 +153,21 @@
      end when;
      dtOff=time-tOff;
 
-    v = ((u or dtOn<=dtminOn) and dtOff>=dtminOff);
-
-// Dynamic simulation
-    //About consumed electric power, the athors agree that there is no time constant
-    //on consumed power, and that its value is the same in dynamic and steady states [Goldsmith 80], [Henderson 96], [O'Neal 91].
-    //This hypothesis was confirmed by different experimentations [Rasmussen 87], [Miller 85] and [Garde 97a]. from [Garde2001]
-if SaisonChauffe then
-    Qelec=if v then Qafl+QfanextRat else alpha*QaRatC;
-    //The power delivered is determined by a dynamic with one time constant
-    Qfour=if v then Qcfl*(1-exp(-dtOn/TauOn)) else 0;
-    COPt=Qfour/Qelec;
-
-else  Qfour = 0;
-      Qelec =0;
-      COPt = 0;
-end if;
-
+    v = ((u or dtOn<=dtminOn) and dtOff>=dtminOff);
+// Dynamic simulation
+//About consumed electric power, the athors agree that there is no time constant
+//on consumed power, and that its value is the same in dynamic and steady states [Goldsmith 80], [Henderson 96], [O'Neal 91].
+//This hypothesis was confirmed by different experimentations [Rasmussen 87], [Miller 85] and [Garde 97a]. from [Garde2001]
+  if SaisonChauffe then
+    Qelec = if v then Qafl + QfanextRat else alpha * QaRatC;
+//The power delivered is determined by a dynamic with one time constant
+    Qfour = if v then Qcfl * (1 - exp(-dtOn / TauOn)) else 0;
+    COPt = Qfour / Qelec;
+  else
+    Qfour = 0;
+    Qelec = 0;
+    COPt = 0;
+  end if;
   annotation (Diagram(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100},
             {100,100}})),                       Icon(coordinateSystem(
           preserveAspectRatio=true,  extent={{-100,-100},{100,100}}),
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/HeatPump/FixedSpeed/HPHeatingAir2Water.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/HeatPump/FixedSpeed/HPHeatingAir2Water.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/HeatPump/FixedSpeed/HPHeatingAir2Water.mo"	2022-03-10 09:57:39.996144378 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/HeatPump/FixedSpeed/HPHeatingAir2Water.mo"	2022-03-10 09:57:59.392146837 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Systems.HVAC.Production.HeatPump.FixedSpeed;
+within BuildSysPro.Systems.HVAC.Production.HeatPump.FixedSpeed;
 model HPHeatingAir2Water
   "Intermittently controlled air to water HP - heating mode only"
 
@@ -7,7 +7,7 @@
                 choice=1 "Default: an operating point of 7°C/35°C",
                 choice=2 "Expert: 3 operating points"));
 
-// Parameterization based on the HP default template : Choice 1
+// Parameterization based on the HP default template : Choice 1
   parameter Modelica.Units.SI.Power Qnom=6490
     "Nominal heating power in Enom temperature conditions"
     annotation (Dialog(enable=(Choix == 1), group="Parameterization choice 1"));
@@ -15,7 +15,7 @@
     "Nominal coefficient of performance in Enom temperature conditions"
     annotation (Dialog(enable=(Choix==1), group="Parameterization choice 1"));
 
-// Expert parameterization : Choice 2
+// Expert parameterization : Choice 2
   parameter Real Enom[4] = {2,45,1800,4950}
     "Nominal manufacturer data: {Text(°C), ToutputHP(°C), Electric power consumed (W), Supplied heat (W)}"
     annotation (Dialog(enable=(Choix==2), group="Parameterization choice 2"));
@@ -26,7 +26,7 @@
     "Manufacturer data: {Text(°C), ToutputHP(°C), Electric power consumed (W), Supplied heat (W)}"
     annotation (Dialog(enable=(Choix==2), group="Parameterization choice 2"));
 
-// Other parameters common to the different choices
+// Other parameters common to the different choices
   parameter Modelica.Units.SI.MassFlowRate MegRat=0.1
     "Nominal water flow inside" annotation (Dialog(group="Other parameters"));
   parameter Integer PumpOperation=1 "Water pump operation"
@@ -127,47 +127,43 @@
     annotation (Placement(transformation(extent={{80,-70},{120,-30}}),
         iconTransformation(extent={{92,-50},{112,-30}})));
 
-equation
-// Machine performance according to the parameterization method selected by the user
-  if Choix==1 then
-    TextRatC = 7+273.15;
-    TintRatC = 35+273.15;
-    QcRat=Qnom;
-    QaRatC=Qnom/COPnom;
-    C1 = -2.94982;
-    C2 =  4.16648;
-    D1 =  0.0154996;
-    D2 = -0.0385624;
-  else
-    TextRatC = Enom[1]+273.15;
-    TintRatC = Enom[2]+273.15;
-    QcRat=Enom[4];
-    QaRatC=Enom[3];
-    D2=((E1[1]-Enom[1])*(E2[2]-Enom[2]))/(((E1[1]-Enom[1])*(E2[2]-Enom[2])-(E2[1]-Enom[1])*(E1[2]-Enom[2]))*(E2[2]-Enom[2]))*(E2[4]/Enom[4]-1-(E2[1]-Enom[1])/(E1[1]-Enom[1])*(E1[4]/Enom[4]-1));
-    D1=(E1[4]/Enom[4]-1-D2*(E1[2]-Enom[2]))/(E1[1]-Enom[1]);
-    C2=((E2[3]/E2[4])/(Enom[3]/Enom[4])-1-Dt2/Dt1*((E1[3]/E1[4])/(Enom[3]/Enom[4])-1))/(Dt2*Dt2-Dt1*Dt2);
-    C1=((E1[3]/E1[4])/(Enom[3]/Enom[4])-1-C2*Dt1*Dt1)/Dt1;
-  end if;
-
-// Calculate required energy rates at full load for no-rating conditions
-    Qcflssdegi =QcRat*(1 + D1*(T_ext - TextRatC) + D2*(WaterIn[1] - TintRatC));
-
-// Defrost losses when Text < 2°C
-  if (T_ext > 275.15) then
-    Qcfl = Qcflssdegi;
-  else
-    Qcfl = Cdegi*Qcflssdegi;
-  end if;
-
-// Calculate non-dimensionnal temperature difference
-    Dt =T_ext/WaterIn[1] - TextRatC/TintRatC;
-// Calculate consumed energy rates at full load for no-rating conditions
-    Qafl = Qcflssdegi*(QaRatC/QcRat)*(1 + C1*Dt + C2*Dt*Dt);
-
-// Two minimum time periods protect the machine
-     when pre(v) then
-       tOn=time;
-     end when;
+equation
+// Machine performance according to the parameterization method selected by the user
+  if Choix == 1 then
+    TextRatC = 7 + 273.15;
+    TintRatC = 35 + 273.15;
+    QcRat = Qnom;
+    QaRatC = Qnom / COPnom;
+    C1 = -2.94982;
+    C2 = 4.16648;
+    D1 = 0.0154996;
+    D2 = -0.0385624;
+  else
+    TextRatC = Enom[1] + 273.15;
+    TintRatC = Enom[2] + 273.15;
+    QcRat = Enom[4];
+    QaRatC = Enom[3];
+    D2 = (E1[1] - Enom[1]) * (E2[2] - Enom[2]) / (((E1[1] - Enom[1]) * (E2[2] - Enom[2]) - (E2[1] - Enom[1]) * (E1[2] - Enom[2])) * (E2[2] - Enom[2])) * (E2[4] / Enom[4] - 1 - (E2[1] - Enom[1]) / (E1[1] - Enom[1]) * (E1[4] / Enom[4] - 1));
+    D1 = (E1[4] / Enom[4] - 1 - D2 * (E1[2] - Enom[2])) / (E1[1] - Enom[1]);
+    C2 = (E2[3] / E2[4] / (Enom[3] / Enom[4]) - 1 - Dt2 / Dt1 * (E1[3] / E1[4] / (Enom[3] / Enom[4]) - 1)) / (Dt2 * Dt2 - Dt1 * Dt2);
+    C1 = (E1[3] / E1[4] / (Enom[3] / Enom[4]) - 1 - C2 * Dt1 * Dt1) / Dt1;
+  end if;
+// Calculate required energy rates at full load for no-rating conditions
+  Qcflssdegi = QcRat * (1 + D1 * (T_ext - TextRatC) + D2 * (WaterIn[1] - TintRatC));
+// Defrost losses when Text < 2°C
+  if T_ext > 275.15 then
+    Qcfl = Qcflssdegi;
+  else
+    Qcfl = Cdegi * Qcflssdegi;
+  end if;
+// Calculate non-dimensionnal temperature difference
+  Dt = T_ext / WaterIn[1] - TextRatC / TintRatC;
+// Calculate consumed energy rates at full load for no-rating conditions
+  Qafl = Qcflssdegi * (QaRatC / QcRat) * (1 + C1 * Dt + C2 * Dt * Dt);
+// Two minimum time periods protect the machine
+  when pre(v) then
+    tOn = time;
+  end when;
      dtOn=time-tOn;
 
      w = not v;
@@ -176,24 +172,23 @@
      end when;
      dtOff=time-tOff;
 
-    v = ((u or dtOn<=dtminOn) and dtOff>=dtminOff);
-
-// Dynamic simulation
-    //About consumed electric power, the athors agree that there is no time constant
-    //on consumed power, and that its value is the same in dynamic and steady states [Goldsmith 80], [Henderson 96], [O'Neal 91].
-    //This hypothesis was confirmed by different experimentations [Rasmussen 87], [Miller 85] and [Garde 97a]. from [Garde2001]
-if SaisonChauffe then
-    Qelec=if v then Qafl+QfanextRat else alpha*QaRatC;
-    //The power supplied is determined by a dynamic with one time constant.
-    Qfour = if v then Qcfl*(1-exp(-dtOn/TauOn)) else 0;
-    WaterOut[2] = if v then MegRat else if PumpOperation==2 then 1E-10 else MegRat;
-    WaterOut[1] = if v then WaterIn[1] + Qfour/(MegRat*CpLiq) else WaterIn[1];
-else
-    Qfour = 0;
-    Qelec =0;
-    WaterOut[2] = 1E-10;
-    WaterOut[1] = WaterIn[1];
-end if;
+    v = ((u or dtOn<=dtminOn) and dtOff>=dtminOff);
+// Dynamic simulation
+//About consumed electric power, the athors agree that there is no time constant
+//on consumed power, and that its value is the same in dynamic and steady states [Goldsmith 80], [Henderson 96], [O'Neal 91].
+//This hypothesis was confirmed by different experimentations [Rasmussen 87], [Miller 85] and [Garde 97a]. from [Garde2001]
+  if SaisonChauffe then
+    Qelec = if v then Qafl + QfanextRat else alpha * QaRatC;
+//The power supplied is determined by a dynamic with one time constant.
+    Qfour = if v then Qcfl * (1 - exp(-dtOn / TauOn)) else 0;
+    WaterOut[2] = if v then MegRat else if PumpOperation == 2 then 1E-10 else MegRat;
+    WaterOut[1] = if v then WaterIn[1] + Qfour / (MegRat * CpLiq) else WaterIn[1];
+  else
+    Qfour = 0;
+    Qelec = 0;
+    WaterOut[2] = 1E-10;
+    WaterOut[1] = WaterIn[1];
+  end if;
 
   when v then
     NbCyclePAC = pre(NbCyclePAC) + 1;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Examples/MozartWoodStove.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Examples/MozartWoodStove.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Examples/MozartWoodStove.mo"	2022-03-10 09:57:39.996144378 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Examples/MozartWoodStove.mo"	2022-03-10 09:57:59.328146829 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Systems.HVAC.Production.WoodHeating.Examples;
+within BuildSysPro.Systems.HVAC.Production.WoodHeating.Examples;
 model MozartWoodStove
 extends Modelica.Icons.Example;
   Modelica.Units.NonSI.Time_day day=time/24/3600 "Day";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Examples/package.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Examples/package.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Examples/package.mo"	2022-03-10 09:57:39.996144378 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Examples/package.mo"	2022-03-10 09:57:59.344146830 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Systems.HVAC.Production.WoodHeating;
+within BuildSysPro.Systems.HVAC.Production.WoodHeating;
 package Examples "Examples"
 extends BuildSysPro.Utilities.Icons.ExamplesPackage;
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Logs/LogStove.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Logs/LogStove.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Logs/LogStove.mo"	2022-03-10 09:57:39.996144378 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Logs/LogStove.mo"	2022-03-10 09:57:59.304146826 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Systems.HVAC.Production.WoodHeating.Logs;
+within BuildSysPro.Systems.HVAC.Production.WoodHeating.Logs;
 model LogStove
 
   import      Modelica.Units.SI;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Logs/LogStoveControlled.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Logs/LogStoveControlled.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Logs/LogStoveControlled.mo"	2022-03-10 09:57:39.996144378 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Logs/LogStoveControlled.mo"	2022-03-10 09:57:59.244146818 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Systems.HVAC.Production.WoodHeating.Logs;
+within BuildSysPro.Systems.HVAC.Production.WoodHeating.Logs;
 model LogStoveControlled
 
 // ---------------------------------------------------------------------------------
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Logs/LogStoveController.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Logs/LogStoveController.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Logs/LogStoveController.mo"	2022-03-10 09:57:39.996144378 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Logs/LogStoveController.mo"	2022-03-10 09:57:59.212146814 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Systems.HVAC.Production.WoodHeating.Logs;
+within BuildSysPro.Systems.HVAC.Production.WoodHeating.Logs;
 block LogStoveController
 
   Modelica.Blocks.Interfaces.RealInput m_b "Actual mass of wood in the stove"
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Logs/package.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Logs/package.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Logs/package.mo"	2022-03-10 09:57:39.996144378 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Logs/package.mo"	2022-03-10 09:57:59.312146826 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Systems.HVAC.Production.WoodHeating;
+within BuildSysPro.Systems.HVAC.Production.WoodHeating;
 package Logs "Logs"
 
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Pellets/PGS/PGS.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Pellets/PGS/PGS.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Pellets/PGS/PGS.mo"	2022-03-10 09:57:39.996144378 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Pellets/PGS/PGS.mo"	2022-03-10 09:57:59.060146794 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Systems.HVAC.Production.WoodHeating.Pellets.PGS;
+within BuildSysPro.Systems.HVAC.Production.WoodHeating.Pellets.PGS;
 model PGS
 
   Modelica.Blocks.Interfaces.RealInput T_consigne
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Pellets/PGS/PGS_controller.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Pellets/PGS/PGS_controller.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Pellets/PGS/PGS_controller.mo"	2022-03-10 09:57:39.996144378 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Pellets/PGS/PGS_controller.mo"	2022-03-10 09:57:59.016146789 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Systems.HVAC.Production.WoodHeating.Pellets.PGS;
+within BuildSysPro.Systems.HVAC.Production.WoodHeating.Pellets.PGS;
 model PGS_controller
 
   Modelica.Blocks.Interfaces.RealInput Tconsigne "Temperature wanted"
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Pellets/PGS/PGS_stove.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Pellets/PGS/PGS_stove.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Pellets/PGS/PGS_stove.mo"	2022-03-10 09:57:39.996144378 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Pellets/PGS/PGS_stove.mo"	2022-03-10 09:57:59.004146787 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Systems.HVAC.Production.WoodHeating.Pellets.PGS;
+within BuildSysPro.Systems.HVAC.Production.WoodHeating.Pellets.PGS;
 model PGS_stove
 
   import      Modelica.Units.SI;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Pellets/PGS/package.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Pellets/PGS/package.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Pellets/PGS/package.mo"	2022-03-10 09:57:39.996144378 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Pellets/PGS/package.mo"	2022-03-10 09:57:59.068146797 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Systems.HVAC.Production.WoodHeating.Pellets;
+within BuildSysPro.Systems.HVAC.Production.WoodHeating.Pellets;
 package PGS "PGS"
 
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Pellets/PGVH/Examples/MonozonePGVH.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Pellets/PGVH/Examples/MonozonePGVH.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Pellets/PGVH/Examples/MonozonePGVH.mo"	2022-03-10 09:57:39.996144378 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Pellets/PGVH/Examples/MonozonePGVH.mo"	2022-03-10 09:57:58.932146778 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Systems.HVAC.Production.WoodHeating.Pellets.PGVH.Examples;
+within BuildSysPro.Systems.HVAC.Production.WoodHeating.Pellets.PGVH.Examples;
 model MonozonePGVH
 
   BuildSysPro.BoundaryConditions.Weather.Meteofile meteofile(pth=
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Pellets/PGVH/Examples/package.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Pellets/PGVH/Examples/package.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Pellets/PGVH/Examples/package.mo"	2022-03-10 09:57:39.996144378 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Pellets/PGVH/Examples/package.mo"	2022-03-10 09:57:58.944146780 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Systems.HVAC.Production.WoodHeating.Pellets.PGVH;
+within BuildSysPro.Systems.HVAC.Production.WoodHeating.Pellets.PGVH;
 package Examples
   extends BuildSysPro.Utilities.Icons.ExamplesPackage;
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Pellets/PGVH/PGVH.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Pellets/PGVH/PGVH.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Pellets/PGVH/PGVH.mo"	2022-03-10 09:57:39.996144378 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Pellets/PGVH/PGVH.mo"	2022-03-10 09:57:58.912146776 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Systems.HVAC.Production.WoodHeating.Pellets.PGVH;
+within BuildSysPro.Systems.HVAC.Production.WoodHeating.Pellets.PGVH;
 model PGVH
 
   Modelica.Blocks.Interfaces.RealInput T_consigne
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Pellets/PGVH/PGVH_controller.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Pellets/PGVH/PGVH_controller.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Pellets/PGVH/PGVH_controller.mo"	2022-03-10 09:57:39.996144378 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Pellets/PGVH/PGVH_controller.mo"	2022-03-10 09:57:58.860146770 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Systems.HVAC.Production.WoodHeating.Pellets.PGVH;
+within BuildSysPro.Systems.HVAC.Production.WoodHeating.Pellets.PGVH;
 model PGVH_controller
 
   Modelica.Blocks.Interfaces.RealInput Tconsigne "Temperature wanted"
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Pellets/PGVH/PGVH_stove.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Pellets/PGVH/PGVH_stove.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Pellets/PGVH/PGVH_stove.mo"	2022-03-10 09:57:39.996144378 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Pellets/PGVH/PGVH_stove.mo"	2022-03-10 09:57:58.840146766 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Systems.HVAC.Production.WoodHeating.Pellets.PGVH;
+within BuildSysPro.Systems.HVAC.Production.WoodHeating.Pellets.PGVH;
 model PGVH_stove
 
   import      Modelica.Units.SI;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Pellets/PGVH/package.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Pellets/PGVH/package.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Pellets/PGVH/package.mo"	2022-03-10 09:57:39.996144378 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Pellets/PGVH/package.mo"	2022-03-10 09:57:58.952146781 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Systems.HVAC.Production.WoodHeating.Pellets;
+within BuildSysPro.Systems.HVAC.Production.WoodHeating.Pellets;
 package PGVH "PGVH"
 
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Pellets/WoodBoiler/Examples/MozartWoodBoiler.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Pellets/WoodBoiler/Examples/MozartWoodBoiler.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Pellets/WoodBoiler/Examples/MozartWoodBoiler.mo"	2022-03-10 09:57:39.996144378 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Pellets/WoodBoiler/Examples/MozartWoodBoiler.mo"	2022-03-10 09:57:58.492146722 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Systems.HVAC.Production.WoodHeating.Pellets.WoodBoiler.Examples;
+within BuildSysPro.Systems.HVAC.Production.WoodHeating.Pellets.WoodBoiler.Examples;
 model MozartWoodBoiler
 
   Modelica.Units.NonSI.Time_day day=time/24/3600;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Pellets/WoodBoiler/Examples/package.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Pellets/WoodBoiler/Examples/package.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Pellets/WoodBoiler/Examples/package.mo"	2022-03-10 09:57:39.996144378 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Pellets/WoodBoiler/Examples/package.mo"	2022-03-10 09:57:58.504146724 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Systems.HVAC.Production.WoodHeating.Pellets.WoodBoiler;
+within BuildSysPro.Systems.HVAC.Production.WoodHeating.Pellets.WoodBoiler;
 package Examples "Exemples"
   annotation (Icon(graphics={
         Rectangle(
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Pellets/WoodBoiler/WoodBoiler.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Pellets/WoodBoiler/WoodBoiler.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Pellets/WoodBoiler/WoodBoiler.mo"	2022-03-10 09:57:39.996144378 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Pellets/WoodBoiler/WoodBoiler.mo"	2022-03-10 09:57:58.468146721 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Systems.HVAC.Production.WoodHeating.Pellets.WoodBoiler;
+within BuildSysPro.Systems.HVAC.Production.WoodHeating.Pellets.WoodBoiler;
 model WoodBoiler "Wood Boiler"
 
   parameter Modelica.Units.SI.Power Pcombmax=6580
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Pellets/WoodBoiler/package.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Pellets/WoodBoiler/package.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Pellets/WoodBoiler/package.mo"	2022-03-10 09:57:39.996144378 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Pellets/WoodBoiler/package.mo"	2022-03-10 09:57:58.512146726 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Systems.HVAC.Production.WoodHeating.Pellets;
+within BuildSysPro.Systems.HVAC.Production.WoodHeating.Pellets;
 package WoodBoiler "Chaudière à Bois"
 
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Pellets/WoodStove/Examples/MozartWoodStove.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Pellets/WoodStove/Examples/MozartWoodStove.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Pellets/WoodStove/Examples/MozartWoodStove.mo"	2022-03-10 09:57:39.996144378 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Pellets/WoodStove/Examples/MozartWoodStove.mo"	2022-03-10 09:57:58.396146710 +0000
@@ -1,7 +1,5 @@
-within BuildSysPro.Systems.HVAC.Production.WoodHeating.Pellets.WoodStove.Examples;
+within BuildSysPro.Systems.HVAC.Production.WoodHeating.Pellets.WoodStove.Examples;
 model MozartWoodStove
-
-public
   BuildSysPro.BoundaryConditions.Weather.Meteofile meteofile
     annotation (Placement(transformation(extent={{-140,40},{-100,80}})));
   BuildSysPro.Building.Zones.HeatTransfer.ZoneCrawlSpaceGlazed Int(
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Pellets/WoodStove/Examples/package.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Pellets/WoodStove/Examples/package.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Pellets/WoodStove/Examples/package.mo"	2022-03-10 09:57:39.996144378 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Pellets/WoodStove/Examples/package.mo"	2022-03-10 09:57:58.412146713 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Systems.HVAC.Production.WoodHeating.Pellets.WoodStove;
+within BuildSysPro.Systems.HVAC.Production.WoodHeating.Pellets.WoodStove;
 package Examples
   annotation (Icon(graphics={
         Rectangle(
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Pellets/WoodStove/WoodStove.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Pellets/WoodStove/WoodStove.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Pellets/WoodStove/WoodStove.mo"	2022-03-10 09:57:39.996144378 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Pellets/WoodStove/WoodStove.mo"	2022-03-10 09:57:58.368146708 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Systems.HVAC.Production.WoodHeating.Pellets.WoodStove;
+within BuildSysPro.Systems.HVAC.Production.WoodHeating.Pellets.WoodStove;
 model WoodStove
 
   Modelica.Blocks.Interfaces.RealInput T_consigne
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Pellets/WoodStove/package.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Pellets/WoodStove/package.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Pellets/WoodStove/package.mo"	2022-03-10 09:57:39.996144378 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Pellets/WoodStove/package.mo"	2022-03-10 09:57:58.416146713 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Systems.HVAC.Production.WoodHeating.Pellets;
+within BuildSysPro.Systems.HVAC.Production.WoodHeating.Pellets;
 package WoodStove "Wood Stove"
 
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Pellets/package.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Pellets/package.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Pellets/package.mo"	2022-03-10 09:57:39.996144378 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/Pellets/package.mo"	2022-03-10 09:57:59.088146799 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Systems.HVAC.Production.WoodHeating;
+within BuildSysPro.Systems.HVAC.Production.WoodHeating;
 package Pellets "Pellets"
 
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/package.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/package.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/package.mo"	2022-03-10 09:57:39.996144378 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/HVAC/Production/WoodHeating/package.mo"	2022-03-10 09:57:59.356146832 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Systems.HVAC.Production;
+within BuildSysPro.Systems.HVAC.Production;
 package WoodHeating "Wood Stove"
 
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Solar/Examples/T_SolarWall.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Solar/Examples/T_SolarWall.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Solar/Examples/T_SolarWall.mo"	2022-03-10 09:57:39.996144378 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Solar/Examples/T_SolarWall.mo"	2022-03-10 09:57:58.268146694 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Systems.Solar.Examples;
+within BuildSysPro.Systems.Solar.Examples;
 model T_SolarWall
 extends Modelica.Icons.Example;
   Thermal.SolarWall.ParallelTubesActiveSolarWall tubesParallelePAS(
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Solar/Examples/T_SolarWall_Building.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Solar/Examples/T_SolarWall_Building.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Solar/Examples/T_SolarWall_Building.mo"	2022-03-10 09:57:39.996144378 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Solar/Examples/T_SolarWall_Building.mo"	2022-03-10 09:57:58.260146694 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Systems.Solar.Examples;
+within BuildSysPro.Systems.Solar.Examples;
 partial model T_SolarWall_Building
 extends Modelica.Icons.Example;
   Thermal.SolarWall.ParallelTubesActiveSolarWall tubesParallelePAS(
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Solar/PV/BaseClasses/Optics/PVTransmissionFactors.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Solar/PV/BaseClasses/Optics/PVTransmissionFactors.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Solar/PV/BaseClasses/Optics/PVTransmissionFactors.mo"	2022-03-10 09:57:39.996144378 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Solar/PV/BaseClasses/Optics/PVTransmissionFactors.mo"	2022-03-10 09:57:58.176146682 +0000
@@ -1,8 +1,8 @@
-within BuildSysPro.Systems.Solar.PV.BaseClasses.Optics;
+within BuildSysPro.Systems.Solar.PV.BaseClasses.Optics;
 model PVTransmissionFactors
   "Calculation of direct, diffuse and albedo transmission factors of incident rays on a photovoltaic module"
 
-  //Model parameters
+//Model parameters
   parameter Boolean use_incl_in=false "Prescribed or fixed PV panel tilt"
                                                                          annotation(Evaluate=true,HideResult=true,
   choices(choice=true "Prescribed", choice=false "Fixed", radioButtons=true));
@@ -26,7 +26,7 @@
       choice=3 "Very dirt panels",
       radioButtons=true));
 
-  //Intermediate variables
+//Intermediate variables
 protected
   Real cosIncidence "Cosine of incident rays angle relative to the normal";
   Modelica.Units.NonSI.Angle_deg angle_incidence "Angle of incidence in °";
@@ -52,8 +52,7 @@
         transformation(extent={{40,-30},{60,-10}}), iconTransformation(
           extent={{40,-40},{60,-20}})));
 
-
-  // Public connector for tilt and azimut
+// Public connector for tilt and azimut
   Modelica.Blocks.Interfaces.RealInput incl_in if use_incl_in
     "PV panel tilt relative to the horizontal (0° upward, 180° downward)"
            annotation (Placement(transformation(extent={{-110,-40},{-90,-20}}),
@@ -67,7 +66,7 @@
         rotation=-90,
         origin={0,50})));
 
-  //Internal connectors
+//Internal connectors
 protected
    Modelica.Blocks.Interfaces.RealInput incl_in_internal "Internal connector for optional configuration";
    Modelica.Blocks.Interfaces.RealInput azimut_in_internal "Internal connector for optional configuration";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Solar/PV/BaseClasses/Thermal/ThermalRecordsPV/RecordTechnoPV.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Solar/PV/BaseClasses/Thermal/ThermalRecordsPV/RecordTechnoPV.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Solar/PV/BaseClasses/Thermal/ThermalRecordsPV/RecordTechnoPV.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Solar/PV/BaseClasses/Thermal/ThermalRecordsPV/RecordTechnoPV.mo"	2022-03-10 09:57:58.124146676 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Systems.Solar.PV.BaseClasses.Thermal.ThermalRecordsPV;
+within BuildSysPro.Systems.Solar.PV.BaseClasses.Thermal.ThermalRecordsPV;
 record RecordTechnoPV
   "Record to keep for each PV technology a set of characteristics to be used in thermal models"
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Solar/PV/BasicModels/PVPanelSimplified.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Solar/PV/BasicModels/PVPanelSimplified.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Solar/PV/BasicModels/PVPanelSimplified.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Solar/PV/BasicModels/PVPanelSimplified.mo"	2022-03-10 09:57:58.096146673 +0000
@@ -1,8 +1,8 @@
-within BuildSysPro.Systems.Solar.PV.BasicModels;
+within BuildSysPro.Systems.Solar.PV.BasicModels;
 model PVPanelSimplified
   "Detailed physical model of photovoltaic panel (thermal capacity)"
 
-  // Parameters of the PV system
+// Parameters of the PV system
   parameter Modelica.Units.SI.Area surface=20 "PV panels surface"
     annotation (Dialog(tab="PV panels", group="PV system"));
   parameter Modelica.Units.NonSI.Angle_deg incl=30
@@ -12,7 +12,7 @@
     "Azimut of the surface (orientation relative to the South : S=0°, E=-90°, O=90°, N=180°)"
     annotation (Dialog(tab="PV panels", group="PV system"));
 
-  // PV panels characteristics
+// PV panels characteristics
   replaceable parameter BaseClasses.Thermal.ThermalRecordsPV.RecordTechnoPV
     technoPV "Choice of PV technology" annotation (
       choicesAllMatching=true, Dialog(
@@ -38,7 +38,7 @@
       choice=3 "Very dirt panels",
       radioButtons=true));
 
-  // Integration of PV panels to the frame
+// Integration of PV panels to the frame
   parameter Integer Integre=1
     "Integrated to the frame=1 ; Non integrated to the frame (in a field)=2"
     annotation (Dialog(
@@ -49,7 +49,7 @@
       choice=2 "Panels non integrated to the frame (in a field)",
       radioButtons=true));
 
-  // Thermal exchanges
+// Thermal exchanges
   parameter Integer convection_avant=2
     "A convective coefficient is imposed = 1; The convection model default is used = 2"
     annotation (Dialog(
@@ -82,14 +82,14 @@
       group="External conditions",
       enable=VitesseExt == 2));
 
-  // Roof characteristics
+// Roof characteristics
   parameter Real R_toit=8 "Roof thermal resistance (m²K/W)"
     annotation (Dialog(
       tab="Building",
       group="Building roof",
       enable=Integre == 1));
 
-  // Indoors characteristics
+// Indoors characteristics
   parameter Modelica.Units.SI.Temperature Tint=293.15
     "Indoor temperature of the building" annotation (Dialog(
       tab="Building",
@@ -100,7 +100,7 @@
   parameter Modelica.Blocks.Interfaces.BooleanInput OnOff_conv_avant=if convection_avant==1 then true else false;
   parameter Modelica.Blocks.Interfaces.BooleanInput OnOff_integre=if Integre==1 then true else false;
 
-  // Internal variables
+// Internal variables
 public
   Real flux_transmis;
   Real flux_thermique;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Solar/PV/BasicModels/package.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Solar/PV/BasicModels/package.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Solar/PV/BasicModels/package.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Solar/PV/BasicModels/package.mo"	2022-03-10 09:57:58.104146674 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Systems.Solar.PV;
+within BuildSysPro.Systems.Solar.PV;
 package BasicModels "Basic models"
 
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Solar/Thermal/SolarThermalCollector.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Solar/Thermal/SolarThermalCollector.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Solar/Thermal/SolarThermalCollector.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Solar/Thermal/SolarThermalCollector.mo"	2022-03-10 09:57:58.020146664 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Systems.Solar.Thermal;
+within BuildSysPro.Systems.Solar.Thermal;
 model SolarThermalCollector
 
   parameter Modelica.Units.NonSI.Angle_deg Azimut=0
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Solar/Thermal/SolarWall/ElementXAxis.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Solar/Thermal/SolarWall/ElementXAxis.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Solar/Thermal/SolarWall/ElementXAxis.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Solar/Thermal/SolarWall/ElementXAxis.mo"	2022-03-10 09:57:57.992146659 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Systems.Solar.Thermal.SolarWall;
+within BuildSysPro.Systems.Solar.Thermal.SolarWall;
 model ElementXAxis "\"static solar active wall slice\""
 
   parameter Modelica.Units.NonSI.Temperature_degC Tstart=25;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Solar/Thermal/SolarWall/ParallelTubesActiveSolarWall.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Solar/Thermal/SolarWall/ParallelTubesActiveSolarWall.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Solar/Thermal/SolarWall/ParallelTubesActiveSolarWall.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Solar/Thermal/SolarWall/ParallelTubesActiveSolarWall.mo"	2022-03-10 09:57:57.964146657 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Systems.Solar.Thermal.SolarWall;
+within BuildSysPro.Systems.Solar.Thermal.SolarWall;
 model ParallelTubesActiveSolarWall
   "a tube height in the solar active wall"
   parameter Modelica.Units.NonSI.Temperature_degC Tstart=25;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Solar/Thermal/SolarWall/package.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Solar/Thermal/SolarWall/package.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Solar/Thermal/SolarWall/package.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Solar/Thermal/SolarWall/package.mo"	2022-03-10 09:57:58.000146660 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Systems.Solar.Thermal;
+within BuildSysPro.Systems.Solar.Thermal;
 package SolarWall "Solar Wall"
 
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Storage/Electric/LiIonBattery.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Storage/Electric/LiIonBattery.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Storage/Electric/LiIonBattery.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Systems/Storage/Electric/LiIonBattery.mo"	2022-03-10 09:57:57.828146638 +0000
@@ -1,7 +1,5 @@
-within BuildSysPro.Systems.Storage.Electric;
+within BuildSysPro.Systems.Storage.Electric;
 model LiIonBattery "Lithium-Ion Battery"
-
-public
   parameter Real R_c=0.97 "Coulomb efficiency" annotation (choicesAllMatching=
         true, Dialog(
       compact=true,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/UsersGuide/Acknowledgement.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/UsersGuide/Acknowledgement.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/UsersGuide/Acknowledgement.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/UsersGuide/Acknowledgement.mo"	2022-03-10 09:57:57.788146634 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.UsersGuide;
+within BuildSysPro.UsersGuide;
 class Acknowledgement "Acknowledgement"
   extends Modelica.Icons.Information;
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/UsersGuide/Contact.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/UsersGuide/Contact.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/UsersGuide/Contact.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/UsersGuide/Contact.mo"	2022-03-10 09:57:57.776146632 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.UsersGuide;
+within BuildSysPro.UsersGuide;
 class Contact "Contact"
   extends Modelica.Icons.Contact;
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/UsersGuide/ModelTemplate.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/UsersGuide/ModelTemplate.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/UsersGuide/ModelTemplate.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/UsersGuide/ModelTemplate.mo"	2022-03-10 09:57:57.752146629 +0000
@@ -2,12 +2,11 @@
 partial model ModelTemplate
   "Model template with recommendations in terms of documentation and code-writing"
 
-//----------------------------------------------------------------------------------------------------------------------------------------------//
-//----- Declarative section - please comment each variable and parameter -----//
-// Do not write any equation in this section for variables. Otherwise, the variable will be considered as a parameter (constant).
-
-// Declaration of model parameters using associated units and range of variation if necessary
-parameter Real alpha( min=0, max=1)
+//----------------------------------------------------------------------------------------------------------------------------------------------//
+  //----- Declarative section - please comment each variable and parameter -----//
+  // Do not write any equation in this section for variables. Otherwise, the variable will be considered as a parameter (constant).
+  // Declaration of model parameters using associated units and range of variation if necessary
+  parameter Real alpha( min=0, max=1)
     "Alpha coefficient - range of variation between 0 and 1";
   parameter Modelica.Units.SI.Length L=2 "Length";
   parameter BuildSysPro.Utilities.Types.FileNameIn Data=
@@ -22,26 +21,25 @@
     "Choice between wall data records" annotation (Dialog(tab="Advanced", group=
          "Drop-down menu"), choicesAllMatching=true);
 
-// Declaration of variables
+// Declaration of variables
   Modelica.Units.SI.Length D "Distance";
 
-// Used models
+// Used models
 
-// Variables or parameters visible only in the model
+// Variables or parameters visible only in the model
 protected
   parameter Real beta=alpha*100 "Alpha in the form of a percentage...";
 Real gamma "Intermediate variable not visible by default in the results";
 
-//----------------------------------------------------------------------------------------------------------------------------------------------//
-//----- Section of algorithms & equations -----//
+//----------------------------------------------------------------------------------------------------------------------------------------------//
 
-//-- Algorithms - for classic or sequential calculations, not taking part of the equational system of the model to be resolved --//
-// Be careful, an algorithm should not be considered as an equation, contrary to equations there is no memory to save the results at the last time steps for algorithms
+//----- Section of algorithms & equations -----//
+  //-- Algorithms - for classic or sequential calculations, not taking part of the equational system of the model to be resolved --//
+  // Be careful, an algorithm should not be considered as an equation, contrary to equations there is no memory to save the results at the last time steps for algorithms
 algorithm
-  D:=beta*L; // For instance...
-
-//-- Equations and connections between models --//
-// The equations form the matrix system solved by the solver - Number of equation = Number of unknowns
+  D:=beta*L; // For instance...
+//-- Equations and connections between models --//
+// The equations form the matrix system solved by the solver - Number of equation = Number of unknowns
 equation
 gamma = if Bool then D else 0;
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Analysis/DHWDiscomfort.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Analysis/DHWDiscomfort.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Analysis/DHWDiscomfort.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Analysis/DHWDiscomfort.mo"	2022-03-10 09:57:57.708146623 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Utilities.Analysis;
+within BuildSysPro.Utilities.Analysis;
 model DHWDiscomfort
   "Measure of cold discomfort of DHW temperature relative to the setpoint"
   import BuildSysPro;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Analysis/DHWQueue.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Analysis/DHWQueue.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Analysis/DHWQueue.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Analysis/DHWQueue.mo"	2022-03-10 09:57:57.672146620 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Utilities.Analysis;
+within BuildSysPro.Utilities.Analysis;
 model DHWQueue "Domestic hot water drawing queue"
 
   parameter Modelica.Units.SI.Time MaxDelay=7200
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Analysis/DetectChange.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Analysis/DetectChange.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Analysis/DetectChange.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Analysis/DetectChange.mo"	2022-03-10 09:57:57.652146616 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Utilities.Analysis;
+within BuildSysPro.Utilities.Analysis;
 model DetectChange "Detect change in a signal value"
   parameter Real eps;
 public
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Analysis/Examples/ReadParametersFromFile.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Analysis/Examples/ReadParametersFromFile.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Analysis/Examples/ReadParametersFromFile.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Analysis/Examples/ReadParametersFromFile.mo"	2022-03-10 09:57:57.632146614 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Utilities.Analysis.Examples;
+within BuildSysPro.Utilities.Analysis.Examples;
 model ReadParametersFromFile
   "Demonstrate how to read Real and String parameters in a file"
   extends Modelica.Icons.Example;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Analysis/Examples/RestartDiscomfort.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Analysis/Examples/RestartDiscomfort.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Analysis/Examples/RestartDiscomfort.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Analysis/Examples/RestartDiscomfort.mo"	2022-03-10 09:57:57.620146612 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Utilities.Analysis.Examples;
+within BuildSysPro.Utilities.Analysis.Examples;
 model RestartDiscomfort
   "Calculation of discomfort due to restart within the model"
 extends Modelica.Icons.Example;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Analysis/Simulation2CSV.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Analysis/Simulation2CSV.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Analysis/Simulation2CSV.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Analysis/Simulation2CSV.mo"	2022-03-10 09:57:57.560146605 +0000
@@ -1,12 +1,12 @@
-within BuildSysPro.Utilities.Analysis;
+within BuildSysPro.Utilities.Analysis;
 function Simulation2CSV
   "Function for simulation and recording of variables in CSV format"
 
-// Import of needed package
+// Import of needed package
   import DataFiles;
 
-// Users parameters
-input BuildSysPro.Utilities.Records.SimpleStudySetup setup;
+// Users parameters
+  input BuildSysPro.Utilities.Records.SimpleStudySetup setup;
 
 protected
 Integer n;
@@ -15,37 +15,33 @@
 String[:] Headers=fill("",size(setup.variables,1));
 Boolean successfullSimulation;
 
-// Integration method assignment
-String methodIntegration= if setup.simulationOptions.integrationMethod==1 then "Lsodar"  elseif setup.simulationOptions.integrationMethod==3 then "Euler" elseif setup.simulationOptions.integrationMethod==4 then "Rkfix2" elseif setup.simulationOptions.integrationMethod==5 then "Rkfix3" elseif setup.simulationOptions.integrationMethod==6 then "Rkfix4" elseif setup.simulationOptions.integrationMethod==7 then "Radau IIa" elseif setup.simulationOptions.integrationMethod==8 then "Esdirk23a" elseif setup.simulationOptions.integrationMethod==9 then "Esdirk34a" elseif setup.simulationOptions.integrationMethod==10 then "Esdirk45a" elseif setup.simulationOptions.integrationMethod==11 then "Dopri45" elseif setup.simulationOptions.integrationMethod==12 then "Dopri7813" elseif setup.simulationOptions.integrationMethod==13 then "Sdirk34hw" elseif setup.simulationOptions.integrationMethod==14 then "Cerk23" elseif setup.simulationOptions.integrationMethod==15 then "Cerk34" elseif setup.simulationOptions.integrationMethod==16 then "Cerk45" elseif setup.simulationOptions.integrationMethod==17 then "Cvode" else "Dassl";
-algorithm
-// Workspace cleaning
-clearlog();
-
-// Simulation
-Modelica.Utilities.Streams.print("Start of the simulation");
+// Integration method assignment
+  String methodIntegration= if setup.simulationOptions.integrationMethod==1 then "Lsodar"  elseif setup.simulationOptions.integrationMethod==3 then "Euler" elseif setup.simulationOptions.integrationMethod==4 then "Rkfix2" elseif setup.simulationOptions.integrationMethod==5 then "Rkfix3" elseif setup.simulationOptions.integrationMethod==6 then "Rkfix4" elseif setup.simulationOptions.integrationMethod==7 then "Radau IIa" elseif setup.simulationOptions.integrationMethod==8 then "Esdirk23a" elseif setup.simulationOptions.integrationMethod==9 then "Esdirk34a" elseif setup.simulationOptions.integrationMethod==10 then "Esdirk45a" elseif setup.simulationOptions.integrationMethod==11 then "Dopri45" elseif setup.simulationOptions.integrationMethod==12 then "Dopri7813" elseif setup.simulationOptions.integrationMethod==13 then "Sdirk34hw" elseif setup.simulationOptions.integrationMethod==14 then "Cerk23" elseif setup.simulationOptions.integrationMethod==15 then "Cerk34" elseif setup.simulationOptions.integrationMethod==16 then "Cerk45" elseif setup.simulationOptions.integrationMethod==17 then "Cvode" else "Dassl";
+algorithm
+// Workspace cleaning
+  clearlog();
+// Simulation
+  Modelica.Utilities.Streams.print("Start of the simulation");
 experimentSetupOutput(events=setup.simulationOptions.saveEvents,equdistant=true);
 
 successfullSimulation:=simulateExtendedModel(problem=setup.modelName,startTime= setup.simulationOptions.startTime,stopTime=setup.simulationOptions.stopTime, method=methodIntegration, tolerance=setup.simulationOptions.integrationTolerance,fixedstepsize=setup.simulationOptions.fixedStepSize,outputInterval=setup.simulationOptions.outputInterval,initialNames=setup.parameters[:].name, initialValues=setup.parameters[:].Value,finalNames=setup.variables[:].name, resultFile=setup.modelName);
-Modelica.Utilities.Streams.print("End of the simulation");
-
-// Analysis
-Modelica.Utilities.Streams.print("Start of post treatment");
-  // Simulation data recovery
-n:=readTrajectorySize(setup.modelName+".mat");
+Modelica.Utilities.Streams.print("End of the simulation");
+// Analysis
+  Modelica.Utilities.Streams.print("Start of post treatment");
+// Simulation data recovery
+  n := readTrajectorySize(setup.modelName + ".mat");
 traj:=readTrajectory(setup.modelName+".mat",setup.variables[:].name,n);
-DATA:=transpose(traj);
-
-// Headers definition based on variables descriptions and in default variables name
-for i in 1:size(setup.variables,1) loop
-  if Modelica.Utilities.Strings.isEqual(setup.variables[i].description, "") then
-    Headers[i]:=setup.variables[i].name;
-    else
-    Headers[i]:=setup.variables[i].description;
-  end if;
-end for;
-
-// Results export per time step
-Modelica.Utilities.Streams.print("Results export in the file : "+setup.CSVfile);
+DATA:=transpose(traj);
+// Headers definition based on variables descriptions and in default variables name
+  for i in 1:size(setup.variables, 1) loop
+    if Modelica.Utilities.Strings.isEqual(setup.variables[i].description, "") then
+      Headers[i] := setup.variables[i].name;
+    else
+      Headers[i] := setup.variables[i].description;
+    end if;
+  end for;
+// Results export per time step
+  Modelica.Utilities.Streams.print("Results export in the file : " + setup.CSVfile);
 
 if Modelica.Utilities.Files.exist(setup.CSVfile) then
 Modelica.Utilities.Streams.print("Previous file "+setup.CSVfile+" has been deleted. A new file will be created.");
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Analysis/ThDiscomfort.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Analysis/ThDiscomfort.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Analysis/ThDiscomfort.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Analysis/ThDiscomfort.mo"	2022-03-10 09:57:57.496146597 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Utilities.Analysis;
+within BuildSysPro.Utilities.Analysis;
 model ThDiscomfort
   "Measure of warm and cold discomfort of indoor temperature relative to the setpoint"
   import BuildSysPro;
@@ -6,7 +6,7 @@
 parameter Real SeuilInconfort= 1 "Comfort range";
 parameter Boolean UsePresence=false
     "Consider occupancy (by default the building is considered always occupied)"                        annotation(Evaluate=true,HideResult=true,choices(choice=true "yes", choice=false "no", radioButtons=true));
-  // Public components
+  // Public components
   BuildSysPro.BaseClasses.HeatTransfer.Interfaces.HeatPort_a Tint
     annotation (Placement(transformation(extent={{-100,-10},{-80,10}})));
   Modelica.Blocks.Interfaces.RealInput TconsigneChauf
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Analysis/TimeIntegral.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Analysis/TimeIntegral.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Analysis/TimeIntegral.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Analysis/TimeIntegral.mo"	2022-03-10 09:57:57.416146586 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Utilities.Analysis;
+within BuildSysPro.Utilities.Analysis;
 model TimeIntegral
   "Calculation of the integral of a value on a given time step"
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/Air110.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/Air110.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/Air110.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/Air110.mo"	2022-03-10 09:57:57.372146581 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Utilities.Data.Solids;
+within BuildSysPro.Utilities.Data.Solids;
 record Air110 = BuildSysPro.Utilities.Records.GenericSolid (
     lambda= 0.61,
     rho=1.218,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/Air30.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/Air30.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/Air30.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/Air30.mo"	2022-03-10 09:57:57.368146580 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Utilities.Data.Solids;
+within BuildSysPro.Utilities.Data.Solids;
 record Air30 = BuildSysPro.Utilities.Records.GenericSolid (
     lambda=0.167,
     rho=1.218,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/DeepCarpet.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/DeepCarpet.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/DeepCarpet.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/DeepCarpet.mo"	2022-03-10 09:57:57.328146575 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Utilities.Data.Solids;
+within BuildSysPro.Utilities.Data.Solids;
 record DeepCarpet = BuildSysPro.Utilities.Records.GenericSolid (
     lambda=0.067,
     rho=200,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/ExpandedPolystyrene30.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/ExpandedPolystyrene30.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/ExpandedPolystyrene30.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/ExpandedPolystyrene30.mo"	2022-03-10 09:57:57.312146574 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Utilities.Data.Solids;
+within BuildSysPro.Utilities.Data.Solids;
 record ExpandedPolystyrene30 =
     BuildSysPro.Utilities.Records.GenericSolid (
     lambda=0.030,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/ExpandedPolystyrene32.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/ExpandedPolystyrene32.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/ExpandedPolystyrene32.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/ExpandedPolystyrene32.mo"	2022-03-10 09:57:57.304146572 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Utilities.Data.Solids;
+within BuildSysPro.Utilities.Data.Solids;
 record ExpandedPolystyrene32 =
     BuildSysPro.Utilities.Records.GenericSolid (
     lambda=0.032,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/ExpandedPolystyrene35.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/ExpandedPolystyrene35.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/ExpandedPolystyrene35.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/ExpandedPolystyrene35.mo"	2022-03-10 09:57:57.288146571 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Utilities.Data.Solids;
+within BuildSysPro.Utilities.Data.Solids;
 record ExpandedPolystyrene35 =
     BuildSysPro.Utilities.Records.GenericSolid (
     lambda=0.035,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/ExpandedPolystyrene37.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/ExpandedPolystyrene37.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/ExpandedPolystyrene37.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/ExpandedPolystyrene37.mo"	2022-03-10 09:57:57.268146569 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Utilities.Data.Solids;
+within BuildSysPro.Utilities.Data.Solids;
 record ExpandedPolystyrene37 =
     BuildSysPro.Utilities.Records.GenericSolid (
     lambda=0.037,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/ExpandedPolystyrene38.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/ExpandedPolystyrene38.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/ExpandedPolystyrene38.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/ExpandedPolystyrene38.mo"	2022-03-10 09:57:57.192146559 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Utilities.Data.Solids;
+within BuildSysPro.Utilities.Data.Solids;
 record ExpandedPolystyrene38 =
     BuildSysPro.Utilities.Records.GenericSolid (
     lambda=0.038,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/ExpandedPolystyrene40.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/ExpandedPolystyrene40.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/ExpandedPolystyrene40.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/ExpandedPolystyrene40.mo"	2022-03-10 09:57:57.184146557 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Utilities.Data.Solids;
+within BuildSysPro.Utilities.Data.Solids;
 record ExpandedPolystyrene40 =
     BuildSysPro.Utilities.Records.GenericSolid (
     lambda=0.040,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/ExpandedPolystyrene42.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/ExpandedPolystyrene42.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/ExpandedPolystyrene42.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/ExpandedPolystyrene42.mo"	2022-03-10 09:57:57.176146556 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Utilities.Data.Solids;
+within BuildSysPro.Utilities.Data.Solids;
 record ExpandedPolystyrene42 =
     BuildSysPro.Utilities.Records.GenericSolid (
     lambda=0.042,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/ExpandedPolystyrene45.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/ExpandedPolystyrene45.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/ExpandedPolystyrene45.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/ExpandedPolystyrene45.mo"	2022-03-10 09:57:57.164146554 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Utilities.Data.Solids;
+within BuildSysPro.Utilities.Data.Solids;
 record ExpandedPolystyrene45 =
     BuildSysPro.Utilities.Records.GenericSolid (
     lambda=0.045,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/ExtrudedPolystyrene25.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/ExtrudedPolystyrene25.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/ExtrudedPolystyrene25.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/ExtrudedPolystyrene25.mo"	2022-03-10 09:57:57.160146553 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Utilities.Data.Solids;
+within BuildSysPro.Utilities.Data.Solids;
 record ExtrudedPolystyrene25 =
     BuildSysPro.Utilities.Records.GenericSolid (
     lambda=0.025,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/ExtrudedPolystyrene28.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/ExtrudedPolystyrene28.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/ExtrudedPolystyrene28.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/ExtrudedPolystyrene28.mo"	2022-03-10 09:57:57.152146553 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Utilities.Data.Solids;
+within BuildSysPro.Utilities.Data.Solids;
 record ExtrudedPolystyrene28 =
     BuildSysPro.Utilities.Records.GenericSolid (
     lambda=0.028,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/ExtrudedPolystyrene30.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/ExtrudedPolystyrene30.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/ExtrudedPolystyrene30.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/ExtrudedPolystyrene30.mo"	2022-03-10 09:57:57.144146552 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Utilities.Data.Solids;
+within BuildSysPro.Utilities.Data.Solids;
 record ExtrudedPolystyrene30 =
     BuildSysPro.Utilities.Records.GenericSolid (
     lambda=0.030,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/FibreBoard120.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/FibreBoard120.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/FibreBoard120.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/FibreBoard120.mo"	2022-03-10 09:57:57.136146552 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Utilities.Data.Solids;
+within BuildSysPro.Utilities.Data.Solids;
 record FibreBoard120 = BuildSysPro.Utilities.Records.GenericSolid (
     lambda=0.12,
     rho=700,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/FibreBoard40.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/FibreBoard40.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/FibreBoard40.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/FibreBoard40.mo"	2022-03-10 09:57:57.128146549 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Utilities.Data.Solids;
+within BuildSysPro.Utilities.Data.Solids;
 record FibreBoard40 = BuildSysPro.Utilities.Records.GenericSolid (
     lambda=0.04,
     rho=200,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/FibreBoard44.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/FibreBoard44.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/FibreBoard44.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/FibreBoard44.mo"	2022-03-10 09:57:57.120146549 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Utilities.Data.Solids;
+within BuildSysPro.Utilities.Data.Solids;
 record FibreBoard44 = BuildSysPro.Utilities.Records.GenericSolid (
     lambda=0.044,
     rho=250,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/FloorTile.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/FloorTile.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/FloorTile.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/FloorTile.mo"	2022-03-10 09:57:57.108146547 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Utilities.Data.Solids;
+within BuildSysPro.Utilities.Data.Solids;
 record FloorTile = BuildSysPro.Utilities.Records.GenericSolid (
     lambda=1.300,
     rho=2300,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/Glass.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/Glass.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/Glass.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/Glass.mo"	2022-03-10 09:57:57.092146546 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Utilities.Data.Solids;
+within BuildSysPro.Utilities.Data.Solids;
 record Glass =  BuildSysPro.Utilities.Records.GenericSolid (
     lambda=1,
     rho=2500,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/HardLimestone.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/HardLimestone.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/HardLimestone.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/HardLimestone.mo"	2022-03-10 09:57:57.064146541 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Utilities.Data.Solids;
+within BuildSysPro.Utilities.Data.Solids;
 record HardLimestone = BuildSysPro.Utilities.Records.GenericSolid (
     lambda=1.7,
     rho=2200,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/PVC.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/PVC.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/PVC.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/PVC.mo"	2022-03-10 09:57:56.804146509 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Utilities.Data.Solids;
+within BuildSysPro.Utilities.Data.Solids;
 record PVC = BuildSysPro.Utilities.Records.GenericSolid (
     lambda=0.17,
     rho=1390,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/PlasterBoard.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/PlasterBoard.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/PlasterBoard.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/PlasterBoard.mo"	2022-03-10 09:57:56.780146505 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Utilities.Data.Solids;
+within BuildSysPro.Utilities.Data.Solids;
 record PlasterBoard = BuildSysPro.Utilities.Records.GenericSolid (
     lambda=0.25,
     rho=900,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/PlasticTile.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/PlasticTile.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/PlasticTile.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/PlasticTile.mo"	2022-03-10 09:57:56.756146504 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Utilities.Data.Solids;
+within BuildSysPro.Utilities.Data.Solids;
 record PlasticTile = BuildSysPro.Utilities.Records.GenericSolid (
     lambda=0.2,
     rho=1000,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/Polyurethane25.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/Polyurethane25.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/Polyurethane25.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/Polyurethane25.mo"	2022-03-10 09:57:56.672146492 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Utilities.Data.Solids;
+within BuildSysPro.Utilities.Data.Solids;
 record Polyurethane25 = BuildSysPro.Utilities.Records.GenericSolid (
     lambda=0.025,
     rho=40,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/Polyurethane30.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/Polyurethane30.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/Polyurethane30.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/Polyurethane30.mo"	2022-03-10 09:57:56.664146491 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Utilities.Data.Solids;
+within BuildSysPro.Utilities.Data.Solids;
 record Polyurethane30 = BuildSysPro.Utilities.Records.GenericSolid (
     lambda=0.030,
     rho=40,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/Polyurethane35.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/Polyurethane35.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/Polyurethane35.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/Polyurethane35.mo"	2022-03-10 09:57:56.656146491 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Utilities.Data.Solids;
+within BuildSysPro.Utilities.Data.Solids;
 record Polyurethane35 =
       BuildSysPro.Utilities.Records.GenericSolid (
     lambda=0.035,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/Polyurethane37.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/Polyurethane37.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/Polyurethane37.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/Polyurethane37.mo"	2022-03-10 09:57:56.648146489 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Utilities.Data.Solids;
+within BuildSysPro.Utilities.Data.Solids;
 record Polyurethane37 = BuildSysPro.Utilities.Records.GenericSolid (
     lambda=0.037,
     rho=40,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/RockWool.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/RockWool.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/RockWool.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/RockWool.mo"	2022-03-10 09:57:56.608146484 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Utilities.Data.Solids;
+within BuildSysPro.Utilities.Data.Solids;
 record RockWool = BuildSysPro.Utilities.Records.GenericSolid (
     lambda=0.032,
     rho=40,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/SoilClaySilt.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/SoilClaySilt.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/SoilClaySilt.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/SoilClaySilt.mo"	2022-03-10 09:57:56.576146480 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Utilities.Data.Solids;
+within BuildSysPro.Utilities.Data.Solids;
 record SoilClaySilt = BuildSysPro.Utilities.Records.GenericSolid (
     lambda=1.5,
     rho=1500,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/SoilSandGravel.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/SoilSandGravel.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/SoilSandGravel.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/SoilSandGravel.mo"	2022-03-10 09:57:56.568146480 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Utilities.Data.Solids;
+within BuildSysPro.Utilities.Data.Solids;
 record SoilSandGravel = BuildSysPro.Utilities.Records.GenericSolid (
     lambda=2.0,
     rho=2000,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/ThinCarpet.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/ThinCarpet.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/ThinCarpet.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/ThinCarpet.mo"	2022-03-10 09:57:56.524146474 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Utilities.Data.Solids;
+within BuildSysPro.Utilities.Data.Solids;
 record ThinCarpet = BuildSysPro.Utilities.Records.GenericSolid (
     lambda=0.094,
     rho=200,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/TimberMediumDensity.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/TimberMediumDensity.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/TimberMediumDensity.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/TimberMediumDensity.mo"	2022-03-10 09:57:56.508146471 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Utilities.Data.Solids;
+within BuildSysPro.Utilities.Data.Solids;
 record TimberMediumDensity = BuildSysPro.Utilities.Records.GenericSolid (
     lambda=0.13,
     rho=500,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/Vermiculite.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/Vermiculite.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/Vermiculite.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/Vermiculite.mo"	2022-03-10 09:57:56.500146470 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Utilities.Data.Solids;
+within BuildSysPro.Utilities.Data.Solids;
 record Vermiculite = BuildSysPro.Utilities.Records.GenericSolid (
     lambda=0.2,
     rho=325,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/WoodParquet.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/WoodParquet.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/WoodParquet.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/Solids/WoodParquet.mo"	2022-03-10 09:57:56.388146456 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Utilities.Data.Solids;
+within BuildSysPro.Utilities.Data.Solids;
 record WoodParquet = BuildSysPro.Utilities.Records.GenericSolid (
     lambda=0.120,
     rho=500,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2005/Ceiling_STD.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2005/Ceiling_STD.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2005/Ceiling_STD.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2005/Ceiling_STD.mo"	2022-03-10 09:57:56.304146445 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Utilities.Data.WallData.RT2005;
+within BuildSysPro.Utilities.Data.WallData.RT2005;
 record Ceiling_STD =
   BuildSysPro.Utilities.Icons.Ceiling (
     n=2,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2005/Ceiling_STD_UnheatedRoom.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2005/Ceiling_STD_UnheatedRoom.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2005/Ceiling_STD_UnheatedRoom.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2005/Ceiling_STD_UnheatedRoom.mo"	2022-03-10 09:57:56.296146445 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Utilities.Data.WallData.RT2005;
+within BuildSysPro.Utilities.Data.WallData.RT2005;
 record Ceiling_STD_UnheatedRoom =
   BuildSysPro.Utilities.Icons.Ceiling (
     n=1,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2005/ExtWall_STD.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2005/ExtWall_STD.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2005/ExtWall_STD.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2005/ExtWall_STD.mo"	2022-03-10 09:57:56.288146443 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Utilities.Data.WallData.RT2005;
+within BuildSysPro.Utilities.Data.WallData.RT2005;
 record ExtWall_STD =
   BuildSysPro.Utilities.Icons.ExtWall (
     n=3,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2005/ExtWall_STD_UnheatedRoom.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2005/ExtWall_STD_UnheatedRoom.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2005/ExtWall_STD_UnheatedRoom.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2005/ExtWall_STD_UnheatedRoom.mo"	2022-03-10 09:57:56.280146442 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Utilities.Data.WallData.RT2005;
+within BuildSysPro.Utilities.Data.WallData.RT2005;
 record ExtWall_STD_UnheatedRoom =
   BuildSysPro.Utilities.Icons.ExtWall (
     n=1,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2005/Floor_STD.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2005/Floor_STD.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2005/Floor_STD.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2005/Floor_STD.mo"	2022-03-10 09:57:56.276146441 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Utilities.Data.WallData.RT2005;
+within BuildSysPro.Utilities.Data.WallData.RT2005;
 record Floor_STD =
   BuildSysPro.Utilities.Icons.Floor (
     n=3,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2005/Floor_STD_UnheatedRoom.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2005/Floor_STD_UnheatedRoom.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2005/Floor_STD_UnheatedRoom.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2005/Floor_STD_UnheatedRoom.mo"	2022-03-10 09:57:56.268146441 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Utilities.Data.WallData.RT2005;
+within BuildSysPro.Utilities.Data.WallData.RT2005;
 record Floor_STD_UnheatedRoom =
   BuildSysPro.Utilities.Icons.Floor (
     n=1,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2005/PartitionWall.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2005/PartitionWall.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2005/PartitionWall.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2005/PartitionWall.mo"	2022-03-10 09:57:56.256146439 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Utilities.Data.WallData.RT2005;
+within BuildSysPro.Utilities.Data.WallData.RT2005;
 record PartitionWall =
   BuildSysPro.Utilities.Icons.VerticalInternalWall (
     n=1,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2005/PartitionWall_STD.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2005/PartitionWall_STD.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2005/PartitionWall_STD.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2005/PartitionWall_STD.mo"	2022-03-10 09:57:56.248146438 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Utilities.Data.WallData.RT2005;
+within BuildSysPro.Utilities.Data.WallData.RT2005;
 record PartitionWall_STD =
   BuildSysPro.Utilities.Icons.VerticalInternalWall (
     n=3,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2012/Ceiling_MTD.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2012/Ceiling_MTD.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2012/Ceiling_MTD.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2012/Ceiling_MTD.mo"	2022-03-10 09:57:56.228146436 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Utilities.Data.WallData.RT2012;
+within BuildSysPro.Utilities.Data.WallData.RT2012;
 record Ceiling_MTD =
   BuildSysPro.Utilities.Icons.Ceiling (
     n=2,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2012/Ceiling_MTD_UnheatedRoom.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2012/Ceiling_MTD_UnheatedRoom.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2012/Ceiling_MTD_UnheatedRoom.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2012/Ceiling_MTD_UnheatedRoom.mo"	2022-03-10 09:57:56.216146434 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Utilities.Data.WallData.RT2012;
+within BuildSysPro.Utilities.Data.WallData.RT2012;
 record Ceiling_MTD_UnheatedRoom =
   BuildSysPro.Utilities.Icons.Ceiling (
     n=1,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2012/Ceiling_STD.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2012/Ceiling_STD.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2012/Ceiling_STD.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2012/Ceiling_STD.mo"	2022-03-10 09:57:56.208146434 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Utilities.Data.WallData.RT2012;
+within BuildSysPro.Utilities.Data.WallData.RT2012;
 record Ceiling_STD =
   BuildSysPro.Utilities.Icons.Ceiling (
     n=2,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2012/Ceiling_STD_UnheatedRoom.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2012/Ceiling_STD_UnheatedRoom.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2012/Ceiling_STD_UnheatedRoom.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2012/Ceiling_STD_UnheatedRoom.mo"	2022-03-10 09:57:56.148146425 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Utilities.Data.WallData.RT2012;
+within BuildSysPro.Utilities.Data.WallData.RT2012;
 record Ceiling_STD_UnheatedRoom =
   BuildSysPro.Utilities.Icons.Ceiling (
     n=1,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2012/ExtWall_MTD.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2012/ExtWall_MTD.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2012/ExtWall_MTD.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2012/ExtWall_MTD.mo"	2022-03-10 09:57:56.140146425 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Utilities.Data.WallData.RT2012;
+within BuildSysPro.Utilities.Data.WallData.RT2012;
 record ExtWall_MTD =
   BuildSysPro.Utilities.Icons.ExtWall (
     n=3,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2012/ExtWall_MTD_UnheatedRoom.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2012/ExtWall_MTD_UnheatedRoom.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2012/ExtWall_MTD_UnheatedRoom.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2012/ExtWall_MTD_UnheatedRoom.mo"	2022-03-10 09:57:56.136146424 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Utilities.Data.WallData.RT2012;
+within BuildSysPro.Utilities.Data.WallData.RT2012;
 record ExtWall_MTD_UnheatedRoom =
   BuildSysPro.Utilities.Icons.ExtWall (
     n=1,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2012/ExtWall_STD.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2012/ExtWall_STD.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2012/ExtWall_STD.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2012/ExtWall_STD.mo"	2022-03-10 09:57:56.128146423 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Utilities.Data.WallData.RT2012;
+within BuildSysPro.Utilities.Data.WallData.RT2012;
 record ExtWall_STD =
   BuildSysPro.Utilities.Icons.ExtWall (
     n=3,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2012/ExtWall_STD_UnheatedRoom.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2012/ExtWall_STD_UnheatedRoom.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2012/ExtWall_STD_UnheatedRoom.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2012/ExtWall_STD_UnheatedRoom.mo"	2022-03-10 09:57:56.116146421 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Utilities.Data.WallData.RT2012;
+within BuildSysPro.Utilities.Data.WallData.RT2012;
 record ExtWall_STD_UnheatedRoom =
   BuildSysPro.Utilities.Icons.ExtWall (
     n=1,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2012/Floor_MTD.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2012/Floor_MTD.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2012/Floor_MTD.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2012/Floor_MTD.mo"	2022-03-10 09:57:56.112146422 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Utilities.Data.WallData.RT2012;
+within BuildSysPro.Utilities.Data.WallData.RT2012;
 record Floor_MTD =
   BuildSysPro.Utilities.Icons.Floor (
     n=4,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2012/Floor_MTD_UnheatedRoom.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2012/Floor_MTD_UnheatedRoom.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2012/Floor_MTD_UnheatedRoom.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2012/Floor_MTD_UnheatedRoom.mo"	2022-03-10 09:57:56.104146420 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Utilities.Data.WallData.RT2012;
+within BuildSysPro.Utilities.Data.WallData.RT2012;
 record Floor_MTD_UnheatedRoom =
   BuildSysPro.Utilities.Icons.Floor (
     n=1,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2012/Floor_STD.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2012/Floor_STD.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2012/Floor_STD.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2012/Floor_STD.mo"	2022-03-10 09:57:56.100146420 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Utilities.Data.WallData.RT2012;
+within BuildSysPro.Utilities.Data.WallData.RT2012;
 record Floor_STD =
   BuildSysPro.Utilities.Icons.Floor (
     n=4,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2012/Floor_STD_UnheatedRoom.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2012/Floor_STD_UnheatedRoom.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2012/Floor_STD_UnheatedRoom.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2012/Floor_STD_UnheatedRoom.mo"	2022-03-10 09:57:56.092146418 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Utilities.Data.WallData.RT2012;
+within BuildSysPro.Utilities.Data.WallData.RT2012;
 record Floor_STD_UnheatedRoom =
   BuildSysPro.Utilities.Icons.Floor (
     n=1,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2012/PartitionWall.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2012/PartitionWall.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2012/PartitionWall.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2012/PartitionWall.mo"	2022-03-10 09:57:56.076146417 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Utilities.Data.WallData.RT2012;
+within BuildSysPro.Utilities.Data.WallData.RT2012;
 record PartitionWall =
   BuildSysPro.Utilities.Icons.VerticalInternalWall (
     n=1,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2012/PartitionWall_MTD.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2012/PartitionWall_MTD.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2012/PartitionWall_MTD.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2012/PartitionWall_MTD.mo"	2022-03-10 09:57:56.068146416 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Utilities.Data.WallData.RT2012;
+within BuildSysPro.Utilities.Data.WallData.RT2012;
 record PartitionWall_MTD =
   BuildSysPro.Utilities.Icons.VerticalInternalWall (
     n=3,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2012/PartitionWall_STD.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2012/PartitionWall_STD.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2012/PartitionWall_STD.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/RT2012/PartitionWall_STD.mo"	2022-03-10 09:57:56.060146414 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Utilities.Data.WallData.RT2012;
+within BuildSysPro.Utilities.Data.WallData.RT2012;
 record PartitionWall_STD =
   BuildSysPro.Utilities.Icons.VerticalInternalWall (
     n=3,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/package.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/package.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/package.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Data/WallData/package.mo"	2022-03-10 09:57:56.328146449 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Utilities.Data;
+within BuildSysPro.Utilities.Data;
 package WallData "Library of wall data"
 
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Math/Addn.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Math/Addn.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Math/Addn.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Math/Addn.mo"	2022-03-10 09:57:55.896146393 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Utilities.Math;
+within BuildSysPro.Utilities.Math;
 block Addn "Gives the n dimension sum of two n dimension inputs"
       extends Modelica.Blocks.Icons.Block;
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Math/FindMultiExtremum.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Math/FindMultiExtremum.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Math/FindMultiExtremum.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Math/FindMultiExtremum.mo"	2022-03-10 09:57:55.880146392 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Utilities.Math;
+within BuildSysPro.Utilities.Math;
 function FindMultiExtremum
   "Extract the n smallest values (ascending=true) or greatest values (ascending=false) of a vector X"
   input Integer n "Number of extreme values to extract to the vector X";
@@ -6,8 +6,8 @@
   input Boolean ascending=false;
   output Real Xm[n] "Ordered extreme values of the vector X";
   output Integer Indm[n] "Corresponding indexes in the vector X";
-//  output Integer z[size(X,1)]=fill(0,size(X,1));
 
+//  output Integer z[size(X,1)]=fill(0,size(X,1));
 protected
   constant Real eps=Modelica.Constants.eps;
   parameter Integer k=size(X,1);
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Math/IntegerExpression.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Math/IntegerExpression.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Math/IntegerExpression.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Math/IntegerExpression.mo"	2022-03-10 09:57:55.864146389 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Utilities.Math;
+within BuildSysPro.Utilities.Math;
 block IntegerExpression
   "Set output signal to a time varying Integer expression"
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Math/LeastSquares.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Math/LeastSquares.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Math/LeastSquares.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Math/LeastSquares.mo"	2022-03-10 09:57:55.852146388 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Utilities.Math;
+within BuildSysPro.Utilities.Math;
 function LeastSquares "Least squares problem"
 
   input Integer N=6 "Number of points";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Math/RealExpression.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Math/RealExpression.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Math/RealExpression.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Math/RealExpression.mo"	2022-03-10 09:57:55.844146387 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Utilities.Math;
+within BuildSysPro.Utilities.Math;
 block RealExpression "Set output signal to a time varying Real expression"
 
   Modelica.Blocks.Interfaces.RealOutput y=0.0 "Value of Real output"
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Math/RoundingToNDecimalPlaces.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Math/RoundingToNDecimalPlaces.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Math/RoundingToNDecimalPlaces.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Math/RoundingToNDecimalPlaces.mo"	2022-03-10 09:57:55.832146385 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Utilities.Math;
+within BuildSysPro.Utilities.Math;
 model RoundingToNDecimalPlaces
 
 parameter Integer n=1 "Rounded to n decimal places";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Math/f_Quadratic.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Math/f_Quadratic.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Math/f_Quadratic.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Math/f_Quadratic.mo"	2022-03-10 09:57:55.808146382 +0000
@@ -10,11 +10,11 @@
   parameter Real v=u^n "Value of q at u";
   parameter Real w=n*v/u "Value of q' at u";
 
-  // Parameters of the square law
+// Parameters of the square law
   parameter Real alpha=(1/w-u/v)/v "Coefficient alpha";
   parameter Real beta=2*u/v-1/w "Coefficient beta";
 
-  // Auxiliary parameters
+// Auxiliary parameters
   parameter Real a=1/alpha "Coefficient alpha";
   parameter Real b=beta/(2*alpha) "Coefficient beta";
   parameter Real y=abs(x);
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Math/regStep.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Math/regStep.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Math/regStep.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Math/regStep.mo"	2022-03-10 09:57:55.784146380 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Utilities.Math;
+within BuildSysPro.Utilities.Math;
 function regStep
   "Approximation of a general step, such that the approximation is continuous and differentiable"
   extends Modelica.Icons.Function;
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Records/GenericWall.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Records/GenericWall.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Records/GenericWall.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Records/GenericWall.mo"	2022-03-10 09:57:55.748146375 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Utilities.Records;
+within BuildSysPro.Utilities.Records;
 record GenericWall "Walls generic structure - from outdoor to indoor"
 
 parameter Integer n=3 "Number of layers";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Records/MeteoData.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Records/MeteoData.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Records/MeteoData.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Records/MeteoData.mo"	2022-03-10 09:57:55.740146375 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Utilities.Records;
+within BuildSysPro.Utilities.Records;
 record MeteoData "Record to facilitate weather data entry"
 
   parameter Modelica.Units.NonSI.Time_hour h0=-1
@@ -7,8 +7,8 @@
 parameter Boolean Est = false
     "Est=true : longitude given in °East, otherwise in °West / Meteonorm is in °East";
 
-// Configuration of the model : choice of input flux
-parameter Integer CoupleFlux=2 "Solar flux 1 and 2 given in the G input vector"
+// Configuration of the model : choice of input flux
+  parameter Integer CoupleFlux=2 "Solar flux 1 and 2 given in the G input vector"
                                                      annotation(choices(
 choice=1 "GLOH DIFH", choice=2 "DIRN DIFH",choice=3 "DIFH DIRH", choice=4
         "GLOH DIRH", choice=5 "GLOH DIRN",radioButtons=true));
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Records/Parameters.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Records/Parameters.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Records/Parameters.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Records/Parameters.mo"	2022-03-10 09:57:55.732146373 +0000
@@ -5,8 +5,8 @@
 parameter Real min=-1e100;
 parameter Real max=1e100;
 parameter String description="";
-// annotation for importing values from dsin//
-annotation (Icon(graphics={              Ellipse(
+  // annotation for importing values from dsin//
+  annotation (Icon(graphics={              Ellipse(
           extent={{-80,80},{80,-80}},
           lineColor={0,0,255},
           pattern=LinePattern.None,
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Records/SimpleStudySetup.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Records/SimpleStudySetup.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Records/SimpleStudySetup.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Records/SimpleStudySetup.mo"	2022-03-10 09:57:55.720146371 +0000
@@ -16,9 +16,9 @@
           min=initialValue.minimum,
           max=initialValue.maximum))));
 BuildSysPro.Utilities.Records.Variables variables[:]=fill(Variables(), 0);
-//Preferences preferences "Simulation and optimization preferences"
- //   annotation (Dialog(label="Preferences"));
-BuildSysPro.Utilities.Records.SimulationOptions simulationOptions
+ //Preferences preferences "Simulation and optimization preferences"
+  //   annotation (Dialog(label="Preferences"));
+  BuildSysPro.Utilities.Records.SimulationOptions simulationOptions
     "Simulation options" annotation (Dialog(label="Simulation options"));
   annotation (Documentation(info="
 
Hypothesis and equations

diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Records/SimulationOptions.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Records/SimulationOptions.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Records/SimulationOptions.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Records/SimulationOptions.mo"	2022-03-10 09:57:55.640146362 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Utilities.Records;
+within BuildSysPro.Utilities.Records;
 record SimulationOptions "Record for the configuration of simulation options"
 
   Real startTime=0 "Start time of simulation" annotation (Dialog(
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Time/ApparentSolarTime.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Time/ApparentSolarTime.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Time/ApparentSolarTime.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Time/ApparentSolarTime.mo"	2022-03-10 09:57:55.616146358 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Utilities.Time;
+within BuildSysPro.Utilities.Time;
 function ApparentSolarTime "Real Solar Time (RST)"
   input Real t0=0 "Time in seconds at t=0";
   input Modelica.Units.SI.Time t "Universal Time in seconds";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Time/ApparentSolarTimeToUniversalTime.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Time/ApparentSolarTimeToUniversalTime.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Time/ApparentSolarTimeToUniversalTime.mo"	2022-03-10 09:57:40.000144379 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Time/ApparentSolarTimeToUniversalTime.mo"	2022-03-10 09:57:55.604146357 +0000
@@ -1,9 +1,9 @@
-within BuildSysPro.Utilities.Time;
+within BuildSysPro.Utilities.Time;
 function ApparentSolarTimeToUniversalTime
   "Calculation of Universal Time (UT in hours) according to solar time RST"
 
 input Real t0=0 "Time in seconds at t=0";
-// input Real d0 "Number of the day in the month at t=0"; // deleted
+  // input Real d0 "Number of the day in the month at t=0"; // deleted
   input Modelica.Units.SI.Time t "Elapsed time since t=0 [s]";
 
   input Modelica.Units.NonSI.Angle_deg long "Longitude, in degrees [°]";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Time/Date.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Time/Date.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Time/Date.mo"	2022-03-10 09:57:40.004144381 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Time/Date.mo"	2022-03-10 09:57:55.596146356 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Utilities.Time;
+within BuildSysPro.Utilities.Time;
 function Date
   input Real t0=0 "Elapsed time in second at t=0";
   input Real t "Elapsed time since t=0 [s]";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Time/DayMonth.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Time/DayMonth.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Time/DayMonth.mo"	2022-03-10 09:57:40.004144381 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Time/DayMonth.mo"	2022-03-10 09:57:55.592146355 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Utilities.Time;
+within BuildSysPro.Utilities.Time;
 function DayMonth "Day of the month at time t"
   input Real t0=0 "Time in second at t=0";
   input Real t "Elapsed time since t=0 [s]";
@@ -6,7 +6,8 @@
 
 protected
   parameter Integer fMois[13]={0,31,28,31,30,31,30,31,31,30,31,30,31};
-  Integer cMois[13];//={sum({fMois[i] for i in 1:j}) for j in 1:13};
+  Integer cMois[13];
+  //={sum({fMois[i] for i in 1:j}) for j in 1:13};
   Integer tJour=integer(mod((t+t0)/86400,365))+1;
 algorithm
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Time/DayWeek.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Time/DayWeek.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Time/DayWeek.mo"	2022-03-10 09:57:40.004144381 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Time/DayWeek.mo"	2022-03-10 09:57:55.584146354 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Utilities.Time;
+within BuildSysPro.Utilities.Time;
 function DayWeek "Day of the week at time t"
   input Real t0=0 "Time in seconds at t=0";
   input Real t "Elapsed time since t=0 [s]";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Time/Hour.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Time/Hour.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Time/Hour.mo"	2022-03-10 09:57:40.004144381 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Time/Hour.mo"	2022-03-10 09:57:55.576146354 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Utilities.Time;
+within BuildSysPro.Utilities.Time;
 function Hour "Gives the time of the day at time t"
   input Real t0=0 "Time in seconds at t=0";
   input Real t "Elapsed time since t=0 [s]";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Time/HourApparentSolarTime.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Time/HourApparentSolarTime.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Time/HourApparentSolarTime.mo"	2022-03-10 09:57:40.004144381 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Time/HourApparentSolarTime.mo"	2022-03-10 09:57:55.568146352 +0000
@@ -1,9 +1,9 @@
-within BuildSysPro.Utilities.Time;
+within BuildSysPro.Utilities.Time;
 function HourApparentSolarTime "True Solar Time between 0 and 24"
 
   input Modelica.Units.NonSI.Time_hour h0 "Universal Time (in hours) at t=0";
   input Real t0=0 "Time in second at t=0";
-  //Real d0 "Number of the day at t=0"; // replaced by t0
+  //Real d0 "Number of the day at t=0"; // replaced by t0
   input Modelica.Units.SI.Time t "Elapsed time since t=0 [s]";
 
   input Modelica.Units.NonSI.Angle_deg long "Longitude, in degrees [°]";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Time/HourWeek.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Time/HourWeek.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Time/HourWeek.mo"	2022-03-10 09:57:40.004144381 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Time/HourWeek.mo"	2022-03-10 09:57:55.556146350 +0000
@@ -1,11 +1,11 @@
-within BuildSysPro.Utilities.Time;
+within BuildSysPro.Utilities.Time;
 function HourWeek "Time of the week at time t"
   input Real t0=0 "Time in seconds at t=0";
   input Real t "Elapsed time since t=0 [s]";
   output Real HS "Time of the week at time t";
 
 algorithm
-  HS:=mod((t + t0)/3600, 168); // 168=7*24
+  HS:=mod((t + t0)/3600, 168); // 168=7*24
 
 annotation (
 Documentation(info="
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Time/MonthYear.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Time/MonthYear.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Time/MonthYear.mo"	2022-03-10 09:57:40.004144381 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Time/MonthYear.mo"	2022-03-10 09:57:55.548146349 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Utilities.Time;
+within BuildSysPro.Utilities.Time;
 function MonthYear
   "Month of the year at time t (year supposed to be not bisextile)"
   input Real t0=0 "Time in seconds at t=0";
@@ -7,7 +7,8 @@
 protected
   parameter Real d=1+mod(integer((t+t0)/86400),365);
   parameter Real fMois[13]={0,31,28,31,30,31,30,31,31,30,31,30,31};
-  Real cMois[13];//={sum({fMois[i] for i in 1:j})  for j in 1:13};
+  Real cMois[13];
+  //={sum({fMois[i] for i in 1:j})  for j in 1:13};
 algorithm
   cMois[1]:=0;
   for i in 2:13 loop
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Time/TimeElapsedFromJanuary1st.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Time/TimeElapsedFromJanuary1st.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Time/TimeElapsedFromJanuary1st.mo"	2022-03-10 09:57:40.004144381 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Time/TimeElapsedFromJanuary1st.mo"	2022-03-10 09:57:55.536146348 +0000
@@ -5,7 +5,7 @@
     "Date at t=0s (start of the simulation) in the form de dd/mm_hh:mm:ss";
   output Modelica.Units.SI.Time Instant0
     "Elapsed time in seconds since 01/01_00:00:00";
-  // t[5] : day, month, hour, minute, second (2 digits over 3)
+  // t[5] : day, month, hour, minute, second (2 digits over 3)
 protected
   Integer t[5]={Modelica.Utilities.Strings.scanInteger(
      Modelica.Utilities.Strings.substring(date,3*i-2,3*i-1)) for i in 1:5};
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Time/TimeInDayHourMinute.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Time/TimeInDayHourMinute.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Time/TimeInDayHourMinute.mo"	2022-03-10 09:57:40.004144381 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Time/TimeInDayHourMinute.mo"	2022-03-10 09:57:55.532146348 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Utilities.Time;
+within BuildSysPro.Utilities.Time;
 model TimeInDayHourMinute
 
   Modelica.Blocks.Sources.ContinuousClock clock
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Time/UniversalTime.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Time/UniversalTime.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Time/UniversalTime.mo"	2022-03-10 09:57:40.004144381 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Time/UniversalTime.mo"	2022-03-10 09:57:55.520146347 +0000
@@ -1,4 +1,4 @@
-within BuildSysPro.Utilities.Time;
+within BuildSysPro.Utilities.Time;
 function UniversalTime "Time in Universal Time"
   input Real t0=0 "Timpe in seconds at t=0";
   input Real t "Elapsed time since  t=0 [s]";
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Time/WeekYear.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Time/WeekYear.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Time/WeekYear.mo"	2022-03-10 09:57:40.004144381 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/Utilities/Time/WeekYear.mo"	2022-03-10 09:57:55.516146345 +0000
@@ -1,11 +1,11 @@
-within BuildSysPro.Utilities.Time;
+within BuildSysPro.Utilities.Time;
 function WeekYear
   "Week of the year at time t (year supposed to be not bisextile)"
   input Real t0=0 "Time in second at t=0";
   input Real t "Elapsed time since t=0 [s]";
   output Integer SA "Week of the year";
 algorithm
-  SA:=integer((t + t0)/604800) + 1; // "604800=7*24*3600"
+  SA:=integer((t + t0)/604800) + 1; // "604800=7*24*3600"
 
 annotation (
 Documentation(info="
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/openmodelica.metadata.json" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/openmodelica.metadata.json"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/openmodelica.metadata.json"	2022-03-10 09:57:40.004144381 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/openmodelica.metadata.json"	2022-03-10 09:58:35.384151396 +0000
@@ -1 +1 @@
-{"convertFromVersion":["3.3.0"], "path":"BuildSysPro", "sha":"3deab2b5edc84ba657d9a536de47160bc6fec8e2", "support":"support", "uses":{"Modelica":"3.2.3"}, "version":"3.5.0", "zipfile":"https://github.com/EDF-TREE/BuildSysPro/archive/3deab2b5edc84ba657d9a536de47160bc6fec8e2.zip"}
+{"convertFromVersion": ["3.3.0"], "path": "BuildSysPro", "sha": "3deab2b5edc84ba657d9a536de47160bc6fec8e2", "support": "support", "uses": {"Modelica": "4.0.0"}, "version": "3.5.0", "zipfile": "https://github.com/EDF-TREE/BuildSysPro/archive/3deab2b5edc84ba657d9a536de47160bc6fec8e2.zip", "extraInfo": "Conversion script /home/hudson/saved_omc/libraries/.openmodelica/libraries/Modelica 4.0.0+maint.om//Resources/Scripts/Conversion/ConvertModelica_from_3.2.3_to_4.0.0.mos was applied"}
\ No newline at end of file
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/package.mo" "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/package.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/BuildSysPro 3.5.0/package.mo"	2022-03-10 09:57:40.004144381 +0000
+++ "converted-libraries/.openmodelica/libraries/BuildSysPro 3.5.0/package.mo"	2022-03-10 09:58:35.384151396 +0000
@@ -1,7 +1,7 @@
-within ;
+within ;
 package BuildSysPro "EDF's Modelica library for modelling buildings and energy systems"
 
-  annotation (uses(Modelica(version="3.2.3")),
+  annotation (uses(Modelica(version= "4.0.0")),
   version="3.4.0",
   versionDate="2020-12",
   conversion(from(version={"3.3.0"},script="Convert_3.3.0_to_3.4.0.mos")),