diff --git a/.travis.yml b/.travis.yml index 900f28fe0c..a1b89ee8ab 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,8 +20,7 @@ services: env: global: - - BUILDINGSPY_VERSION=BuildingsPy@50ac74d8e4fd067179bb38bc23140c2c9254c94c - + - BUILDINGSPY_VERSION=BuildingsPy@v5.0.0 - OMC_VERSION=ubuntu-2204-omc:1.22.0_dev-41-g8a5b18f-1 - DYMOLA_VERSION=travis_ubuntu-2004_dymola:2023x-x86_64_rev-1 @@ -29,8 +28,8 @@ env: # Test matrix for regression tests. # The documentation is tested using github actions. - TEST_ARG="make test-bestest" - - TEST_ARG="make test-dymola PACKAGE=\"IBPSA.Experimental\"" - - TEST_ARG="make test-openmodelica PACKAGE=\"IBPSA.Experimental\"" + - TEST_ARG="make test-dymola PACKAGE=\"IBPSA.{Examples,Experimental}\"" + - TEST_ARG="make test-openmodelica PACKAGE=\"IBPSA.{Examples,Experimental}\"" - TEST_ARG="make test-dymola PACKAGE=\"IBPSA.Fluid.{Actuators,BaseClasses,Chillers,Delays,Geothermal,Examples,FMI,FixedResistances}\"" - TEST_ARG="make test-openmodelica PACKAGE=\"IBPSA.Fluid.{Actuators,BaseClasses,Chillers,Delays,Geothermal,Examples,FMI,FixedResistances}\"" - TEST_ARG="make test-dymola PACKAGE=\"IBPSA.Fluid.{HeatExchangers,HeatPumps,Humidifiers,Interfaces,MassExchangers,MixingVolumes,Movers,Sensors,Sources,Storage}\"" diff --git a/IBPSA/BoundaryConditions/WeatherData/Bus.mo b/IBPSA/BoundaryConditions/WeatherData/Bus.mo index cd36e9e55a..ff664c22b6 100644 --- a/IBPSA/BoundaryConditions/WeatherData/Bus.mo +++ b/IBPSA/BoundaryConditions/WeatherData/Bus.mo @@ -2,6 +2,40 @@ within IBPSA.BoundaryConditions.WeatherData; expandable connector Bus "Data bus that stores weather data" extends Modelica.Icons.SignalBus; + Modelica.Units.SI.Temperature TDryBul "Dry bulb temperature"; + Modelica.Units.SI.Temperature TWetBul "Wet bulb temperature"; + Modelica.Units.SI.Temperature TDewPoi "Dew point temperature"; + Modelica.Units.SI.Temperature TBlaSky "Black-body sky temperature"; + + Real relHum(final unit="1") "Relative humidity"; + + Real HDirNor(final unit="W/m2") "Direct normal solar irradiation"; + Real HGloHor(final unit="W/m2") "Global horizontal solar irradiation"; + Real HDifHor(final unit="W/m2") "Diffuse horizontal solar irradiation"; + + Real HHorIR(final unit="W/m2") "Horizontal infrared irradiation"; + + Modelica.Units.SI.Angle winDir "Wind direction"; + Modelica.Units.SI.Velocity winSpe "Wind speed"; + + Modelica.Units.SI.Height ceiHei "Cloud cover ceiling height"; + Real nOpa(final unit="1") "Opaque sky cover"; + Real nTot(final unit="1") "Total sky cover"; + + Modelica.Units.SI.Angle lat "Latitude of the location"; + Modelica.Units.SI.Angle lon "Longitude of the location"; + Modelica.Units.SI.Height alt "Location altitude above sea level"; + + Modelica.Units.SI.AbsolutePressure pAtm "Atmospheric pressure"; + + Modelica.Units.SI.Angle solAlt "Solar altitude angle"; + Modelica.Units.SI.Angle solDec "Solar declination angle"; + Modelica.Units.SI.Angle solHouAng "Solar hour angle"; + Modelica.Units.SI.Angle solZen "Solar zenith angle"; + + Modelica.Units.SI.Time solTim "Solar time"; + Modelica.Units.SI.Time cloTim "Model time"; + annotation ( defaultComponentName="weaBus", Icon(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100},{100, @@ -16,6 +50,11 @@ This component is an expandable connector that is used to implement a bus that c ", revisions="