diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/FastBuildings master/Buildings/BaseClasses/package.mo" "converted-libraries/.openmodelica/libraries/FastBuildings master/Buildings/BaseClasses/package.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/FastBuildings master/Buildings/BaseClasses/package.mo" 2022-03-10 09:57:36.612143950 +0000 +++ "converted-libraries/.openmodelica/libraries/FastBuildings master/Buildings/BaseClasses/package.mo" 2022-03-10 09:58:10.736148274 +0000 @@ -1,8 +1,9 @@ within FastBuildings.Buildings; package BaseClasses - import SI = Modelica.SIunits; + import Modelica.Units.SI; import HT = Modelica.Thermal.HeatTransfer; + end BaseClasses; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/FastBuildings master/Examples/SingleZone_Inputs_defined.mo" "converted-libraries/.openmodelica/libraries/FastBuildings master/Examples/SingleZone_Inputs_defined.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/FastBuildings master/Examples/SingleZone_Inputs_defined.mo" 2022-03-10 09:57:36.612143950 +0000 +++ "converted-libraries/.openmodelica/libraries/FastBuildings master/Examples/SingleZone_Inputs_defined.mo" 2022-03-10 09:58:10.560148252 +0000 @@ -10,11 +10,11 @@ rInt=1e-2)) annotation(Placement(visible = true, transformation(origin = {28.1699,29.7255}, extent = {{-10,-10},{10,10}}, rotation = 0))); Modelica.Blocks.Sources.Sine TAmbSin( amplitude=8, - freqHz=1/86400, +f =1/86400, offset=283) annotation(Placement(visible = true, transformation(origin = {75.8688,-55.8229}, extent = {{-5.8688,-6.1771},{5.8688,6.1771}}, rotation = 0))); Modelica.Blocks.Sources.Step qHea(height=1000, startTime=86400) annotation(Placement(visible = true, transformation(origin = {54.3799,-81.3987}, extent = {{-6.3799,-6.6013},{6.3799,6.6013}}, rotation = 0))); Modelica.Blocks.Math.Max max1 annotation(Placement(visible = true, transformation(origin = {65.5952,-12.2887}, extent = {{-5.59521,-5.71125},{5.59521,5.71125}}, rotation = 0))); - Modelica.Blocks.Sources.Sine IGloHor(amplitude=600, freqHz=1/86400) annotation(Placement(visible = true, transformation(origin = {44.5922,-3.7885}, extent = {{-4.5922,-4.2115},{4.5922,4.2115}}, rotation = 0))); + Modelica.Blocks.Sources.Sine IGloHor(amplitude=600, f =1/86400) annotation(Placement(visible = true, transformation(origin = {44.5922,-3.7885}, extent = {{-4.5922,-4.2115},{4.5922,4.2115}}, rotation = 0))); Modelica.Blocks.Sources.Constant const(k=0) annotation(Placement(visible = true, transformation(origin = {44.6981,-21.4166}, extent = {{-4.6981,-4.5834},{4.6981,4.5834}}, rotation = 0))); Modelica.Blocks.Sources.Pulse powElePul( amplitude=500, diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/FastBuildings master/Examples/package.mo" "converted-libraries/.openmodelica/libraries/FastBuildings master/Examples/package.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/FastBuildings master/Examples/package.mo" 2022-03-10 09:57:36.612143950 +0000 +++ "converted-libraries/.openmodelica/libraries/FastBuildings master/Examples/package.mo" 2022-03-10 09:58:10.628148261 +0000 @@ -1,10 +1,11 @@ within FastBuildings; package Examples "Examples and test models" - import SI = Modelica.SIunits; + import Modelica.Units.SI; import HT = Modelica.Thermal.HeatTransfer; + diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/FastBuildings master/Input/SIM_2Zones_Artificial.mo" "converted-libraries/.openmodelica/libraries/FastBuildings master/Input/SIM_2Zones_Artificial.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/FastBuildings master/Input/SIM_2Zones_Artificial.mo" 2022-03-10 09:57:36.612143950 +0000 +++ "converted-libraries/.openmodelica/libraries/FastBuildings master/Input/SIM_2Zones_Artificial.mo" 2022-03-10 09:58:10.416148233 +0000 @@ -1,14 +1,14 @@ within FastBuildings.Input; model SIM_2Zones_Artificial extends SIM_Inputs_2Zones; - Modelica.Blocks.Sources.Sine TAmbSin(amplitude = 8, freqHz = 1 / 86400, offset = 283) annotation(Placement(visible = true, transformation(origin={39.8688, + Modelica.Blocks.Sources.Sine TAmbSin(amplitude = 8, f = 1 / 86400, offset = 283) annotation(Placement(visible = true, transformation(origin={39.8688, 4.1771}, extent = {{-5.8688,-6.1771},{5.8688,6.1771}}, rotation = 0))); Modelica.Blocks.Sources.Step qHea( startTime = 86400, height= 20000) annotation(Placement(visible = true, transformation(origin={-75.6201, -51.3987}, extent = {{-6.3799,-6.6013},{6.3799,6.6013}}, rotation = 0))); Modelica.Blocks.Math.Max[nIrr] max1 annotation(Placement(visible = true, transformation(origin={29.5952, 47.7113}, extent = {{-5.59521,-5.71125},{5.59521,5.71125}}, rotation = 0))); - Modelica.Blocks.Sources.Sine[nIrr] IGloHor(each amplitude = 600, each freqHz = 1 / 86400) annotation(Placement(visible = true, transformation(origin={8.5922, + Modelica.Blocks.Sources.Sine[nIrr] IGloHor(each amplitude = 600, each f = 1 / 86400) annotation(Placement(visible = true, transformation(origin={8.5922, 56.2115}, extent = {{-4.5922,-4.2115},{4.5922,4.2115}}, rotation = 0))); Modelica.Blocks.Sources.Constant[nIrr] const(each k = 0) annotation(Placement(visible = true, transformation(origin={8.6981, 38.5834}, extent = {{-4.6981,-4.5834},{4.6981,4.5834}}, rotation = 0))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/FastBuildings master/Input/SIM_ArtificialInput.mo" "converted-libraries/.openmodelica/libraries/FastBuildings master/Input/SIM_ArtificialInput.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/FastBuildings master/Input/SIM_ArtificialInput.mo" 2022-03-10 09:57:36.612143950 +0000 +++ "converted-libraries/.openmodelica/libraries/FastBuildings master/Input/SIM_ArtificialInput.mo" 2022-03-10 09:58:10.400148232 +0000 @@ -1,10 +1,10 @@ within FastBuildings.Input; model SIM_ArtificialInput "Dummy weather and inputs " extends FastBuildings.Input.BaseClasses.Partial_SIM; - Modelica.Blocks.Sources.Sine TAmbSin(amplitude = 8, freqHz = 1 / 86400, offset = 283) annotation(Placement(visible = true, transformation(origin = {75.8688,-55.8229}, extent = {{-5.8688,-6.1771},{5.8688,6.1771}}, rotation = 0))); + Modelica.Blocks.Sources.Sine TAmbSin(amplitude = 8, f = 1 / 86400, offset = 283) annotation(Placement(visible = true, transformation(origin = {75.8688,-55.8229}, extent = {{-5.8688,-6.1771},{5.8688,6.1771}}, rotation = 0))); Modelica.Blocks.Sources.Step qHea(height = 1000, startTime = 86400) annotation(Placement(visible = true, transformation(origin = {54.3799,-81.3987}, extent = {{-6.3799,-6.6013},{6.3799,6.6013}}, rotation = 0))); Modelica.Blocks.Math.Max[nIrr] max1 annotation(Placement(visible = true, transformation(origin = {65.5952,-12.2887}, extent = {{-5.59521,-5.71125},{5.59521,5.71125}}, rotation = 0))); - Modelica.Blocks.Sources.Sine[nIrr] IGloHor(each amplitude = 600, each freqHz = 1 / 86400) annotation(Placement(visible = true, transformation(origin = {44.5922,-3.7885}, extent = {{-4.5922,-4.2115},{4.5922,4.2115}}, rotation = 0))); + Modelica.Blocks.Sources.Sine[nIrr] IGloHor(each amplitude = 600, each f = 1 / 86400) annotation(Placement(visible = true, transformation(origin = {44.5922,-3.7885}, extent = {{-4.5922,-4.2115},{4.5922,4.2115}}, rotation = 0))); Modelica.Blocks.Sources.Constant[nIrr] const(each k = 0) annotation(Placement(visible = true, transformation(origin = {44.6981,-21.4166}, extent = {{-4.6981,-4.5834},{4.6981,4.5834}}, rotation = 0))); Modelica.Blocks.Sources.Pulse powElePul(amplitude = 500, period = 86400, startTime = 25000) annotation(Placement(visible = true, transformation(origin = {20.6114,-81.648}, extent = {{-6.61139,-6.35201},{6.61144,6.352}}, rotation = 0))); Modelica.Blocks.Sources.Constant const1(k = 273.15 + 20) annotation(Placement(visible = true, transformation(origin = {-39.3019,-77.4166}, extent = {{-4.6981,-4.5834},{4.6981,4.5834}}, rotation = 0))); diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/FastBuildings master/Zones_stochastic/BaseClasses/Capacitor.mo" "converted-libraries/.openmodelica/libraries/FastBuildings master/Zones_stochastic/BaseClasses/Capacitor.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/FastBuildings master/Zones_stochastic/BaseClasses/Capacitor.mo" 2022-03-10 09:57:36.616143950 +0000 +++ "converted-libraries/.openmodelica/libraries/FastBuildings master/Zones_stochastic/BaseClasses/Capacitor.mo" 2022-03-10 09:58:09.440148111 +0000 @@ -8,7 +8,7 @@ -100.28}, extent = {{-12,-12},{12,12}}, rotation = 0), iconTransformation(origin={0,-100}, extent={{-10,-10}, {10,10}}, rotation = 0))); input Real der_w; - Modelica.SIunits.TemperatureDifference w(start=0, fixed=true) + Modelica.Units.SI.TemperatureDifference w(start=0, fixed=true) "model (process) noise, temperature difference between model and true value"; equation der(w) = der_w; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/FastBuildings master/Zones_stochastic/package.mo" "converted-libraries/.openmodelica/libraries/FastBuildings master/Zones_stochastic/package.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/FastBuildings master/Zones_stochastic/package.mo" 2022-03-10 09:57:36.616143950 +0000 +++ "converted-libraries/.openmodelica/libraries/FastBuildings master/Zones_stochastic/package.mo" 2022-03-10 09:58:09.452148112 +0000 @@ -1,10 +1,11 @@ within FastBuildings; package Zones_stochastic "Package containing (thermal) zone models" - import SI = Modelica.SIunits; + import Modelica.Units.SI; import HT = Modelica.Thermal.HeatTransfer; + diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/FastBuildings master/openmodelica.metadata.json" "converted-libraries/.openmodelica/libraries/FastBuildings master/openmodelica.metadata.json" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/FastBuildings master/openmodelica.metadata.json" 2022-03-10 09:57:36.616143950 +0000 +++ "converted-libraries/.openmodelica/libraries/FastBuildings master/openmodelica.metadata.json" 2022-03-10 09:58:10.764148277 +0000 @@ -1 +1 @@ -{"path":"FastBuildings", "sha":"1f5cfebc2f42c13e272bff639ffa3449d5740bf7", "support":"noSupport", "uses":{"Modelica":"3.2.0"}, "version":"master", "zipfile":"https://github.com/open-ideas/FastBuildings/archive/1f5cfebc2f42c13e272bff639ffa3449d5740bf7.zip"} +{"path": "FastBuildings", "sha": "1f5cfebc2f42c13e272bff639ffa3449d5740bf7", "support": "noSupport", "uses": {"Modelica": "4.0.0"}, "version": "master", "zipfile": "https://github.com/open-ideas/FastBuildings/archive/1f5cfebc2f42c13e272bff639ffa3449d5740bf7.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/FastBuildings master/package.mo" "converted-libraries/.openmodelica/libraries/FastBuildings master/package.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/FastBuildings master/package.mo" 2022-03-10 09:57:36.616143950 +0000 +++ "converted-libraries/.openmodelica/libraries/FastBuildings master/package.mo" 2022-03-10 09:58:10.760148278 +0000 @@ -1,6 +1,6 @@ within ; package FastBuildings "Low order building simulation models" - import SI = Modelica.SIunits; + import Modelica.Units.SI; import HT = Modelica.Thermal.HeatTransfer; import Commons; import IDEAS; @@ -12,7 +12,12 @@ - annotation(uses(Modelica(version = "3.2")), Documentation(info = " + + + + + + annotation(uses(Modelica(version = "4.0.0")), Documentation(info = "

This package contains light (few-states) building models.

The conventions for orientations are (in radials):