diff --git a/.gitignore b/.gitignore
index 0322c0f..8fefdcf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,14 @@
unittests/outputs/*.png
unittests/outputs/*.log
+# Unit testing resources
+#########################
+unittests/resources/**/*.so
+unittests/resources/**/*.h
+unittests/resources/**/*.o
+unittests/resources/**/*.xml
+unittests/resources/**/*.txt
+
# Ignore Dymola output, log and temporary files (in alphabetical order)
#######################################################################
*.bak-mo
diff --git a/README.md b/README.md
index 791c2f1..2ca65ad 100644
--- a/README.md
+++ b/README.md
@@ -6,10 +6,16 @@ This is the development site for MPCPy, the python-based open-source platform fo
MPCPy is a python package that facilitates the testing and implementation of occupant-integrated model predictive control (MPC) for building systems. The package focuses on the use of data-driven, simplified physical or statistical models to predict building performance and optimize control. Four main modules contain object classes to import data, interact with real or emulated systems, estimate and validate data-driven models, and optimize control input.
## Third Party Software
-While MPCPy provides an integration platform, it relies on free, open-source, third-party software packages for model implementation, simulators, parameter estimation algorithms, and optimization solvers. This includes python packages for scripting and data manipulation as well as other more comprehensive software packages for specific purposes. In particular, modeling and optimization for physical systems rely heavily on the Modelica language specification (https://www.modelica.org/) and FMI standard (http://fmi-standard.org/) in order to leverage model library and tool development on these standards occurring elsewhere within the building and other industries.
+While MPCPy provides an integration platform, it relies on free, open-source, third-party software packages for model implementation, simulators, parameter estimation algorithms, and optimization solvers. This includes python packages for scripting and data manipulation as well as other more comprehensive software packages for specific purposes. In particular, modeling and optimization for physical systems rely on the Modelica language specification (https://www.modelica.org/) and FMI standard (http://fmi-standard.org/) in order to leverage model library and tool development on these standards occurring elsewhere within the building and other industries.
## Getting Started
-For installation instructions and an introductory tutorial, see Section 2 of the [User Guide](https://github.com/lbl-srg/MPCPy/tree/master/doc/userGuide).
+**Users** can download here.
+
+**Developers** can ``> git clone https://github.com/lbl-srg/MPCPy.git``.
+
+Then, follow the installation instructions and introductory tutorial in Section 2 of the [User Guide](https://github.com/lbl-srg/MPCPy/tree/master/doc/userGuide), located in /doc/userGuide.
+
+MPCPy uses Python 2.7 and has been tested on Ubuntu 16.04.
## Contributing
If you are interested in contributing to this project:
@@ -25,4 +31,4 @@ MPCPy is available under the following open-source [license](https://github.com/
## Cite
To cite MPCPy, please use:
-Blum, D. H. and Wetter, M. “MPCPy: An Open-Source Software Platform for Model Predictive Control in Buildings.” Proceedings of the 15th Conference of International Building Performance Simulation, Aug 7 – 9, 2017. San Francisco, CA, Accepted.
+Blum, D. H. and Wetter, M. “MPCPy: An Open-Source Software Platform for Model Predictive Control in Buildings.” Proceedings of the 15th Conference of International Building Performance Simulation, Aug 7 – 9, 2017. San Francisco, CA.
diff --git a/doc/userGuide/MPCPyUserGuide.pdf b/doc/userGuide/MPCPyUserGuide.pdf
index 88be940..318c4cf 100644
Binary files a/doc/userGuide/MPCPyUserGuide.pdf and b/doc/userGuide/MPCPyUserGuide.pdf differ
diff --git a/doc/userGuide/source/conf.py b/doc/userGuide/source/conf.py
index ae0dfca..b436869 100755
--- a/doc/userGuide/source/conf.py
+++ b/doc/userGuide/source/conf.py
@@ -57,7 +57,7 @@
# The short X.Y version.
#version = u'0.1'
# The full version, including alpha/beta/rc tags.
-release = u'0.1'
+release = u'0.1.0'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/doc/userGuide/source/gettingStarted.rst b/doc/userGuide/source/gettingStarted.rst
index 4cb44ca..5b2e19e 100755
--- a/doc/userGuide/source/gettingStarted.rst
+++ b/doc/userGuide/source/gettingStarted.rst
@@ -6,17 +6,29 @@ To get started with MPCPy, first follow the installation instructions below. Th
Installation Instructions For Linux (Ubuntu 16.04 LTS)
------------------------------------------------------
-1. Install Python Packages
-
- - matplotlib 2.0.2
- - numpy 1.13.1
- - pandas 0.20.3
- - python-dateutil 2.6.1
- - pytz 2017.2
- - scikit-learn 0.18.2
- - tzwhere 2.3
- - sphinx 1.6.3
- - numpydoc 0.7.0
+1. Install Python packages:
+
+ - MPCPy uses Python 2.7.
+
+ - using pip, install the following packages:
+
+ matplotlib >= 2.0.2
+
+ numpy >= 1.13.1
+
+ pandas >= 0.20.3
+
+ python-dateutil >= 2.6.1
+
+ pytz >= 2017.2
+
+ scikit-learn >= 0.18.2
+
+ sphinx >= 1.6.3
+
+ numpydoc >= 0.7.0
+
+ tzwhere **=** 2.3
2. Install libgeos-dev with command:
diff --git a/doc/userGuide/source/introduction.rst b/doc/userGuide/source/introduction.rst
index 9134358..bf3a53b 100755
--- a/doc/userGuide/source/introduction.rst
+++ b/doc/userGuide/source/introduction.rst
@@ -24,7 +24,7 @@ Three other modules provide additional, mainly internal, functionality to MPCPy:
Third-Party Software
--------------------
-While MPCPy provides an integration platform, it relies on free, open-source, third-party software packages for model implementation, simulators, parameter estimation algorithms, and optimization solvers. This includes python packages for scripting and data manipulation as well as other more comprehensive software packages for specific purposes. In particular, modeling and optimization for physical systems rely heavily on the Modelica language specification (https://www.modelica.org/) and FMI standard (http://fmi-standard.org/) in order to leverage model library and tool development on these standards occurring elsewhere within the building and other industries. Two examples of these third-party tools are:
+While MPCPy provides an integration platform, it relies on free, open-source, third-party software packages for model implementation, simulators, parameter estimation algorithms, and optimization solvers. This includes python packages for scripting and data manipulation as well as other more comprehensive software packages for specific purposes. In particular, modeling and optimization for physical systems rely on the Modelica language specification (https://www.modelica.org/) and FMI standard (http://fmi-standard.org/) in order to leverage model library and tool development on these standards occurring elsewhere within the building and other industries. Two examples of these third-party tools are:
- **JModelica.org** (http://jmodelica.org/) is used for simulation of FMUs, compiling FMUs from Modelica models, parameter estimation of Modelica models, and control optimization using Modelica models.
- **EstimationPy** (http://lbl-srg.github.io/EstimationPy/) is used for implementing the Unscented Kalman Filter for parameter estimation of FMU models.
@@ -39,5 +39,5 @@ Cite
----
To cite MPCPy, please use:
-Blum, D. H. and Wetter, M. “MPCPy: An Open-Source Software Platform for Model Predictive Control in Buildings.” Proceedings of the 15th Conference of International Building Performance Simulation, Aug 7 – 9, 2017. San Francisco, CA, Accepted.
+Blum, D. H. and Wetter, M. “MPCPy: An Open-Source Software Platform for Model Predictive Control in Buildings.” Proceedings of the 15th Conference of International Building Performance Simulation, Aug 7 – 9, 2017. San Francisco, CA.
diff --git a/doc/userGuide/tutorial/introductory.py b/doc/userGuide/tutorial/introductory.py
index d7c7cd7..31a974d 100644
--- a/doc/userGuide/tutorial/introductory.py
+++ b/doc/userGuide/tutorial/introductory.py
@@ -3,7 +3,8 @@
This tutorial will introduce the basic concepts and workflow of mpcpy.
By the end, we will train a simple model based on emulated data, and use
-the model to optimize the control signal of the system.
+the model to optimize the control signal of the system. All required data
+files for this tutorial are located in doc/userGuide/tutorial.
The model is a simple RC model of zone thermal response to ambient temperature
and a singal heat input. It is written in Modelica:
@@ -437,7 +438,11 @@
data of the model object and updates their timeseries data with the optimal
solution for the time period specified. Note that other than the constraints,
the exogenous data within the model object is used, and the control interval
-is assumed to be the same as the measurement sampling rate of the model.
+is assumed to be the same as the measurement sampling rate of the model. Use
+the ``get_optimization_options()`` and ``set_optimization_options()`` to see
+and change the options for the optimization solver; for instance number
+of control points, maximum iteration number, tolerance, or maximum CPU time.
+See the documentation for these functions for more information.
>>> opt_problem.optimize('1/2/2017', '1/3/2017') # doctest: +ELLIPSIS
-etc-
@@ -472,4 +477,8 @@
if __name__ == "__main__":
import doctest
doctest.ELLIPSIS_MARKER = '-etc-'
- doctest.testmod()
+ (n_fails, n_tests) = doctest.testmod()
+ if n_fails:
+ print('\nTutorial finished with {0} fails.'.format(n_fails));
+ else:
+ print('\nTutorial finished OK.')
diff --git a/resources/building/.FMUOutput/binaries/linux32/RapidMPC_Examples_LBNL71T_0Emulate_Emulation.so b/resources/building/.FMUOutput/binaries/linux32/RapidMPC_Examples_LBNL71T_0Emulate_Emulation.so
deleted file mode 100755
index 5e19fdb..0000000
Binary files a/resources/building/.FMUOutput/binaries/linux32/RapidMPC_Examples_LBNL71T_0Emulate_Emulation.so and /dev/null differ
diff --git a/resources/building/.FMUOutput/binaries/linux64/RapidMPC_Examples_LBNL71T_0Emulate_Emulation.so b/resources/building/.FMUOutput/binaries/linux64/RapidMPC_Examples_LBNL71T_0Emulate_Emulation.so
deleted file mode 100755
index 2ffd0ca..0000000
Binary files a/resources/building/.FMUOutput/binaries/linux64/RapidMPC_Examples_LBNL71T_0Emulate_Emulation.so and /dev/null differ
diff --git a/resources/building/.FMUOutput/dsmodel.o b/resources/building/.FMUOutput/dsmodel.o
deleted file mode 100755
index 01f64a4..0000000
Binary files a/resources/building/.FMUOutput/dsmodel.o and /dev/null differ
diff --git a/resources/building/.FMUOutput/dsmodel_fmuconf.h b/resources/building/.FMUOutput/dsmodel_fmuconf.h
deleted file mode 100755
index d20bf45..0000000
--- a/resources/building/.FMUOutput/dsmodel_fmuconf.h
+++ /dev/null
@@ -1 +0,0 @@
-/* file for enabling result storing in FMU */
diff --git a/resources/building/.FMUOutput/fmiFunctions.o b/resources/building/.FMUOutput/fmiFunctions.o
deleted file mode 100755
index ce6f95e..0000000
Binary files a/resources/building/.FMUOutput/fmiFunctions.o and /dev/null differ
diff --git a/resources/building/.FMUOutput/fmiModelIdentifier.h b/resources/building/.FMUOutput/fmiModelIdentifier.h
deleted file mode 100755
index 4fd99ee..0000000
--- a/resources/building/.FMUOutput/fmiModelIdentifier.h
+++ /dev/null
@@ -1 +0,0 @@
-#define MODEL_IDENTIFIER RapidMPC_Examples_LBNL71T_0Emulate_Emulation
diff --git a/resources/building/.FMUOutput/fmu.map b/resources/building/.FMUOutput/fmu.map
deleted file mode 100755
index 757143e..0000000
--- a/resources/building/.FMUOutput/fmu.map
+++ /dev/null
@@ -1,49 +0,0 @@
-# version script generated during FMU export and used when building shared object
-
-RapidMPC_Examples_LBNL71T_0Emulate_Emulation {
-
- global:
- # FMI 1
- RapidMPC_Examples_LBNL71T_0Emulate_Emulation_fmiGetVersion;
- RapidMPC_Examples_LBNL71T_0Emulate_Emulation_fmiSetDebugLogging;
- RapidMPC_Examples_LBNL71T_0Emulate_Emulation_fmiGetReal;
- RapidMPC_Examples_LBNL71T_0Emulate_Emulation_fmiGetInteger;
- RapidMPC_Examples_LBNL71T_0Emulate_Emulation_fmiGetBoolean;
- RapidMPC_Examples_LBNL71T_0Emulate_Emulation_fmiGetString;
- RapidMPC_Examples_LBNL71T_0Emulate_Emulation_fmiSetReal;
- RapidMPC_Examples_LBNL71T_0Emulate_Emulation_fmiSetInteger;
- RapidMPC_Examples_LBNL71T_0Emulate_Emulation_fmiSetBoolean;
- RapidMPC_Examples_LBNL71T_0Emulate_Emulation_fmiSetString;
- RapidMPC_Examples_LBNL71T_0Emulate_Emulation_fmiGetModelTypesPlatform;
- RapidMPC_Examples_LBNL71T_0Emulate_Emulation_fmiInstantiateModel;
- RapidMPC_Examples_LBNL71T_0Emulate_Emulation_fmiFreeModelInstance;
- RapidMPC_Examples_LBNL71T_0Emulate_Emulation_fmiSetTime;
- RapidMPC_Examples_LBNL71T_0Emulate_Emulation_fmiSetContinuousStates;
- RapidMPC_Examples_LBNL71T_0Emulate_Emulation_fmiInitialize;
- RapidMPC_Examples_LBNL71T_0Emulate_Emulation_fmiEventUpdate;
- RapidMPC_Examples_LBNL71T_0Emulate_Emulation_fmiCompletedIntegratorStep;
- RapidMPC_Examples_LBNL71T_0Emulate_Emulation_fmiTerminate;
- RapidMPC_Examples_LBNL71T_0Emulate_Emulation_fmiGetDerivatives;
- RapidMPC_Examples_LBNL71T_0Emulate_Emulation_fmiGetEventIndicators;
- RapidMPC_Examples_LBNL71T_0Emulate_Emulation_fmiGetContinuousStates;
- RapidMPC_Examples_LBNL71T_0Emulate_Emulation_fmiGetNominalContinuousStates;
- RapidMPC_Examples_LBNL71T_0Emulate_Emulation_fmiGetStateValueReferences;
- RapidMPC_Examples_LBNL71T_0Emulate_Emulation_fmiGetTypesPlatform;
- RapidMPC_Examples_LBNL71T_0Emulate_Emulation_fmiInstantiateSlave;
- RapidMPC_Examples_LBNL71T_0Emulate_Emulation_fmiFreeSlaveInstance;
- RapidMPC_Examples_LBNL71T_0Emulate_Emulation_fmiInitializeSlave;
- RapidMPC_Examples_LBNL71T_0Emulate_Emulation_fmiTerminateSlave;
- RapidMPC_Examples_LBNL71T_0Emulate_Emulation_fmiResetSlave;
- RapidMPC_Examples_LBNL71T_0Emulate_Emulation_fmiSetRealInputDerivatives;
- RapidMPC_Examples_LBNL71T_0Emulate_Emulation_fmiGetRealOutputDerivatives;
- RapidMPC_Examples_LBNL71T_0Emulate_Emulation_fmiDoStep;
- RapidMPC_Examples_LBNL71T_0Emulate_Emulation_fmiCancelStep;
- RapidMPC_Examples_LBNL71T_0Emulate_Emulation_fmiGetStatus;
- RapidMPC_Examples_LBNL71T_0Emulate_Emulation_fmiGetRealStatus;
- RapidMPC_Examples_LBNL71T_0Emulate_Emulation_fmiGetIntegerStatus;
- RapidMPC_Examples_LBNL71T_0Emulate_Emulation_fmiGetBooleanStatus;
- RapidMPC_Examples_LBNL71T_0Emulate_Emulation_fmiGetStringStatus;
-
- local:
- *;
-};
diff --git a/resources/building/.FMUOutput/matrixop.o b/resources/building/.FMUOutput/matrixop.o
deleted file mode 100755
index 9b0d063..0000000
Binary files a/resources/building/.FMUOutput/matrixop.o and /dev/null differ
diff --git a/resources/building/.FMUOutput/modelDescription.xml b/resources/building/.FMUOutput/modelDescription.xml
deleted file mode 100755
index 1ed8475..0000000
--- a/resources/building/.FMUOutput/modelDescription.xml
+++ /dev/null
@@ -1,3319 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+Block to output the latitude of the location.
+This block is added so that the latitude is displayed
+with a comment in the GUI of the weather bus connector.
+
+Implementation
+
+If
+
+Modelica.Blocks.Sources.Constant where used, then
+the comment for the latitude would be \"Connector of Real output signal\".
+As this documentation string cannot be overwritten, a new block
+was implemented.
+
+", revisions="
+
+-
+January 4, 2016, by Michael Wetter:
+First implementation.
+
+
+"));
+ end Latitude;
+
+ block Longitude "Generate constant signal of type Real"
+ extends Modelica.Blocks.Icons.Block;
+
+ parameter Modelica.SIunits.Angle longitude "Longitude";
+
+ Modelica.Blocks.Interfaces.RealOutput y(
+ unit="rad",
+ displayUnit="deg") "Longitude of the location"
+ annotation (Placement(transformation(extent={{100,-10},{120,10}})));
+ equation
+ y = longitude;
+ annotation (
+ Icon(coordinateSystem(
+ preserveAspectRatio=true,
+ extent={{-100,-100},{100,100}}), graphics={
+ Text(
+ extent={{-81,32},{84,-24}},
+ lineColor={0,0,0},
+ textString="Longitude")}),
+ Diagram(coordinateSystem(
+ preserveAspectRatio=false,
+ extent={{-100,-100},{100,100}})),
+ Documentation(info="
+
+Block to output the longitude of the location.
+This block is added so that the longitude is displayed
+with a comment in the GUI of the weather bus connector.
+
+Implementation
+
+If
+
+Modelica.Blocks.Sources.Constant where used, then
+the comment for the longitude would be \"Connector of Real output signal\".
+As this documentation string cannot be overwritten, a new block
+was implemented.
+
+", revisions="
+
+-
+January 4, 2016, by Michael Wetter:
+First implementation.
+
+
+"));
+ end Longitude;
+
+ public
+ Modelica.Blocks.Interfaces.RealOutput HDifHor
+ annotation (Placement(transformation(extent={{300,350},{320,370}})));
+ equation
+ //---------------------------------------------------------------------------
+ // Select atmospheric pressure connector
+ connect(pAtm_in, pAtm_in_internal);
+ connect(pAtm_in_internal, chePre.PIn);
+ //---------------------------------------------------------------------------
+ // Select ceiling height connector
+ connect(ceiHei_in, ceiHei_in_internal);
+ connect(ceiHei_in_internal, cheCeiHei.ceiHeiIn);
+
+ //---------------------------------------------------------------------------
+ // Select total sky cover connector
+ connect(totSkyCov_in, totSkyCov_in_internal);
+ connect(totSkyCov_in_internal, cheTotSkyCov.nIn);
+ //---------------------------------------------------------------------------
+ // Select opaque sky cover connector
+ connect(opaSkyCov_in, opaSkyCov_in_internal);
+ connect(opaSkyCov_in_internal, cheOpaSkyCov.nIn);
+
+ //---------------------------------------------------------------------------
+ // Select dew point temperature connector
+ connect(TDewPoi_in, TDewPoi_in_internal);
+ connect(TDewPoi_in_internal, cheTemDewPoi.TIn);
+ //---------------------------------------------------------------------------
+ // Select dry bulb temperature connector
+ connect(TDryBul_in, TDryBul_in_internal);
+ connect(TDryBul_in_internal, cheTemDryBul.TIn);
+ //---------------------------------------------------------------------------
+ // Select relative humidity connector
+ connect(relHum_in, relHum_in_internal);
+ connect(relHum_in_internal, cheRelHum.relHumIn);
+ //---------------------------------------------------------------------------
+ // Select wind speed connector
+ connect(winSpe_in, winSpe_in_internal);
+ connect(winSpe_in_internal, cheWinSpe.winSpeIn);
+ //---------------------------------------------------------------------------
+ // Select wind direction connector
+ connect(winDir_in, winDir_in_internal);
+ connect(winDir_in_internal, cheWinDir.nIn);
+ //---------------------------------------------------------------------------
+ // Select global horizontal radiation connector
+ if HSou == Buildings.BoundaryConditions.Types.RadiationDataSource.Input_HGloHor_HDifHor or HSou == Buildings.BoundaryConditions.Types.RadiationDataSource.Input_HDirNor_HGloHor then
+ connect(HGloHor_in, HGloHor_in_internal)
+ "Get HGloHor using user input file";
+ elseif HSou == Buildings.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)";
+ end if;
+ connect(HGloHor_in_internal, cheGloHorRad.HIn);
+ //---------------------------------------------------------------------------
+ // Select diffuse horizontal radiation connector
+ if HSou == Buildings.BoundaryConditions.Types.RadiationDataSource.Input_HGloHor_HDifHor or HSou == Buildings.BoundaryConditions.Types.RadiationDataSource.Input_HDirNor_HDifHor then
+ connect(HDifHor_in, HDifHor_in_internal)
+ "Get HDifHor using user input file";
+ elseif HSou == Buildings.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)";
+ end if;
+ connect(HDifHor_in_internal, cheDifHorRad.HIn);
+ //---------------------------------------------------------------------------
+ // Select direct normal radiation connector
+ if HSou == Buildings.BoundaryConditions.Types.RadiationDataSource.Input_HDirNor_HGloHor or HSou == Buildings.BoundaryConditions.Types.RadiationDataSource.Input_HDirNor_HDifHor then
+ connect(HDirNor_in, HDirNor_in_internal)
+ "Get HDirNor using user input file";
+ elseif HSou == Buildings.BoundaryConditions.Types.RadiationDataSource.Input_HGloHor_HDifHor then
+ (HGloHor_in_internal -HDifHor_in_internal)/Buildings.Utilities.Math.Functions.smoothMax(x1=cos(zenAng.zen), x2=epsCos, deltaX=0.1*epsCos)
+ = HDirNor_in_internal
+ "Calculate the HDirNor using HGloHor and HDifHor according to (A.4.14) and (A.4.15)";
+ end if;
+ connect(HDirNor_in_internal, cheDirNorRad.HIn);
+
+ //---------------------------------------------------------------------------
+ // Select infrared radiation connector
+ connect(HInfHor_in, HInfHor_in_internal);
+ connect(HInfHor_in_internal, cheHorRad.HIn);
+ //---------------------------------------------------------------------------
+ connect(chePre.POut, weaBus.pAtm) annotation (Line(
+ points={{149,62},{188,62},{188,-8},{268,-8}},
+ color={0,0,127}), Text(
+ string="%second",
+ index=1,
+ extent={{6,3},{6,3}}));
+ connect(cheTotSkyCov.nOut, weaBus.nTot) annotation (Line(
+ points={{149,-38},{188,-38},{188,-8},{268,-8}},
+ color={0,0,127}), Text(
+ string="%second",
+ index=1,
+ extent={{6,3},{6,3}}));
+ connect(cheOpaSkyCov.nOut, weaBus.nOpa) annotation (Line(
+ points={{149,-158},{188,-158},{188,-8},{268,-8}},
+ color={0,0,127}), Text(
+ string="%second",
+ index=1,
+ extent={{6,3},{6,3}}));
+ connect(cheGloHorRad.HOut, weaBus.HGloHor) annotation (Line(
+ points={{149,162},{188,162},{188,-8},{268,-8}},
+ color={0,0,127}), Text(
+ string="%second",
+ index=1,
+ extent={{6,3},{6,3}}));
+ connect(cheDifHorRad.HOut, weaBus.HDifHor) annotation (Line(
+ points={{149,122},{188,122},{188,-8},{268,-8}},
+ color={0,0,127}), Text(
+ string="%second",
+ index=1,
+ extent={{6,3},{6,3}}));
+ connect(cheDirNorRad.HOut, weaBus.HDirNor) annotation (Line(
+ points={{149,202},{188,202},{188,-8},{268,-8}},
+ color={0,0,127}), Text(
+ string="%second",
+ index=1,
+ extent={{6,3},{6,3}}));
+ connect(cheCeiHei.ceiHeiOut, weaBus.celHei) annotation (Line(
+ points={{149,-118},{188,-118},{188,-8},{268,-8}},
+ color={0,0,127}), Text(
+ string="%second",
+ index=1,
+ extent={{6,3},{6,3}}));
+ connect(cheWinSpe.winSpeOut, weaBus.winSpe) annotation (Line(
+ points={{149,-78},{188,-78},{188,-8},{268,-8}},
+ color={0,0,127}), Text(
+ string="%second",
+ index=1,
+ extent={{6,3},{6,3}}));
+ connect(cheHorRad.HOut, weaBus.HHorIR) annotation (Line(
+ points={{149,242},{188,242},{188,-8},{268,-8}},
+ color={0,0,127}), Text(
+ string="%second",
+ index=1,
+ extent={{6,3},{6,3}}));
+ connect(cheWinDir.nOut, weaBus.winDir) annotation (Line(
+ points={{149,-278},{248,-278},{248,-8},{268,-8}},
+ color={0,0,127}), Text(
+ string="%second",
+ index=1,
+ extent={{6,3},{6,3}}));
+
+ connect(eqnTim.eqnTim, solTim.equTim) annotation (Line(
+ points={{-131,-118},{-120,-118},{-120,-132},{-114,-132}},
+ color={0,0,127}));
+ connect(locTim.locTim, solTim.locTim) annotation (Line(
+ points={{-131,-158},{-120,-158},{-120,-143.4},{-114,-143.4}},
+ color={0,0,127}));
+
+ connect(cheTemDewPoi.TOut, weaBus.TDewPoi) annotation (Line(
+ points={{149,-238},{248,-238},{248,-8},{268,-8}},
+ color={0,0,127}), Text(
+ string="%second",
+ index=1,
+ extent={{6,3},{6,3}}));
+
+ connect(cheRelHum.relHumOut, weaBus.relHum) annotation (Line(
+ points={{149,22},{248,22},{248,-8},{268,-8}},
+ color={0,0,127}), Text(
+ string="%second",
+ index=1,
+ extent={{6,3},{6,3}}));
+ connect(cheTemDryBul.TOut, weaBus.TDryBul) annotation (Line(
+ points={{149,-198},{248,-198},{248,-8},{268,-8}},
+ color={0,0,127}), Text(
+ string="%second",
+ index=1,
+ extent={{6,3},{6,3}}));
+ connect(decAng.decAng, zenAng.decAng)
+ annotation (Line(
+ points={{-151,-218},{-96,-218},{-96,-222.6}},
+ color={0,0,127}));
+ connect(solHouAng.solHouAng, zenAng.solHouAng) annotation (Line(
+ points={{-151,-248},{-142,-248},{-142,-232.8},{-96,-232.8}},
+ color={0,0,127}));
+ connect(solHouAng.solTim, solTim.solTim) annotation (Line(
+ points={{-174,-248},{-186,-248},{-186,-180},{-52,-180},{-52,-138},{
+ -91,-138}},
+ color={0,0,127}));
+ connect(zenAng.zen, altAng.zen) annotation (Line(
+ points={{-73,-228},{-72,-228},{-72,-256},{-60,-256}},
+ color={0,0,127}));
+
+ // Connectors for wet bulb temperature.
+ // These are removed if computeWetBulbTemperature = false
+ connect(chePre.POut, tWetBul_TDryBulXi.p) annotation (Line(
+ points={{149,62},{188,62},{188,-72},{211,-72}},
+ color={0,0,127}));
+ connect(tWetBul_TDryBulXi.TWetBul, weaBus.TWetBul) annotation (Line(
+ points={{233,-64},{248,-64},{248,-8},{260,-8},{268,-8}},
+ color={0,0,127}), Text(
+ string="%second",
+ index=1,
+ extent={{6,3},{6,3}}));
+ connect(cheTemDryBul.TOut, tWetBul_TDryBulXi.TDryBul) annotation (Line(
+ points={{149,-198},{188,-198},{188,-56},{211,-56}},
+ color={0,0,127}));
+ connect(cheRelHum.relHumOut, tWetBul_TDryBulXi.phi) annotation (Line(
+ points={{149,22},{176,22},{176,-64},{211,-64}},
+ color={0,0,127}));
+
+ // Connectors for black sky temperature.
+ // These are removed if computeBlackSkyTemperature = false
+ connect(cheOpaSkyCov.nOut, TBlaSkyCom.nOpa) annotation (Line(
+ points={{149,-158},{188,-158},{188,-221},{206,-221}},
+ color={0,0,127}));
+ connect(cheHorRad.HOut, TBlaSkyCom.HHorIR) annotation (Line(
+ points={{149,242},{188,242},{188,-226},{206,-226}},
+ color={0,0,127}));
+ connect(cheTemDryBul.TOut, TBlaSkyCom.TDryBul) annotation (Line(
+ points={{149,-198},{188,-198},{188,-210},{206,-210}},
+ color={0,0,127}));
+ connect(TBlaSkyCom.TDewPoi, cheTemDewPoi.TOut) annotation (Line(
+ points={{206,-215},{188,-215},{188,-238},{149,-238}},
+ color={0,0,127}));
+ connect(TBlaSkyCom.TBlaSky, cheTemBlaSky.TIn);
+ connect(cheTemBlaSky.TOut, weaBus.TBlaSky) annotation (Line(points={{229,
+ -258},{229,-258},{248,-258},{248,-8},{268,-8}},
+ color={0,0,127}));
+
+ connect(altAng.alt, weaBus.solAlt) annotation (Line(
+ points={{-37,-256},{-24,-256},{-24,-296},{274,-296},{274,-8},{268,-8}},
+ color={0,0,127}));
+ connect(zenAng.zen, weaBus.solZen) annotation (Line(
+ points={{-73,-228},{-72,-228},{-72,-298},{276,-298},{276,-8},{268,-8}},
+ color={0,0,127}));
+ connect(decAng.decAng, weaBus.solDec) annotation (Line(
+ points={{-151,-218},{-151,-224},{-108,-224},{-108,-300},{278,-300},{
+ 278,-8},{268,-8}},
+ color={0,0,127}));
+ connect(solHouAng.solHouAng, weaBus.solHouAng) annotation (Line(
+ points={{-151,-248},{-151,-248},{-124,-248},{-124,-302},{280,-302},{
+ 280,-144},{280,-8},{268,-8}},
+ color={0,0,127}));
+ connect(longitude.y, weaBus.lon) annotation (Line(
+ points={{-151,-278},{-138,-278},{-138,-304},{282,-304},{282,-8},{268,
+ -8}},
+ color={0,0,127}));
+ connect(latitude.y, weaBus.lat) annotation (Line(
+ points={{-189,-308},{-184,-308},{-184,-306},{284,-306},{284,-8},{268,
+ -8}},
+ color={0,0,127}));
+ connect(modTim.y, eqnTim.nDay) annotation (Line(points={{-201,22},{-192,22},
+ {-178,22},{-178,-118},{-154,-118}}, color={0,0,127}));
+ connect(modTim.y, locTim.cloTim) annotation (Line(points={{-201,22},{-190,
+ 22},{-178,22},{-178,-158},{-154,-158}}, color={0,0,127}));
+ connect(modTim.y, decAng.nDay) annotation (Line(points={{-201,22},{-116,22},
+ {-34,22},{-34,-194},{-182,-194},{-182,-218},{-174,-218}},
+ color={0,0,
+ 127}));
+ connect(modTim.y, weaBus.cloTim) annotation (Line(points={{-201,22},{-116,
+ 22},{-14,22},{-14,-8},{268,-8}},
+ color={0,0,127}), Text(
+ string="%second",
+ index=1,
+ extent={{6,3},{6,3}}));
+ connect(solTim.solTim, weaBus.solTim) annotation (Line(points={{-91,-138},{
+ -14,-138},{-14,-8},{268,-8}},
+ color={0,0,127}), Text(
+ string="%second",
+ index=1,
+ extent={{6,3},{6,3}}));
+ annotation (
+ defaultComponentName="weaDat",
+ Icon(coordinateSystem(
+ preserveAspectRatio=false,
+ extent={{-200,-200},{200,200}},
+ initialScale=0.05), graphics={
+ Rectangle(
+ extent={{-200,200},{200,-200}},
+ lineColor={124,142,255},
+ fillColor={39,45,81},
+ fillPattern=FillPattern.Solid),
+ Text(
+ extent={{-162,270},{138,230}},
+ textString="%name",
+ lineColor={0,0,255}),
+ Ellipse(
+ extent={{-146,154},{28,-20}},
+ lineColor={255,220,220},
+ lineThickness=1,
+ fillPattern=FillPattern.Sphere,
+ fillColor={215,215,215}),
+ Ellipse(
+ extent={{-62,-74},{-58,-78}},
+ lineColor={255,220,220},
+ lineThickness=1,
+ fillPattern=FillPattern.Sphere,
+ fillColor={255,255,170}),
+ Ellipse(
+ extent={{-66,184},{-62,180}},
+ lineColor={255,220,220},
+ lineThickness=1,
+ fillPattern=FillPattern.Sphere,
+ fillColor={255,255,170}),
+ Ellipse(
+ extent={{62,182},{66,178}},
+ lineColor={255,220,220},
+ lineThickness=1,
+ fillPattern=FillPattern.Sphere,
+ fillColor={255,255,170}),
+ Ellipse(
+ extent={{156,190},{160,186}},
+ lineColor={255,220,220},
+ lineThickness=1,
+ fillPattern=FillPattern.Sphere,
+ fillColor={255,255,170}),
+ Ellipse(
+ extent={{56,-56},{60,-60}},
+ lineColor={255,220,220},
+ lineThickness=1,
+ fillPattern=FillPattern.Sphere,
+ fillColor={255,255,170}),
+ Ellipse(
+ extent={{118,-184},{122,-188}},
+ lineColor={255,220,220},
+ lineThickness=1,
+ fillPattern=FillPattern.Sphere,
+ fillColor={255,255,170}),
+ Ellipse(
+ extent={{154,-116},{158,-120}},
+ lineColor={255,220,220},
+ lineThickness=1,
+ fillPattern=FillPattern.Sphere,
+ fillColor={255,255,170}),
+ Ellipse(
+ extent={{-156,-28},{-152,-32}},
+ lineColor={255,220,220},
+ lineThickness=1,
+ fillPattern=FillPattern.Sphere,
+ fillColor={255,255,170}),
+ Ellipse(
+ extent={{148,-20},{152,-24}},
+ lineColor={255,220,220},
+ lineThickness=1,
+ fillPattern=FillPattern.Sphere,
+ fillColor={255,255,170}),
+ Ellipse(
+ extent={{148,116},{152,112}},
+ lineColor={255,220,220},
+ lineThickness=1,
+ fillPattern=FillPattern.Sphere,
+ fillColor={255,255,170}),
+ Ellipse(
+ extent={{-168,136},{-164,132}},
+ lineColor={255,220,220},
+ lineThickness=1,
+ fillPattern=FillPattern.Sphere,
+ fillColor={255,255,170}),
+ Ellipse(
+ extent={{8,-160},{12,-164}},
+ lineColor={255,220,220},
+ lineThickness=1,
+ fillPattern=FillPattern.Sphere,
+ fillColor={255,255,170}),
+ Ellipse(
+ extent={{-146,-152},{-142,-156}},
+ lineColor={255,220,220},
+ lineThickness=1,
+ fillPattern=FillPattern.Sphere,
+ fillColor={255,255,170}),
+ Ellipse(
+ extent={{86,56},{90,52}},
+ lineColor={255,220,220},
+ lineThickness=1,
+ fillPattern=FillPattern.Sphere,
+ fillColor={255,255,170})}),
+ Documentation(info="
+
+This component reads TMY3 weather data (Wilcox and Marion, 2008) or user specified weather data.
+The weather data format is the Typical Meteorological Year (TMY3)
+as obtained from the EnergyPlus web site at
+
+http://energyplus.net/weather. These
+data, which are in the EnergyPlus format, need to be converted as described
+in the next paragraph.
+
+
+Output to weaBus
+
+The following variables serve as output and are accessible via weaBus:
+
+
+
+
+ | Name
+ |
+ Unit
+ |
+ Description
+ |
+
+
+
+
+ HDifHor
+ |
+
+ W/m2
+ |
+
+ Horizontal diffuse solar radiation.
+ |
+
+
+
+
+ HDifNor
+ |
+
+ W/m2
+ |
+
+ Direct normal radiation.
+ |
+
+
+
+
+ HGloHor
+ |
+
+ W/m2
+ |
+
+ Horizontal global radiation.
+ |
+
+
+
+
+ HHorIR
+ |
+
+ W/m2
+ |
+
+ Horizontal infrared irradiation.
+ |
+
+
+
+
+ TBlaSky
+ |
+
+ K
+ |
+
+ Output temperature.
+ |
+
+
+
+
+ TDewPoi
+ |
+
+ K
+ |
+
+ Dew point temperature.
+ |
+
+
+
+
+ TDryBul
+ |
+
+ K
+ |
+
+ Dry bulb temperature at ground level.
+ |
+
+
+
+
+ TWetBul
+ |
+
+ K
+ |
+
+ Wet bulb temperature.
+ |
+
+
+
+
+ celHei
+ |
+
+ m
+ |
+
+ Ceiling height.
+ |
+
+
+
+
+ cloTim
+ |
+
+ s
+ |
+
+ One-based day number in seconds.
+ |
+
+
+
+
+ lat
+ |
+
+ rad
+ |
+
+ Latitude of the location.
+ |
+
+
+
+
+ lon
+ |
+
+ rad
+ |
+
+ Longitude of the location.
+ |
+
+
+
+
+ nOpa
+ |
+
+ 1
+ |
+
+ Opaque sky cover [0, 1].
+ |
+
+
+
+
+ nTot
+ |
+
+ 1
+ |
+
+ Total sky Cover [0, 1].
+ |
+
+
+
+
+ pAtm
+ |
+
+ Pa
+ |
+
+ Atmospheric pressure.
+ |
+
+
+
+
+ relHum
+ |
+
+ 1
+ |
+
+ Relative humidity.
+ |
+
+
+
+
+ solAlt
+ |
+
+ rad
+ |
+
+ Altitude angle.
+ |
+
+
+
+
+ solDec
+ |
+
+ rad
+ |
+
+ Declination angle.
+ |
+
+
+
+
+ solHouAng
+ |
+
+ rad
+ |
+
+ Solar hour angle.
+ |
+
+
+
+
+ solTim
+ |
+
+ s
+ |
+
+ Solar time.
+ |
+
+
+
+
+ solZen
+ |
+
+ rad
+ |
+
+ Zenith angle.
+ |
+
+
+
+
+ winDir
+ |
+
+ rad
+ |
+
+ Wind direction.
+ |
+
+
+
+
+ winSpe
+ |
+
+ m/s
+ |
+
+ Wind speed.
+ |
+
+
+
+Adding new weather data
+
+To add new weather data, proceed as follows:
+
+
+-
+Download the weather data file with the
epw extension from
+
+http://energyplus.net/weather.
+
+-
+Add the file to
Buildings/Resources/weatherdata (or to any directory
+for which you have write permission).
+
+-
+On a console window, type
+ cd Buildings/Resources/weatherdata
+ java -jar ../bin/ConvertWeatherData.jar inputFile.epw
+
+This will generate the weather data file inputFile.mos, which can be read
+by the model
+
+Buildings.BoundaryConditions.WeatherData.ReaderTMY3.
+
+
+
+Location data that are read automatically from the weather data file
+
+The following location data are automatically read from the weather file:
+
+
+-
+The latitude of the weather station,
lat,
+
+-
+the longitude of the weather station,
lon, and
+
+-
+the time zone relative to Greenwich Mean Time,
timZone.
+
+
+
+Wet bulb temperature
+
+By default, the data bus contains the wet bulb temperature.
+This introduces a nonlinear equation.
+However, we have not observed an increase in computing time because
+of this equation.
+To disable the computation of the wet bulb temperature, set
+computeWetBulbTemperature=false.
+
+
+Using constant or user-defined input signals for weather data
+
+This model has the option of using a constant value, using the data from the weather file,
+or using data from an input connector for the following variables:
+
+
+-
+The atmospheric pressure,
+
+-
+the ceiling height,
+
+-
+the total sky cover pressure,
+
+-
+the opaque sky cover pressure,
+
+-
+the dry bulb temperature,
+
+-
+the dew point temperature,
+
+-
+the sky black body temperature,
+
+-
+the relative humidity,
+
+-
+the wind direction,
+
+-
+the wind speed,
+
+-
+the global horizontal radiation, direct normal and diffuse horizontal radiation,
+and
+
+-
+the infrared horizontal radiation.
+
+
+
+By default, all data are obtained from the weather data file,
+except for the atmospheric pressure, which is set to the
+parameter pAtm=101325 Pascals.
+
+
+The parameter *Sou configures the source of the data.
+For the atmospheric pressure, temperatures, relative humidity, wind speed and wind direction,
+the enumeration
+
+Buildings.BoundaryConditions.Types.DataSource
+is used as follows:
+
+
+
+
+ Parameter *Sou
+ |
+ Data used to compute weather data.
+ |
+
+
+
+ |
+ File
+ |
+
+ Use data from file.
+ |
+
+
+
+ |
+ Parameter
+ |
+
+ Use value specified by the parameter.
+ |
+
+
+
+ |
+ Input
+ |
+
+ Use value from the input connector.
+ |
+
+
+
+Because global, diffuse and direct radiation are related to each other, the parameter
+HSou is treated differently.
+It is set to a value of the enumeration
+
+Buildings.BoundaryConditions.Types.RadiationDataSource,
+and allows the following configurations:
+
+
+
+
+ Parameter HSou
+ |
+ Data used to compute weather data.
+ |
+
+
+
+ |
+ File
+ |
+
+ Use data from file.
+ |
+
+
+
+ |
+ Input_HGloHor_HDifHor
+ |
+
+ Use global horizontal and diffuse horizontal radiation from input connector.
+ |
+
+
+ |
+ Input_HDirNor_HDifHor
+ |
+
+ Use direct normal and diffuse horizontal radiation from input connector.
+ |
+
+
+ |
+ Input_HDirNor_HGloHor
+ |
+
+ Use direct normal and global horizontal radiation from input connector.
+ |
+
+
+
+Notes
+
+
+-
+
+In HVAC systems, when the fan is off, changes in atmospheric pressure can cause small air flow rates
+in the duct system due to change in pressure and hence in the mass of air that is stored
+in air volumes (such as in fluid junctions or in the room model).
+This may increase computing time. Therefore, the default value for the atmospheric pressure is set to a constant.
+Furthermore, if the initial pressure of air volumes are different
+from the atmospheric pressure, then fast pressure transients can happen in the first few seconds of the simulation.
+This can cause numerical problems for the solver. To avoid this problem, set the atmospheric pressure to the
+same value as the medium default pressure, which is typically set to the parameter Medium.p_default.
+For medium models for moist air and dry air, the default is
+Medium.p_default=101325 Pascals.
+
+
+-
+
+Different units apply depending on whether data are obtained from a file, or
+from a parameter or an input connector:
+
+
+-
+When using TMY3 data from a file (e.g.
USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.mos), the units must be the same as the original TMY3 file used by EnergyPlus (e.g.
+USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw).
+The TMY3 data used by EnergyPlus are in both SI units and non-SI units.
+If Resources/bin/ConvertWeatherData.jar is used to convert the .epw file to an .mos file, the units of the TMY3 data are preserved and the file can be directly
+used by this data reader.
+The data reader will automatically convert units to the SI units used by Modelica.
+For example, the dry bulb temperature TDryBul in TMY3 is in degree Celsius.
+The data reader will automatically convert the data to Kelvin.
+The wind direction winDir in TMY3 is degrees and will be automatically converted to radians.
+
+-
+When using data from a parameter or from an input connector,
+the data must be in the SI units used by Modelica.
+For instance, the unit must be
+
Pa for pressure,
+K for temperature,
+W/m2 for solar radiations and
+rad for wind direction.
+
+
+
+-
+The ReaderTMY3 should only be used with TMY3 data. It contains a time shift for solar radiation data
+that is explained below. This time shift needs to be removed if the user may want to
+use the ReaderTMY3 for other weather data types.
+
+
+Implementation
+Start and end data for annual weather data files
+
+The TMY3 weather data, as well as the EnergyPlus weather data, start at 1:00 AM
+on January 1, and provide hourly data until midnight on December 31.
+Thus, the first entry for temperatures, humidity, wind speed etc. are values
+at 1:00 AM and not at midnight. Furthermore, the TMY3 weather data files can have
+values at midnight of December 31 that may be significantly different from the values
+at 1:00 AM on January 1.
+Since annual simulations require weather data that start at 0:00 on January 1,
+data need to be provided for this hour. Due to the possibly large change in
+weatherdata between 1:00 AM on January 1 and midnight at December 31,
+the weather data files in the Buildings library do not use the data entry from
+midnight at December 31 as the value for t=0. Rather, the
+value from 1:00 AM on January 1 is duplicated and used for 0:00 on January 1.
+To maintain a data record with 8760 hours, the weather data record from
+midnight at December 31 is deleted.
+These changes in the weather data file are done in the Java program that converts
+EnergyPlus weather data file to Modelica weather data files, and which is described
+below.
+
+Time shift for solar radiation data
+
+To read weather data from the TMY3 weather data file, there are
+two data readers in this model. One data reader obtains all data
+except solar radiation, and the other data reader reads only the
+solar radiation data, shifted by 30 minutes.
+The reason for this time shift is as follows:
+The TMY3 weather data file contains for solar radiation the
+\"...radiation received
+on a horizontal surface during
+the 60-minute period ending at
+the timestamp.\"
+
+Thus, as the figure below shows, a more accurate interpolation is obtained if
+time is shifted by 30 minutes prior to reading the weather data.
+
+
+![\"image\"](\"modelica://Buildings/Resources/Images/BoundaryConditions/WeatherData/RadiationTimeShift.png\")
+
+References
+
+-
+Wilcox S. and W. Marion. Users Manual for TMY3 Data Sets.
+Technical Report, NREL/TP-581-43156, revised May 2008.
+
+
+", revisions="
+
+-
+April 21, 2016, by Michael Wetter:
+Introduced absFilNam to avoid multiple calls to
+
+Buildings.BoundaryConditions.WeatherData.BaseClasses.getAbsolutePath.
+This is for
+Buildings, #506.
+
+-
+January 6, 2016, by Moritz Lauster:
+Changed output radHorIR to HHorIR.
+This is for
+#376.
+
+-
+January 4, 2016, by Moritz Lauster:
+Added a table in documentation with output variables accessible via weaBus.
+This is for
+#376.
+
+-
+December 15, 2015, by Michael Wetter:
+Added the block cheTemBlaSky. This also allows to graphically
+connect the black body sky temperature to the weather bus, which is required
+in Dymola 2016 for the variable weaBus.TBlaSky to appear
+in the graphical editor.
+This is for
+#377.
+
+-
+September 24, 2015, by Marcus Fuchs:
+Replace annotation __Dymola_loadSelector by loadSelector
+for MSL compliancy as reported by @tbeu at
+RWTH-EBC/AixLib#107
+
+-
+June 6, 2015, by Michael Wetter:
+Removed redundant but consistent
+connect(TBlaSkyCom.TBlaSky, weaBus.TBlaSky)
+statement.
+This avoids a warning if
+
+Buildings.BoundaryConditions.SolarIrradiation.BaseClasses.Examples.SkyClearness
+is translated in pedantic mode in Dymola 2016.
+This is for
+#266.
+
+-
+March 26, 2015, by Michael Wetter:
+Added option to obtain the black body sky temperature
+from a parameter or an input signal.
+This is required for
+
+Buildings.Rooms.Validation.MixedAirInitialization.
+
+-
+October 17, 2014, by Michael Wetter:
+Corrected error that led the total and opaque sky cover to be ten times
+too low if its value was obtained from the parameter or the input connector.
+For the standard configuration in which the sky cover is obtained from
+the weather data file, the model was correct. This error only affected
+the other two possible configurations.
+
+-
+September 12, 2014, by Michael Wetter:
+Removed redundant connection connect(conHorRad.HOut, cheHorRad.HIn);.
+
+-
+May 30, 2014, by Michael Wetter:
+Removed undesirable annotation Evaluate=true.
+
+-
+May 5, 2013, by Thierry S. Nouidui:
+Added the option to use a constant, an input signal or the weather file as the source
+for the ceiling height, the total sky cover, the opaque sky cover, the dew point temperature,
+and the infrared horizontal radiation HInfHor.
+
+-
+October 8, 2013, by Michael Wetter:
+Improved the algorithm that determines the absolute path of the file.
+Now weather files are searched in the path specified, and if not found, the urls
+file://, modelica:// and modelica://Buildings
+are added in this order to search for the weather file.
+This allows using the data reader without having to specify an absolute path,
+as long as the Buildings library
+is on the MODELICAPATH.
+This change was implemented in
+
+Buildings.BoundaryConditions.WeatherData.BaseClasses.getAbsolutePath
+and improves this weather data reader.
+
+-
+May 2, 2013, by Michael Wetter:
+Added function call to getAbsolutePath.
+
+-
+October 16, 2012, by Michael Wetter:
+Added computation of the wet bulb temperature.
+Computing the wet bulb temperature introduces a nonlinear
+equation. As we have not observed an increase in computing time
+because of computing the wet bulb temperature, it is computed
+by default. By setting the parameter
+computeWetBulbTemperature=false, the computation of the
+wet bulb temperature can be removed.
+Revised documentation.
+
+-
+August 11, 2012, by Wangda Zuo:
+Renamed radHor to radHorIR and
+improved the optional inputs for radiation data.
+
+-
+July 24, 2012, by Wangda Zuo:
+Corrected the notes of SI unit requirements for input files.
+
+-
+July 13, 2012, by Michael Wetter:
+Removed assignment of HGloHor_in in its declaration,
+because this gives an overdetermined system if the input connector
+is used.
+Removed non-required assignments of attribute displayUnit.
+
+-
+February 25, 2012, by Michael Wetter:
+Added subbus for solar position, which is needed by irradition and
+shading model.
+
+-
+November 29, 2011, by Michael Wetter:
+Fixed wrong display unit for pAtm_in_internal and
+made propagation of parameter final.
+
+-
+October 27, 2011, by Wangda Zuo:
+
+-
+Added optional connectors for dry bulb temperature, relative humidity, wind speed, wind direction, global horizontal radiation, diffuse horizontal radiation.
+
+-
+Separate the unit conversion for TMY3 data and data validity check.
+
+
+
+-
+October 3, 2011, by Michael Wetter:
+Propagated value for sky temperature calculation to make it accessible as a parameter.
+
+-
+July 20, 2011, by Michael Wetter:
+Added the option to use a constant, an input signal or the weather file as the source
+for the atmospheric pressure.
+ -
+March 15, 2011, by Wangda Zuo:
+Delete the wet bulb temperature since it may cause numerical problem.
+
+-
+March 7, 2011, by Wangda Zuo:
+Added wet bulb temperature. Changed reader to read only needed columns.
+Added explanation for 30 minutes shift for radiation data.
+
+-
+March 5, 2011, by Michael Wetter:
+Changed implementation to obtain longitude and time zone directly
+from weather file.
+
+-
+June 25, 2010, by Wangda Zuo:
+First implementation.
+
+
+"),
+ Diagram(coordinateSystem(preserveAspectRatio=false,
+ extent={{-300,-440},{300,300}})));
+ end WeatherCalculator;
+
+ block DateRefTime
+ "Calculates the time of year with reference to a start time of the year for t = 0 in simulation time."
+ extends Modelica.Blocks.Interfaces.SO;
+ parameter Modelica.SIunits.Time refTime = 0;
+
+ equation
+ y = time + refTime;
+ annotation (Icon(graphics={ Rectangle(
+ extent={{-100,-100},{100,100}},
+ lineColor={0,0,127},
+ fillColor={255,255,255},
+ fillPattern=FillPattern.Solid),
+ Ellipse(extent={{-80,80},{80,-80}}, lineColor={160,160,164},
+ fillColor={215,215,215},
+ fillPattern=FillPattern.Solid),
+ Line(points={{0,80},{0,60}}, color={160,160,164}),
+ Line(points={{80,0},{60,0}}, color={160,160,164}),
+ Line(points={{0,-80},{0,-60}}, color={160,160,164}),
+ Line(points={{-80,0},{-60,0}}, color={160,160,164}),
+ Line(points={{37,70},{26,50}}, color={160,160,164}),
+ Line(points={{70,38},{49,26}}, color={160,160,164}),
+ Line(points={{71,-37},{52,-27}}, color={160,160,164}),
+ Line(points={{39,-70},{29,-51}}, color={160,160,164}),
+ Line(points={{-39,-70},{-29,-52}}, color={160,160,164}),
+ Line(points={{-71,-37},{-50,-26}}, color={160,160,164}),
+ Line(points={{-71,37},{-54,28}}, color={160,160,164}),
+ Line(points={{-38,70},{-28,51}}, color={160,160,164}),
+ Line(
+ points={{0,0},{-50,50}},
+ thickness=0.5),
+ Line(
+ points={{0,0},{40,0}},
+ thickness=0.5),
+ Text(
+ extent={{-34,-10},{42,-38}},
+ lineColor={0,0,0},
+ textString="mm/dd")}));
+ end DateRefTime;
+
+ model WeatherProcessor
+ parameter Modelica.SIunits.Angle lon(displayUnit="deg")= -122*3.14159/180
+ "Longitude";
+ parameter Modelica.SIunits.Angle lat(displayUnit="deg")= 38*3.14159/180
+ "Latitude";
+ parameter Modelica.SIunits.Time timZon(displayUnit="h")= -6*3600
+ "Time zone";
+ parameter Modelica.SIunits.Time modTimOffset(displayUnit="s") = 0
+ "Local time at t = 0";
+ WeatherCalculator weaCal(
+ lon=lon,
+ lat=lat,
+ timZon=timZon,
+ modTimOffset=modTimOffset)
+ annotation (Placement(transformation(extent={{-10,-8},{10,12}})));
+ Modelica.Blocks.Interfaces.RealInput weaPAtm "Input pressure"
+ annotation (Placement(transformation(extent={{-380,300},{-340,340}})));
+ Modelica.Blocks.Interfaces.RealInput weaTDewPoi
+ "Input dew point temperature"
+ annotation (Placement(transformation(extent={{-380,240},{-340,280}})));
+ Modelica.Blocks.Interfaces.RealInput weaTDryBul
+ "Input dry bulb temperature"
+ annotation (Placement(transformation(extent={{-380,178},{-340,218}})));
+ Modelica.Blocks.Interfaces.RealInput weaRelHum "Input relative humidity"
+ annotation (Placement(transformation(extent={{-380,118},{-340,158}})));
+ Modelica.Blocks.Interfaces.RealInput weaNOpa "Input opaque sky cover"
+ annotation (Placement(transformation(extent={{-380,58},{-340,98}})));
+ Modelica.Blocks.Interfaces.RealInput weaCelHei "Input ceiling height"
+ annotation (Placement(transformation(extent={{-380,-2},{-340,38}})));
+ Modelica.Blocks.Interfaces.RealInput weaNTot "Input total sky cover"
+ annotation (Placement(transformation(extent={{-380,-60},{-340,-20}})));
+ Modelica.Blocks.Interfaces.RealInput weaWinSpe "Input wind speed"
+ annotation (Placement(transformation(extent={{-380,-120},{-340,-80}})));
+ Modelica.Blocks.Interfaces.RealInput weaWinDir "Input wind direction"
+ annotation (Placement(transformation(extent={{-380,-184},{-340,-144}})));
+ Modelica.Blocks.Interfaces.RealInput weaHHorIR
+ "Input infrared horizontal radiation"
+ annotation (Placement(transformation(extent={{-380,-242},{-340,-202}})));
+ Modelica.Blocks.Interfaces.RealInput weaHDirNor
+ "Input direct normal radiation"
+ annotation (Placement(transformation(extent={{-380,-302},{-340,-262}})));
+ Modelica.Blocks.Interfaces.RealInput weaHGloHor
+ "Input global horizontal radiation"
+ annotation (Placement(transformation(extent={{-380,-360},{-340,-320}})));
+ Modelica.Blocks.Interfaces.RealOutput weaHDifHor
+ annotation (Placement(transformation(extent={{340,310},{360,330}})));
+ Modelica.Blocks.Interfaces.RealOutput weaCloTim
+ annotation (Placement(transformation(extent={{340,68},{360,88}})));
+ Modelica.Blocks.Interfaces.RealOutput weaSolTim
+ annotation (Placement(transformation(extent={{340,8},{360,28}})));
+ Buildings.BoundaryConditions.WeatherData.Bus weaBus "Weather data bus"
+ annotation (Placement(transformation(extent={{36,-8},{56,12}})));
+ Modelica.Blocks.Interfaces.RealOutput weaTBlaSky
+ annotation (Placement(transformation(extent={{340,250},{360,270}})));
+ Modelica.Blocks.Interfaces.RealOutput weaTWetBul
+ annotation (Placement(transformation(extent={{340,190},{360,210}})));
+ Modelica.Blocks.Interfaces.RealOutput weaSolZen
+ annotation (Placement(transformation(extent={{340,130},{360,150}})));
+ equation
+ connect(weaCal.pAtm_in, weaPAtm) annotation (Line(points={{-16,17},{-60,17},
+ {-60,320},{-360,320}}, color={0,0,127}));
+ connect(weaCal.TDewPoi_in, weaTDewPoi) annotation (Line(points={{-16,14},{-62,
+ 14},{-62,260},{-360,260}}, color={0,0,127}));
+ connect(weaCal.TDryBul_in, weaTDryBul) annotation (Line(points={{-16,11},{-64,
+ 11},{-64,198},{-360,198}}, color={0,0,127}));
+ connect(weaCal.relHum_in, weaRelHum) annotation (Line(points={{-16,8},{-66,
+ 8},{-66,138},{-360,138}}, color={0,0,127}));
+ connect(weaCal.opaSkyCov_in, weaNOpa) annotation (Line(points={{-16,5},{-68,
+ 5},{-68,78},{-360,78}}, color={0,0,127}));
+ connect(weaCal.ceiHei_in, weaCelHei) annotation (Line(points={{-16,2},{-70,
+ 2},{-70,18},{-360,18}}, color={0,0,127}));
+ connect(weaCal.totSkyCov_in, weaNTot) annotation (Line(points={{-16,-1},{-70,
+ -1},{-70,-40},{-360,-40}}, color={0,0,127}));
+ connect(weaCal.winSpe_in, weaWinSpe) annotation (Line(points={{-16,-4},{-68,
+ -4},{-68,-100},{-360,-100}}, color={0,0,127}));
+ connect(weaCal.winDir_in, weaWinDir) annotation (Line(points={{-16,-6.9},{-66,
+ -6.9},{-66,-164},{-360,-164}}, color={0,0,127}));
+ connect(weaCal.HInfHor_in, weaHHorIR) annotation (Line(points={{-16,-10},{-64,
+ -10},{-64,-222},{-360,-222}}, color={0,0,127}));
+ connect(weaCal.HDirNor_in, weaHDirNor) annotation (Line(points={{-16,-13},{
+ -36,-13},{-62,-13},{-62,-282},{-360,-282}}, color={0,0,127}));
+ connect(weaCal.HGloHor_in, weaHGloHor) annotation (Line(points={{-16,-16},{
+ -60,-16},{-60,-340},{-360,-340}}, color={0,0,127}));
+ connect(weaCal.weaBus, weaBus) annotation (Line(
+ points={{10,2},{46,2}},
+ color={255,204,51},
+ thickness=0.5), Text(
+ string="%second",
+ index=1,
+ extent={{6,3},{6,3}}));
+ connect(weaBus.HDifHor, weaHDifHor) annotation (Line(
+ points={{46,2},{46,2},{46,320},{350,320}},
+ color={255,204,51},
+ thickness=0.5), Text(
+ string="%first",
+ index=-1,
+ extent={{-6,3},{-6,3}}));
+ connect(weaBus.cloTim, weaCloTim) annotation (Line(
+ points={{46,2},{46,2},{46,78},{350,78}},
+ color={255,204,51},
+ thickness=0.5), Text(
+ string="%first",
+ index=-1,
+ extent={{-6,3},{-6,3}}));
+ connect(weaBus.solTim, weaSolTim) annotation (Line(
+ points={{46,2},{46,2},{46,68},{46,18},{350,18}},
+ color={255,204,51},
+ thickness=0.5), Text(
+ string="%first",
+ index=-1,
+ extent={{-6,3},{-6,3}}));
+ connect(weaBus.TBlaSky, weaTBlaSky) annotation (Line(
+ points={{46,2},{46,2},{46,146},{46,260},{350,260}},
+ color={255,204,51},
+ thickness=0.5), Text(
+ string="%first",
+ index=-1,
+ extent={{-6,3},{-6,3}}));
+ connect(weaBus.TWetBul, weaTWetBul) annotation (Line(
+ points={{46,2},{46,2},{46,126},{46,200},{350,200}},
+ color={255,204,51},
+ thickness=0.5), Text(
+ string="%first",
+ index=-1,
+ extent={{-6,3},{-6,3}}));
+ connect(weaBus.solZen, weaSolZen) annotation (Line(
+ points={{46,2},{46,2},{46,140},{350,140}},
+ color={255,204,51},
+ thickness=0.5), Text(
+ string="%first",
+ index=-1,
+ extent={{-6,3},{-6,3}}));
+ annotation (Icon(coordinateSystem(preserveAspectRatio=false, extent={{-340,
+ -340},{340,340}})),
+ Diagram(coordinateSystem(preserveAspectRatio=false,
+ extent={{-340,-340},{340,340}})));
+ end WeatherProcessor;
+
+ model Wea2Bus
+ Modelica.Blocks.Interfaces.RealInput weaPAtm "Input pressure"
+ annotation (Placement(transformation(extent={{-260,480},{-220,520}})));
+ Modelica.Blocks.Interfaces.RealInput weaTDewPoi
+ "Input dew point temperature"
+ annotation (Placement(transformation(extent={{-260,420},{-220,460}})));
+ Modelica.Blocks.Interfaces.RealInput weaTDryBul
+ "Input dry bulb temperature"
+ annotation (Placement(transformation(extent={{-260,360},{-220,400}})));
+ Modelica.Blocks.Interfaces.RealInput weaRelHum "Input relative humidity"
+ annotation (Placement(transformation(extent={{-260,300},{-220,340}})));
+ Modelica.Blocks.Interfaces.RealInput weaNOpa "Input opaque sky cover"
+ annotation (Placement(transformation(extent={{-260,240},{-220,280}})));
+ Modelica.Blocks.Interfaces.RealInput weaCelHei "Input ceiling height"
+ annotation (Placement(transformation(extent={{-260,180},{-220,220}})));
+ Modelica.Blocks.Interfaces.RealInput weaNTot "Input total sky cover"
+ annotation (Placement(transformation(extent={{-260,120},{-220,160}})));
+ Modelica.Blocks.Interfaces.RealInput weaWinSpe "Input wind speed"
+ annotation (Placement(transformation(extent={{-260,60},{-220,100}})));
+ Modelica.Blocks.Interfaces.RealInput weaWinDir "Input wind direction"
+ annotation (Placement(transformation(extent={{-260,0},{-220,40}})));
+ Modelica.Blocks.Interfaces.RealInput weaHHorIR
+ "Input diffuse horizontal radiation"
+ annotation (Placement(transformation(extent={{-260,-60},{-220,-20}})));
+ Modelica.Blocks.Interfaces.RealInput weaHDirNor
+ "Input infrared horizontal radiation"
+ annotation (Placement(transformation(extent={{-260,-120},{-220,-80}})));
+ Modelica.Blocks.Interfaces.RealInput weaHGloHor
+ "Input direct normal radiation"
+ annotation (Placement(transformation(extent={{-260,-180},{-220,-140}})));
+ Modelica.Blocks.Interfaces.RealInput weaHDifHor
+ "Input global horizontal radiation"
+ annotation (Placement(transformation(extent={{-260,-240},{-220,-200}})));
+ Modelica.Blocks.Interfaces.RealInput weaTBlaSky
+ "Input global horizontal radiation"
+ annotation (Placement(transformation(extent={{-260,-298},{-220,-258}})));
+ Modelica.Blocks.Interfaces.RealInput weaTWetBul
+ "Input global horizontal radiation"
+ annotation (Placement(transformation(extent={{-260,-360},{-220,-320}})));
+ Modelica.Blocks.Interfaces.RealInput weaCloTim
+ "Input global horizontal radiation"
+ annotation (Placement(transformation(extent={{-260,-480},{-220,-440}})));
+ Modelica.Blocks.Interfaces.RealInput weaSolTim
+ "Input global horizontal radiation"
+ annotation (Placement(transformation(extent={{-260,-540},{-220,-500}})));
+ Modelica.Blocks.Interfaces.RealInput weaSolZen
+ "Input global horizontal radiation"
+ annotation (Placement(transformation(extent={{-260,-422},{-220,-382}})));
+ Buildings.BoundaryConditions.WeatherData.Bus weaBus "Weather data bus"
+ annotation (Placement(transformation(extent={{210,-10},{230,10}})));
+ equation
+ connect(weaPAtm, weaBus.pAtm) annotation (Line(points={{-240,500},{-240,500},
+ {-194,500},{-194,0},{220,0}}, color={0,0,127}), Text(
+ string="%second",
+ index=1,
+ extent={{6,3},{6,3}}));
+ connect(weaTDewPoi, weaBus.TDewPoi) annotation (Line(points={{-240,440},{
+ -198,440},{-198,0},{220,0}}, color={0,0,127}), Text(
+ string="%second",
+ index=1,
+ extent={{6,3},{6,3}}));
+ connect(weaTDryBul, weaBus.TDryBul) annotation (Line(points={{-240,380},{
+ -202,380},{-202,0},{220,0}}, color={0,0,127}), Text(
+ string="%second",
+ index=1,
+ extent={{6,3},{6,3}}));
+ connect(weaRelHum, weaBus.relHum) annotation (Line(points={{-240,320},{-190,
+ 320},{-190,0},{220,0}}, color={0,0,127}), Text(
+ string="%second",
+ index=1,
+ extent={{6,3},{6,3}}));
+ connect(weaNOpa, weaBus.nOpa) annotation (Line(points={{-240,260},{-188,260},
+ {-188,0},{220,0}}, color={0,0,127}), Text(
+ string="%second",
+ index=1,
+ extent={{6,3},{6,3}}));
+ connect(weaCelHei, weaBus.celHei) annotation (Line(points={{-240,200},{-184,
+ 200},{-184,0},{220,0}}, color={0,0,127}), Text(
+ string="%second",
+ index=1,
+ extent={{6,3},{6,3}}));
+ connect(weaNTot, weaBus.nTot) annotation (Line(points={{-240,140},{-180,140},
+ {-180,0},{220,0}}, color={0,0,127}), Text(
+ string="%second",
+ index=1,
+ extent={{6,3},{6,3}}));
+ connect(weaWinSpe, weaBus.winSpe) annotation (Line(points={{-240,80},{-176,
+ 80},{-176,0},{220,0}}, color={0,0,127}), Text(
+ string="%second",
+ index=1,
+ extent={{6,3},{6,3}}));
+ connect(weaWinDir, weaBus.winDir) annotation (Line(points={{-240,20},{-240,
+ 22},{-172,22},{-172,0},{220,0}}, color={0,0,127}), Text(
+ string="%second",
+ index=1,
+ extent={{6,3},{6,3}}));
+ connect(weaHHorIR, weaBus.HHorIR) annotation (Line(points={{-240,-40},{-168,
+ -40},{-168,0},{220,0}}, color={0,0,127}), Text(
+ string="%second",
+ index=1,
+ extent={{6,3},{6,3}}));
+ connect(weaHDirNor, weaBus.HDirNor) annotation (Line(points={{-240,-100},{
+ -164,-100},{-164,0},{220,0}}, color={0,0,127}), Text(
+ string="%second",
+ index=1,
+ extent={{6,3},{6,3}}));
+ connect(weaHGloHor, weaBus.HGloHor) annotation (Line(points={{-240,-160},{
+ -202,-160},{-160,-160},{-160,0},{220,0}}, color={0,0,127}), Text(
+ string="%second",
+ index=1,
+ extent={{6,3},{6,3}}));
+ connect(weaHDifHor, weaBus.HDifHor) annotation (Line(points={{-240,-220},{
+ -156,-220},{-156,0},{220,0}}, color={0,0,127}), Text(
+ string="%second",
+ index=1,
+ extent={{6,3},{6,3}}));
+ connect(weaTBlaSky, weaBus.TBlaSky) annotation (Line(points={{-240,-278},{
+ -152,-278},{-152,0},{220,0}}, color={0,0,127}), Text(
+ string="%second",
+ index=1,
+ extent={{6,3},{6,3}}));
+ connect(weaTWetBul, weaBus.TWetBul) annotation (Line(points={{-240,-340},{
+ -148,-340},{-148,0},{220,0}}, color={0,0,127}), Text(
+ string="%second",
+ index=1,
+ extent={{6,3},{6,3}}));
+ connect(weaSolZen, weaBus.solZen) annotation (Line(points={{-240,-402},{
+ -144,-402},{-144,0},{220,0}}, color={0,0,127}), Text(
+ string="%second",
+ index=1,
+ extent={{6,3},{6,3}}));
+ connect(weaCloTim, weaBus.cloTim) annotation (Line(points={{-240,-460},{
+ -138,-460},{-138,0},{220,0}}, color={0,0,127}), Text(
+ string="%second",
+ index=1,
+ extent={{6,3},{6,3}}));
+ connect(weaSolTim, weaBus.solTim) annotation (Line(points={{-240,-520},{
+ -134,-520},{-134,0},{220,0}}, color={0,0,127}), Text(
+ string="%second",
+ index=1,
+ extent={{6,3},{6,3}}));
+ annotation (Icon(coordinateSystem(preserveAspectRatio=false, extent={{-220,
+ -520},{220,520}}), graphics={
+ Rectangle(
+ extent={{-220,520},{220,-520}},
+ lineColor={0,0,0},
+ fillColor={255,255,255},
+ fillPattern=FillPattern.Solid),
+ Line(
+ points={{-198,-2},{2,-2}},
+ color={0,0,126},
+ thickness=0.5),
+ Line(
+ points={{0,-2},{200,-2}},
+ color={255,204,0},
+ thickness=0.5)}), Diagram(coordinateSystem(preserveAspectRatio=
+ false, extent={{-220,-520},{220,520}})));
+ end Wea2Bus;
+
+ package Examples
+
+ model WeatherProcessor
+ import RapidMPC;
+ RapidMPC.BoundaryConditions.WeatherProcessor weatherProcessor(
+ lon(displayUnit="deg") = -1.5344934783534,
+ modTimOffset=0,
+ lat=0.73268921998722,
+ timZon=-21600)
+ annotation (Placement(transformation(extent={{-10,-20},{10,18}})));
+ Buildings.BoundaryConditions.WeatherData.ReaderTMY3 EPW(
+ filNam=
+ "modelica://Buildings/Resources/weatherdata/USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.mos",
+ pAtmSou=Buildings.BoundaryConditions.Types.DataSource.File,
+ ceiHeiSou=Buildings.BoundaryConditions.Types.DataSource.File,
+ TDryBulSou=Buildings.BoundaryConditions.Types.DataSource.File,
+ HSou=Buildings.BoundaryConditions.Types.RadiationDataSource.File)
+ "Weather data"
+ annotation (Placement(transformation(extent={{-98,0},{-62,34}})));
+
+ Buildings.BoundaryConditions.WeatherData.Bus weaBus "Weather data bus"
+ annotation (Placement(transformation(extent={{-48,8},{-28,28}})));
+ equation
+ connect(EPW.weaBus, weaBus) annotation (Line(
+ points={{-62,17},{-54,17},{-54,18},{-38,18}},
+ color={255,204,51},
+ thickness=0.5), Text(
+ string="%second",
+ index=1,
+ extent={{6,3},{6,3}}));
+ connect(weaBus.pAtm, weatherProcessor.weaPAtm) annotation (Line(
+ points={{-38,18},{-10.5882,18},{-10.5882,16.8824}},
+ color={255,204,51},
+ thickness=0.5), Text(
+ string="%first",
+ index=-1,
+ extent={{-6,3},{-6,3}}));
+ connect(weaBus.TDewPoi, weatherProcessor.weaTDewPoi) annotation (Line(
+ points={{-38,18},{-28,18},{-28,13.5294},{-10.5882,13.5294}},
+ color={255,204,51},
+ thickness=0.5), Text(
+ string="%first",
+ index=-1,
+ extent={{-6,3},{-6,3}}));
+ connect(weaBus.TDryBul, weatherProcessor.weaTDryBul) annotation (Line(
+ points={{-38,18},{-28,18},{-28,10.0647},{-10.5882,10.0647}},
+ color={255,204,51},
+ thickness=0.5), Text(
+ string="%first",
+ index=-1,
+ extent={{-6,3},{-6,3}}));
+ connect(weaBus.relHum, weatherProcessor.weaRelHum) annotation (Line(
+ points={{-38,18},{-28,18},{-28,6.71176},{-10.5882,6.71176}},
+ color={255,204,51},
+ thickness=0.5), Text(
+ string="%first",
+ index=-1,
+ extent={{-6,3},{-6,3}}));
+ connect(weaBus.nOpa, weatherProcessor.weaNOpa) annotation (Line(
+ points={{-38,18},{-28,18},{-28,3.35882},{-10.5882,3.35882}},
+ color={255,204,51},
+ thickness=0.5), Text(
+ string="%first",
+ index=-1,
+ extent={{-6,3},{-6,3}}));
+ connect(weaBus.celHei, weatherProcessor.weaCelHei) annotation (Line(
+ points={{-38,18},{-28,18},{-28,0.00588235},{-10.5882,0.00588235}},
+ color={255,204,51},
+ thickness=0.5), Text(
+ string="%first",
+ index=-1,
+ extent={{-6,3},{-6,3}}));
+ connect(weaBus.nTot, weatherProcessor.weaNTot) annotation (Line(
+ points={{-38,18},{-28,18},{-28,-3.23529},{-10.5882,-3.23529}},
+ color={255,204,51},
+ thickness=0.5), Text(
+ string="%first",
+ index=-1,
+ extent={{-6,3},{-6,3}}));
+ connect(weaBus.winSpe, weatherProcessor.weaWinSpe) annotation (Line(
+ points={{-38,18},{-34,18},{-28,18},{-28,-6.58824},{-10.5882,-6.58824}},
+ color={255,204,51},
+ thickness=0.5), Text(
+ string="%first",
+ index=-1,
+ extent={{-6,3},{-6,3}}));
+
+ connect(weaBus.winDir, weatherProcessor.weaWinDir) annotation (Line(
+ points={{-38,18},{-28,18},{-28,-10.1647},{-10.5882,-10.1647}},
+ color={255,204,51},
+ thickness=0.5), Text(
+ string="%first",
+ index=-1,
+ extent={{-6,3},{-6,3}}));
+ connect(weaBus.HHorIR, weatherProcessor.weaHHorIR) annotation (Line(
+ points={{-38,18},{-28,18},{-28,-13.4059},{-10.5882,-13.4059}},
+ color={255,204,51},
+ thickness=0.5), Text(
+ string="%first",
+ index=-1,
+ extent={{-6,3},{-6,3}}));
+ connect(weaBus.HDirNor, weatherProcessor.weaHDirNor) annotation (Line(
+ points={{-38,18},{-28,18},{-28,-16.7588},{-10.5882,-16.7588}},
+ color={255,204,51},
+ thickness=0.5), Text(
+ string="%first",
+ index=-1,
+ extent={{-6,3},{-6,3}}));
+ connect(weaBus.HGloHor, weatherProcessor.weaHGloHor) annotation (Line(
+ points={{-38,18},{-28,18},{-28,-20},{-10.5882,-20}},
+ color={255,204,51},
+ thickness=0.5), Text(
+ string="%first",
+ index=-1,
+ extent={{-6,3},{-6,3}}));
+ annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram(
+ coordinateSystem(preserveAspectRatio=false)));
+ end WeatherProcessor;
+ annotation (Icon(graphics={
+ Rectangle(
+ lineColor={200,200,200},
+ fillColor={248,248,248},
+ fillPattern=FillPattern.HorizontalCylinder,
+ extent={{-100,-100},{100,100}},
+ radius=25.0),
+ Rectangle(
+ lineColor={128,128,128},
+ fillPattern=FillPattern.None,
+ extent={{-100,-100},{100,100}},
+ radius=25.0),
+ Polygon(
+ origin={8,14},
+ lineColor={78,138,73},
+ fillColor={78,138,73},
+ pattern=LinePattern.None,
+ fillPattern=FillPattern.Solid,
+ points={{-58.0,46.0},{42.0,-14.0},{-58.0,-74.0},{-58.0,46.0}})}));
+ end Examples;
+
+ end BoundaryConditions;
+
+ package HVAC "HVAC components"
+ model ConvectiveHeater
+ parameter Real q_max(unit = "W") "Max heater output";
+ parameter Real eff(unit = "1") "Efficiency of heater";
+ Modelica.Thermal.HeatTransfer.Sources.PrescribedHeatFlow prescribedHeatFlow
+ annotation (Placement(transformation(extent={{22,-10},{42,10}})));
+ Modelica.Blocks.Math.Gain gain1(k=q_max)
+ annotation (Placement(transformation(extent={{-38,-10},{-18,10}})));
+ Modelica.Blocks.Interfaces.RealInput u "Input signal connector"
+ annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
+ Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_b HeatOutput
+ annotation (Placement(transformation(extent={{94,-10},{114,10}})));
+ Modelica.Blocks.Interfaces.RealOutput P_e(unit="W")
+ annotation (Placement(transformation(extent={{100,-70},{120,-50}})));
+ Modelica.Blocks.Math.Gain gain2(k=eff)
+ annotation (Placement(transformation(extent={{20,-70},{40,-50}})));
+ equation
+ connect(gain1.y, prescribedHeatFlow.Q_flow)
+ annotation (Line(points={{-17,0},{2.5,0},{22,0}}, color={0,0,127}));
+ connect(gain1.u, u)
+ annotation (Line(points={{-40,0},{-120,0}}, color={0,0,127}));
+ connect(prescribedHeatFlow.port, HeatOutput)
+ annotation (Line(points={{42,0},{104,0}}, color={191,0,0}));
+ connect(gain1.y, gain2.u) annotation (Line(points={{-17,0},{0,0},{0,-60},
+ {18,-60}}, color={0,0,127}));
+ connect(gain2.y, P_e)
+ annotation (Line(points={{41,-60},{110,-60}}, color={0,0,127}));
+ annotation (Icon(coordinateSystem(preserveAspectRatio=false), graphics={
+ Rectangle(
+ extent={{-100,100},{100,-100}},
+ lineColor={0,0,0},
+ fillColor={255,255,255},
+ fillPattern=FillPattern.Solid), Text(
+ extent={{-58,24},{68,-14}},
+ lineColor={0,0,0},
+ fillColor={255,255,255},
+ fillPattern=FillPattern.Solid,
+ textString="ConvectiveHeater")}), Diagram(
+ coordinateSystem(preserveAspectRatio=false)));
+ end ConvectiveHeater;
+ end HVAC;
+
+ package Controllers "Controller components"
+ package HeaterPI
+
+ model PI
+ Modelica.Blocks.Interfaces.RealInput Setpoint
+ annotation (Placement(transformation(extent={{-140,30},{-100,70}})));
+ Modelica.Blocks.Interfaces.RealInput Measurement annotation (Placement(
+ transformation(extent={{-140,-70},{-100,-30}})));
+ Buildings.Controls.Continuous.LimPID conPID(
+ Td=0,
+ k=0.0001,
+ Ti=0.1)
+ annotation (Placement(transformation(extent={{-16,6},{4,26}})));
+ Modelica.Blocks.Interfaces.RealOutput y
+ "Connector of actuator output signal"
+ annotation (Placement(transformation(extent={{100,-10},{120,10}})));
+ equation
+ connect(Setpoint, conPID.u_s) annotation (Line(points={{-120,50},{-52,
+ 50},{-52,16},{-18,16}}, color={0,0,127}));
+ connect(Measurement, conPID.u_m) annotation (Line(points={{-120,-50},{
+ -6,-50},{-6,4}}, color={0,0,127}));
+ connect(conPID.y, y) annotation (Line(points={{5,16},{40,16},{40,0},{74,
+ 0},{110,0}}, color={0,0,127}));
+ annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram(
+ coordinateSystem(preserveAspectRatio=false)));
+ end PI;
+ end HeaterPI;
+
+ model SingleSetpoint
+ parameter Real Setpoint "Temperature setpoint for HVAC";
+ parameter Boolean OnStatus "On-Off Status for HVAC";
+ Modelica.Blocks.Sources.Constant const(k=Setpoint)
+ annotation (Placement(transformation(extent={{-100,80},{-80,100}})));
+ HeaterPI.PI wes
+ annotation (Placement(transformation(extent={{0,30},{20,50}})));
+ HeaterPI.PI hal
+ annotation (Placement(transformation(extent={{0,-10},{20,10}})));
+ HeaterPI.PI eas
+ annotation (Placement(transformation(extent={{0,-50},{20,-30}})));
+ Modelica.Blocks.Interfaces.RealOutput y_wes
+ "Connector of actuator output signal"
+ annotation (Placement(transformation(extent={{100,30},{120,50}})));
+ Modelica.Blocks.Interfaces.RealOutput y_hal
+ "Connector of actuator output signal"
+ annotation (Placement(transformation(extent={{100,-10},{120,10}})));
+ Modelica.Blocks.Interfaces.RealOutput y_eas
+ "Connector of actuator output signal"
+ annotation (Placement(transformation(extent={{100,-50},{120,-30}})));
+ Modelica.Blocks.Interfaces.RealInput meaTDryBul_wes
+ annotation (Placement(transformation(extent={{-140,40},{-100,80}})));
+ Modelica.Blocks.Interfaces.RealInput meaTDryBul_hal
+ annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
+ Modelica.Blocks.Interfaces.RealInput meaTDryBul_eas
+ annotation (Placement(transformation(extent={{-140,-80},{-100,-40}})));
+ Modelica.Blocks.Logical.Switch switch1
+ annotation (Placement(transformation(extent={{-60,66},{-40,86}})));
+ Modelica.Blocks.Sources.BooleanConstant OnOffStatus(k=OnStatus)
+ annotation (Placement(transformation(extent={{-100,20},{-80,40}})));
+ Modelica.Blocks.Logical.Switch switch2
+ annotation (Placement(transformation(extent={{-60,20},{-40,40}})));
+ Modelica.Blocks.Logical.Switch switch3
+ annotation (Placement(transformation(extent={{-60,-40},{-40,-20}})));
+ Modelica.Blocks.Logical.Switch switch4
+ annotation (Placement(transformation(extent={{40,50},{60,70}})));
+ Modelica.Blocks.Logical.Switch switch5
+ annotation (Placement(transformation(extent={{40,10},{60,30}})));
+ Modelica.Blocks.Logical.Switch switch6
+ annotation (Placement(transformation(extent={{40,-30},{60,-10}})));
+ Modelica.Blocks.Sources.Constant const1(k=0)
+ annotation (Placement(transformation(extent={{0,80},{20,100}})));
+ equation
+ connect(wes.Measurement, meaTDryBul_wes) annotation (Line(points={{-2,35},{-10,35},
+ {-10,34},{-18,34},{-18,60},{-120,60}}, color={0,0,127}));
+ connect(hal.Measurement, meaTDryBul_hal) annotation (Line(points={{-2,-5},
+ {-52,-5},{-52,0},{-120,0}}, color={0,0,127}));
+ connect(eas.Measurement, meaTDryBul_eas) annotation (Line(points={{-2,-45},
+ {-50,-45},{-50,-60},{-120,-60}}, color={0,0,127}));
+ connect(const.y, switch1.u1) annotation (Line(points={{-79,90},{-66,90},{-66,84},
+ {-62,84}}, color={0,0,127}));
+ connect(meaTDryBul_wes, switch1.u3) annotation (Line(points={{-120,60},{-120,60},
+ {-66,60},{-66,68},{-62,68}}, color={0,0,127}));
+ connect(const.y, switch2.u1) annotation (Line(points={{-79,90},{-74,90},{-74,38},
+ {-62,38}}, color={0,0,127}));
+ connect(OnOffStatus.y, switch2.u2)
+ annotation (Line(points={{-79,30},{-62,30}}, color={255,0,255}));
+ connect(OnOffStatus.y, switch1.u2) annotation (Line(points={{-79,30},{-70,30},
+ {-70,76},{-62,76}}, color={255,0,255}));
+ connect(const.y, switch3.u1) annotation (Line(points={{-79,90},{-74,90},{-74,-22},
+ {-62,-22}}, color={0,0,127}));
+ connect(OnOffStatus.y, switch3.u2) annotation (Line(points={{-79,30},{-70,30},
+ {-70,-30},{-62,-30}}, color={255,0,255}));
+ connect(meaTDryBul_hal, switch2.u3) annotation (Line(points={{-120,0},{-66,0},
+ {-66,22},{-62,22}}, color={0,0,127}));
+ connect(meaTDryBul_eas, switch3.u3) annotation (Line(points={{-120,-60},{-96,-60},
+ {-66,-60},{-66,-38},{-62,-38}}, color={0,0,127}));
+ connect(switch1.y, wes.Setpoint) annotation (Line(points={{-39,76},{-22,76},{-22,
+ 45},{-2,45}}, color={0,0,127}));
+ connect(switch2.y, hal.Setpoint) annotation (Line(points={{-39,30},{-22,30},{-22,
+ 5},{-2,5}}, color={0,0,127}));
+ connect(switch3.y, eas.Setpoint) annotation (Line(points={{-39,-30},{-22,-30},
+ {-22,-35},{-2,-35}}, color={0,0,127}));
+ connect(const1.y, switch4.u3) annotation (Line(points={{21,90},{30,90},{30,52},
+ {38,52}}, color={0,0,127}));
+ connect(const1.y, switch5.u3) annotation (Line(points={{21,90},{30,90},{30,12},
+ {38,12}}, color={0,0,127}));
+ connect(const1.y, switch6.u3) annotation (Line(points={{21,90},{30,90},{30,-28},
+ {38,-28}}, color={0,0,127}));
+ connect(OnOffStatus.y, switch5.u2) annotation (Line(points={{-79,30},{-70,30},
+ {-70,16},{16,16},{16,20},{38,20}}, color={255,0,255}));
+ connect(OnOffStatus.y, switch4.u2) annotation (Line(points={{-79,30},{-70,30},
+ {-70,16},{16,16},{16,20},{26,20},{26,60},{38,60}}, color={255,0,255}));
+ connect(OnOffStatus.y, switch6.u2) annotation (Line(points={{-79,30},{-70,30},
+ {-70,16},{16,16},{16,20},{26,20},{26,-20},{38,-20}}, color={255,0,255}));
+ connect(wes.y, switch4.u1) annotation (Line(points={{21,40},{24,40},{24,68},{38,
+ 68}}, color={0,0,127}));
+ connect(hal.y, switch5.u1)
+ annotation (Line(points={{21,0},{24,0},{24,28},{38,28}}, color={0,0,127}));
+ connect(eas.y, switch6.u1) annotation (Line(points={{21,-40},{24,-40},{24,-12},
+ {38,-12}}, color={0,0,127}));
+ connect(switch4.y, y_wes) annotation (Line(points={{61,60},{80,60},{80,40},{110,
+ 40}}, color={0,0,127}));
+ connect(switch5.y, y_hal) annotation (Line(points={{61,20},{80,20},{80,0},{110,
+ 0}}, color={0,0,127}));
+ connect(switch6.y, y_eas) annotation (Line(points={{61,-20},{80,-20},{80,-40},
+ {110,-40}}, color={0,0,127}));
+ annotation (Icon(coordinateSystem(preserveAspectRatio=false), graphics={
+ Rectangle(
+ extent={{-100,100},{100,-100}},
+ lineColor={0,0,0},
+ fillColor={255,255,255},
+ fillPattern=FillPattern.Solid), Text(
+ extent={{-54,54},{66,-32}},
+ lineColor={0,0,0},
+ fillColor={255,255,255},
+ fillPattern=FillPattern.Solid,
+ textString="Single Setpoint")}), Diagram(
+ coordinateSystem(preserveAspectRatio=false)));
+ end SingleSetpoint;
+
+ model DualSetpoint
+ parameter Real Setpoint "Temperature setpoint for HVAC";
+ parameter Real Setback "Temperature setback for HVAC";
+ parameter Boolean OnStatus "On-Off Status for HVAC";
+ Modelica.Blocks.Sources.Pulse const(
+ amplitude=Setback,
+ period=24*3600,
+ offset=Setpoint - Setback,
+ width=11/24*100,
+ startTime=6*3600)
+ annotation (Placement(transformation(extent={{-100,80},{-80,100}})));
+ HeaterPI.PI wes
+ annotation (Placement(transformation(extent={{0,30},{20,50}})));
+ HeaterPI.PI hal
+ annotation (Placement(transformation(extent={{0,-10},{20,10}})));
+ HeaterPI.PI eas
+ annotation (Placement(transformation(extent={{0,-50},{20,-30}})));
+ Modelica.Blocks.Interfaces.RealOutput y_wes
+ "Connector of actuator output signal"
+ annotation (Placement(transformation(extent={{100,30},{120,50}})));
+ Modelica.Blocks.Interfaces.RealOutput y_hal
+ "Connector of actuator output signal"
+ annotation (Placement(transformation(extent={{100,-10},{120,10}})));
+ Modelica.Blocks.Interfaces.RealOutput y_eas
+ "Connector of actuator output signal"
+ annotation (Placement(transformation(extent={{100,-50},{120,-30}})));
+ Modelica.Blocks.Interfaces.RealInput meaTDryBul_wes
+ annotation (Placement(transformation(extent={{-140,40},{-100,80}})));
+ Modelica.Blocks.Interfaces.RealInput meaTDryBul_hal
+ annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
+ Modelica.Blocks.Interfaces.RealInput meaTDryBul_eas
+ annotation (Placement(transformation(extent={{-140,-80},{-100,-40}})));
+ Modelica.Blocks.Logical.Switch switch1
+ annotation (Placement(transformation(extent={{-60,66},{-40,86}})));
+ Modelica.Blocks.Sources.BooleanConstant OnOffStatus(k=OnStatus)
+ annotation (Placement(transformation(extent={{-100,20},{-80,40}})));
+ Modelica.Blocks.Logical.Switch switch2
+ annotation (Placement(transformation(extent={{-60,20},{-40,40}})));
+ Modelica.Blocks.Logical.Switch switch3
+ annotation (Placement(transformation(extent={{-60,-40},{-40,-20}})));
+ Modelica.Blocks.Logical.Switch switch4
+ annotation (Placement(transformation(extent={{40,50},{60,70}})));
+ Modelica.Blocks.Logical.Switch switch5
+ annotation (Placement(transformation(extent={{40,10},{60,30}})));
+ Modelica.Blocks.Logical.Switch switch6
+ annotation (Placement(transformation(extent={{40,-30},{60,-10}})));
+ Modelica.Blocks.Sources.Constant const1(k=0)
+ annotation (Placement(transformation(extent={{0,80},{20,100}})));
+ equation
+ connect(wes.Measurement, meaTDryBul_wes) annotation (Line(points={{-2,35},{-10,35},
+ {-10,34},{-18,34},{-18,60},{-120,60}}, color={0,0,127}));
+ connect(hal.Measurement, meaTDryBul_hal) annotation (Line(points={{-2,-5},
+ {-52,-5},{-52,0},{-120,0}}, color={0,0,127}));
+ connect(eas.Measurement, meaTDryBul_eas) annotation (Line(points={{-2,-45},
+ {-50,-45},{-50,-60},{-120,-60}}, color={0,0,127}));
+ connect(const.y, switch1.u1) annotation (Line(points={{-79,90},{-66,90},{-66,84},
+ {-62,84}}, color={0,0,127}));
+ connect(meaTDryBul_wes, switch1.u3) annotation (Line(points={{-120,60},{-120,60},
+ {-66,60},{-66,68},{-62,68}}, color={0,0,127}));
+ connect(const.y, switch2.u1) annotation (Line(points={{-79,90},{-74,90},{-74,38},
+ {-62,38}}, color={0,0,127}));
+ connect(OnOffStatus.y, switch2.u2)
+ annotation (Line(points={{-79,30},{-62,30}}, color={255,0,255}));
+ connect(OnOffStatus.y, switch1.u2) annotation (Line(points={{-79,30},{-70,30},
+ {-70,76},{-62,76}}, color={255,0,255}));
+ connect(const.y, switch3.u1) annotation (Line(points={{-79,90},{-74,90},{-74,-22},
+ {-62,-22}}, color={0,0,127}));
+ connect(OnOffStatus.y, switch3.u2) annotation (Line(points={{-79,30},{-70,30},
+ {-70,-30},{-62,-30}}, color={255,0,255}));
+ connect(meaTDryBul_hal, switch2.u3) annotation (Line(points={{-120,0},{-66,0},
+ {-66,22},{-62,22}}, color={0,0,127}));
+ connect(meaTDryBul_eas, switch3.u3) annotation (Line(points={{-120,-60},{-96,-60},
+ {-66,-60},{-66,-38},{-62,-38}}, color={0,0,127}));
+ connect(switch1.y, wes.Setpoint) annotation (Line(points={{-39,76},{-22,76},{-22,
+ 45},{-2,45}}, color={0,0,127}));
+ connect(switch2.y, hal.Setpoint) annotation (Line(points={{-39,30},{-22,30},{-22,
+ 5},{-2,5}}, color={0,0,127}));
+ connect(switch3.y, eas.Setpoint) annotation (Line(points={{-39,-30},{-22,-30},
+ {-22,-35},{-2,-35}}, color={0,0,127}));
+ connect(const1.y, switch4.u3) annotation (Line(points={{21,90},{30,90},{30,52},
+ {38,52}}, color={0,0,127}));
+ connect(const1.y, switch5.u3) annotation (Line(points={{21,90},{30,90},{30,12},
+ {38,12}}, color={0,0,127}));
+ connect(const1.y, switch6.u3) annotation (Line(points={{21,90},{30,90},{30,-28},
+ {38,-28}}, color={0,0,127}));
+ connect(OnOffStatus.y, switch5.u2) annotation (Line(points={{-79,30},{-70,30},
+ {-70,16},{16,16},{16,20},{38,20}}, color={255,0,255}));
+ connect(OnOffStatus.y, switch4.u2) annotation (Line(points={{-79,30},{-70,30},
+ {-70,16},{16,16},{16,20},{26,20},{26,60},{38,60}}, color={255,0,255}));
+ connect(OnOffStatus.y, switch6.u2) annotation (Line(points={{-79,30},{-70,30},
+ {-70,16},{16,16},{16,20},{26,20},{26,-20},{38,-20}}, color={255,0,255}));
+ connect(wes.y, switch4.u1) annotation (Line(points={{21,40},{24,40},{24,68},{38,
+ 68}}, color={0,0,127}));
+ connect(hal.y, switch5.u1)
+ annotation (Line(points={{21,0},{24,0},{24,28},{38,28}}, color={0,0,127}));
+ connect(eas.y, switch6.u1) annotation (Line(points={{21,-40},{24,-40},{24,-12},
+ {38,-12}}, color={0,0,127}));
+ connect(switch4.y, y_wes) annotation (Line(points={{61,60},{80,60},{80,40},{110,
+ 40}}, color={0,0,127}));
+ connect(switch5.y, y_hal) annotation (Line(points={{61,20},{80,20},{80,0},{110,
+ 0}}, color={0,0,127}));
+ connect(switch6.y, y_eas) annotation (Line(points={{61,-20},{80,-20},{80,-40},
+ {110,-40}}, color={0,0,127}));
+ annotation (Icon(coordinateSystem(preserveAspectRatio=false), graphics={
+ Rectangle(
+ extent={{-100,100},{100,-100}},
+ lineColor={0,0,0},
+ fillColor={255,255,255},
+ fillPattern=FillPattern.Solid), Text(
+ extent={{-54,54},{66,-32}},
+ lineColor={0,0,0},
+ fillColor={255,255,255},
+ fillPattern=FillPattern.Solid,
+ textString="Dual Setpoint")}), Diagram(
+ coordinateSystem(preserveAspectRatio=false)));
+ end DualSetpoint;
+ end Controllers;
+
+ package Units
+ type HeatCapacityCoefficient = Real (final quantity="HeatCapacityCoefficient", final unit="J/(m2.K)");
+ type HeatResistanceCoefficient = Real (final quantity="HeatResistanceCoefficient", final unit="(m2.K)/W");
+ end Units;
+
+ model MPC_initialize
+ MPC mpc_model(
+ exteas.r_out=0.3,
+ exteas.r_zon=2.99999863004,
+ eas.r_int=0.104288735058,
+ eas.c_zon=2999.99933775,
+ wes.c_zon=2999.99943887,
+ winwes.g=0.15684379921,
+ extwes.abs=0.999997445163,
+ hal.c_zon=2000.00039662,
+ hal.c_int=50000.0,
+ wineas.g=0.333611340388,
+ extwes.r_zon=2.99999970483,
+ extwes.r_out=0.299999999913,
+ adjeas.r_adj=0.180944874275,
+ adjwes.c_bou=8707.05430515,
+ wes.r_int=0.115356613889,
+ wes.c_int=93704.3606751,
+ exteas.c_bou=40000.0,
+ exteas.abs=0.999999921006,
+ adjeas.r_zon=0.05,
+ extwes.c_bou=40000.0,
+ eas.c_int=104280.645348,
+ hal.r_int=0.0500000041872,
+ wineas.r_win=0.494813454981,
+ lat=0.732689219987,
+ adjeas.c_bou=24999.9937606,
+ adjwes.r_adj=0.899999980905,
+ adjwes.r_zon=0.899999975367,
+ winwes.r_win=0.666672546176);
+ input Real conHeat_eas= mpc_model.conHeat_eas;
+ input Real conHeat_hal= mpc_model.conHeat_hal;
+ input Real conHeat_wes= mpc_model.conHeat_wes;
+ input Real intCon_eas= mpc_model.intCon_eas;
+ input Real intCon_hal= mpc_model.intCon_hal;
+ input Real intCon_wes= mpc_model.intCon_wes;
+ input Real intLat_eas= mpc_model.intLat_eas;
+ input Real intLat_hal= mpc_model.intLat_hal;
+ input Real intLat_wes= mpc_model.intLat_wes;
+ input Real intRad_eas= mpc_model.intRad_eas;
+ input Real intRad_hal= mpc_model.intRad_hal;
+ input Real intRad_wes= mpc_model.intRad_wes;
+ input Real weaCelHei= mpc_model.weaCelHei;
+ input Real weaCloTim= mpc_model.weaCloTim;
+ input Real weaHDifHor= mpc_model.weaHDifHor;
+ input Real weaHDirNor= mpc_model.weaHDirNor;
+ input Real weaHGloHor= mpc_model.weaHGloHor;
+ input Real weaHHorIR= mpc_model.weaHHorIR;
+ input Real weaNOpa= mpc_model.weaNOpa;
+ input Real weaNTot= mpc_model.weaNTot;
+ input Real weaPAtm= mpc_model.weaPAtm;
+ input Real weaRelHum= mpc_model.weaRelHum;
+ input Real weaSolTim= mpc_model.weaSolTim;
+ input Real weaSolZen= mpc_model.weaSolZen;
+ input Real weaTBlaSky= mpc_model.weaTBlaSky;
+ input Real weaTDewPoi= mpc_model.weaTDewPoi;
+ input Real weaTDryBul= mpc_model.weaTDryBul;
+ input Real weaTWetBul= mpc_model.weaTWetBul;
+ input Real weaWinDir= mpc_model.weaWinDir;
+ input Real weaWinSpe= mpc_model.weaWinSpe;
+ Real J(start = 0, fixed=true);
+ equation
+ der(J) = mpc_model.Ptot;
+ end MPC_initialize;
+
+ optimization MPC_optimize (objective = (J(finalTime)), startTime=start_time, finalTime=final_time)
+ extends MPC_initialize;
+ parameter Real start_time = 0;
+ parameter Real final_time = 86400;
+ input Real conHeat_wes_GTE;
+ input Real conHeat_wes_LTE;
+ input Real wesTdb_LTE;
+ input Real wesTdb_GTE;
+ input Real wesTdb_dGTE;
+ input Real wesTdb_dLTE;
+ input Real easTdb_dGTE;
+ input Real easTdb_dLTE;
+ input Real easTdb_LTE;
+ input Real easTdb_GTE;
+ input Real halTdb_dGTE;
+ input Real halTdb_dLTE;
+ input Real halTdb_LTE;
+ input Real halTdb_GTE;
+ input Real conHeat_eas_GTE;
+ input Real conHeat_eas_LTE;
+ input Real conHeat_hal_GTE;
+ input Real conHeat_hal_LTE;
+ constraint
+ mpc_model.conHeat_wes >= conHeat_wes_GTE;
+ mpc_model.conHeat_wes <= conHeat_wes_LTE;
+ mpc_model.wesTdb(startTime)=mpc_model.wesTdb(finalTime);
+ mpc_model.wesTdb <= wesTdb_LTE;
+ mpc_model.wesTdb >= wesTdb_GTE;
+ der(mpc_model.wesTdb) >= wesTdb_dGTE;
+ der(mpc_model.wesTdb) <= wesTdb_dLTE;
+ der(mpc_model.easTdb) >= easTdb_dGTE;
+ mpc_model.easTdb(startTime)=mpc_model.easTdb(finalTime);
+ der(mpc_model.easTdb) <= easTdb_dLTE;
+ mpc_model.easTdb <= easTdb_LTE;
+ mpc_model.easTdb >= easTdb_GTE;
+ der(mpc_model.halTdb) >= halTdb_dGTE;
+ mpc_model.halTdb(startTime)=mpc_model.halTdb(finalTime);
+ der(mpc_model.halTdb) <= halTdb_dLTE;
+ mpc_model.halTdb <= halTdb_LTE;
+ mpc_model.halTdb >= halTdb_GTE;
+ mpc_model.conHeat_eas >= conHeat_eas_GTE;
+ mpc_model.conHeat_eas <= conHeat_eas_LTE;
+ mpc_model.conHeat_hal >= conHeat_hal_GTE;
+ mpc_model.conHeat_hal <= conHeat_hal_LTE;
+ end MPC_optimize;
+end LBNL71T_MPC;
diff --git a/resources/model/LBNL71T_Parameters.csv b/unittests/resources/model/LBNL71T_Parameters.csv
similarity index 100%
rename from resources/model/LBNL71T_Parameters.csv
rename to unittests/resources/model/LBNL71T_Parameters.csv
diff --git a/resources/model/Simple.mo b/unittests/resources/model/Simple.mo
similarity index 100%
rename from resources/model/Simple.mo
rename to unittests/resources/model/Simple.mo
diff --git a/unittests/resources/model/Simple.mop b/unittests/resources/model/Simple.mop
new file mode 100644
index 0000000..ffc3bc3
--- /dev/null
+++ b/unittests/resources/model/Simple.mop
@@ -0,0 +1,152 @@
+package Simple "A package containing simple examples"
+ model RC "A simple RC network for example purposes"
+ Modelica.Thermal.HeatTransfer.Sources.PrescribedTemperature
+ prescribedTemperature
+ annotation (Placement(transformation(extent={{-40,0},{-20,20}})));
+ Modelica.Thermal.HeatTransfer.Sensors.TemperatureSensor temperatureSensor
+ annotation (Placement(transformation(extent={{70,0},{90,20}})));
+ Modelica.Blocks.Sources.Sine Tamb(
+ amplitude=10,
+ offset=278.15,
+ freqHz=1/(24*3600))
+ annotation (Placement(transformation(extent={{-80,0},{-60,20}})));
+ Modelica.Thermal.HeatTransfer.Sources.PrescribedHeatFlow prescribedHeatFlow
+ annotation (Placement(transformation(extent={{-18,-40},{2,-20}})));
+ Modelica.Blocks.Interfaces.RealOutput T_db
+ "Absolute temperature as output signal"
+ annotation (Placement(transformation(extent={{100,0},{120,20}})));
+ Modelica.Blocks.Interfaces.RealInput q_flow(unit="W")
+ annotation (Placement(transformation(extent={{-140,-50},{-100,-10}})));
+ Modelica.Thermal.HeatTransfer.Components.HeatCapacitor heatCapacitor(C=1e5)
+ annotation (Placement(transformation(extent={{20,10},{40,30}})));
+ Modelica.Thermal.HeatTransfer.Components.ThermalResistor thermalResistor(R=
+ 0.01) annotation (Placement(transformation(extent={{-10,0},{10,20}})));
+ equation
+ connect(temperatureSensor.T,T_db)
+ annotation (Line(points={{90,10},{110,10}}, color={0,0,127}));
+ connect(Tamb.y,prescribedTemperature. T)
+ annotation (Line(points={{-59,10},{-42,10}},
+ color={0,0,127}));
+ connect(prescribedHeatFlow.Q_flow,q_flow)
+ annotation (Line(points={{-18,-30},{-120,-30}}, color={0,0,127}));
+ connect(heatCapacitor.port, temperatureSensor.port)
+ annotation (Line(points={{30,10},{50,10},{70,10}}, color={191,0,0}));
+ connect(heatCapacitor.port, prescribedHeatFlow.port)
+ annotation (Line(points={{30,10},{30,-30},{2,-30}}, color={191,0,0}));
+ connect(prescribedTemperature.port, thermalResistor.port_a)
+ annotation (Line(points={{-20,10},{-16,10},{-10,10}}, color={191,0,0}));
+ connect(thermalResistor.port_b, heatCapacitor.port)
+ annotation (Line(points={{10,10},{20,10},{30,10}}, color={191,0,0}));
+ annotation ();
+ end RC;
+
+ model RC_noinputs "A simple RC network for example purposes with no inputs"
+ Modelica.Thermal.HeatTransfer.Sources.PrescribedTemperature
+ prescribedTemperature
+ annotation (Placement(transformation(extent={{-40,0},{-20,20}})));
+ Modelica.Thermal.HeatTransfer.Sensors.TemperatureSensor temperatureSensor
+ annotation (Placement(transformation(extent={{70,0},{90,20}})));
+ Modelica.Blocks.Sources.Sine Tamb(
+ amplitude=10,
+ offset=278.15,
+ freqHz=1/(24*3600))
+ annotation (Placement(transformation(extent={{-80,0},{-60,20}})));
+ Modelica.Thermal.HeatTransfer.Sources.PrescribedHeatFlow prescribedHeatFlow
+ annotation (Placement(transformation(extent={{-18,-40},{2,-20}})));
+ Modelica.Blocks.Interfaces.RealOutput T_db
+ "Absolute temperature as output signal"
+ annotation (Placement(transformation(extent={{100,0},{120,20}})));
+ Modelica.Thermal.HeatTransfer.Components.HeatCapacitor heatCapacitor(C=1e5)
+ annotation (Placement(transformation(extent={{20,10},{40,30}})));
+ Modelica.Thermal.HeatTransfer.Components.ThermalResistor thermalResistor(R=
+ 0.01) annotation (Placement(transformation(extent={{-10,0},{10,20}})));
+ Modelica.Blocks.Sources.Step q_flow(
+ height=10,
+ offset=0,
+ startTime=7200)
+ annotation (Placement(transformation(extent={{-80,-40},{-60,-20}})));
+ equation
+ connect(temperatureSensor.T,T_db)
+ annotation (Line(points={{90,10},{110,10}}, color={0,0,127}));
+ connect(Tamb.y,prescribedTemperature. T)
+ annotation (Line(points={{-59,10},{-42,10}},
+ color={0,0,127}));
+ connect(heatCapacitor.port, temperatureSensor.port)
+ annotation (Line(points={{30,10},{50,10},{70,10}}, color={191,0,0}));
+ connect(heatCapacitor.port, prescribedHeatFlow.port)
+ annotation (Line(points={{30,10},{30,-30},{2,-30}}, color={191,0,0}));
+ connect(prescribedTemperature.port, thermalResistor.port_a)
+ annotation (Line(points={{-20,10},{-16,10},{-10,10}}, color={191,0,0}));
+ connect(thermalResistor.port_b, heatCapacitor.port)
+ annotation (Line(points={{10,10},{20,10},{30,10}}, color={191,0,0}));
+ connect(prescribedHeatFlow.Q_flow, q_flow.y)
+ annotation (Line(points={{-18,-30},{-59,-30}}, color={0,0,127}));
+ end RC_noinputs;
+
+ package SubPackage
+ model RC "A simple RC network for example purposes"
+ Modelica.Thermal.HeatTransfer.Sources.PrescribedTemperature
+ prescribedTemperature
+ annotation (Placement(transformation(extent={{-40,0},{-20,20}})));
+ Modelica.Thermal.HeatTransfer.Sensors.TemperatureSensor temperatureSensor
+ annotation (Placement(transformation(extent={{70,0},{90,20}})));
+ Modelica.Blocks.Sources.Sine Tamb(
+ amplitude=10,
+ offset=278.15,
+ freqHz=1/(24*3600))
+ annotation (Placement(transformation(extent={{-80,0},{-60,20}})));
+ Modelica.Thermal.HeatTransfer.Sources.PrescribedHeatFlow prescribedHeatFlow
+ annotation (Placement(transformation(extent={{-18,-40},{2,-20}})));
+ Modelica.Blocks.Interfaces.RealOutput T_db
+ "Absolute temperature as output signal"
+ annotation (Placement(transformation(extent={{100,0},{120,20}})));
+ Modelica.Blocks.Interfaces.RealInput q_flow(unit="W")
+ annotation (Placement(transformation(extent={{-140,-50},{-100,-10}})));
+ Modelica.Thermal.HeatTransfer.Components.HeatCapacitor heatCapacitor(C=1e5)
+ annotation (Placement(transformation(extent={{20,10},{40,30}})));
+ Modelica.Thermal.HeatTransfer.Components.ThermalResistor thermalResistor(R=
+ 0.01) annotation (Placement(transformation(extent={{-10,0},{10,20}})));
+ equation
+ connect(temperatureSensor.T,T_db)
+ annotation (Line(points={{90,10},{110,10}}, color={0,0,127}));
+ connect(Tamb.y,prescribedTemperature. T)
+ annotation (Line(points={{-59,10},{-42,10}},
+ color={0,0,127}));
+ connect(prescribedHeatFlow.Q_flow,q_flow)
+ annotation (Line(points={{-18,-30},{-120,-30}}, color={0,0,127}));
+ connect(heatCapacitor.port, temperatureSensor.port)
+ annotation (Line(points={{30,10},{50,10},{70,10}}, color={191,0,0}));
+ connect(heatCapacitor.port, prescribedHeatFlow.port)
+ annotation (Line(points={{30,10},{30,-30},{2,-30}}, color={191,0,0}));
+ connect(prescribedTemperature.port, thermalResistor.port_a)
+ annotation (Line(points={{-20,10},{-16,10},{-10,10}}, color={191,0,0}));
+ connect(thermalResistor.port_b, heatCapacitor.port)
+ annotation (Line(points={{10,10},{20,10},{30,10}}, color={191,0,0}));
+ annotation ();
+ end RC;
+ end SubPackage;
+
+ model RC_initialize
+ RC mpc_model(
+ heatCapacitor.C=3000000);
+ input Real q_flow= mpc_model.q_flow;
+ input Real pi_e;
+ Real J(start = 0, fixed=true);
+ equation
+ der(J) = mpc_model.q_flow*pi_e;
+ end RC_initialize;
+
+ optimization RC_optimize (objective = (J(finalTime)), startTime=start_time, finalTime=final_time)
+ extends RC_initialize;
+ parameter Real start_time = 0;
+ parameter Real final_time = 86400;
+ input Real T_db_GTE;
+ input Real T_db_LTE;
+ input Real q_flow_GTE;
+ constraint
+ mpc_model.T_db(startTime)=295.0;
+ mpc_model.T_db >= T_db_GTE;
+ mpc_model.T_db <= T_db_LTE;
+ mpc_model.q_flow >= q_flow_GTE;
+ end RC_optimize;
+end Simple;
diff --git a/resources/model/SimpleRC_Input.csv b/unittests/resources/model/SimpleRC_Input.csv
similarity index 100%
rename from resources/model/SimpleRC_Input.csv
rename to unittests/resources/model/SimpleRC_Input.csv
diff --git a/resources/model/SimpleRC_Parameters.csv b/unittests/resources/model/SimpleRC_Parameters.csv
similarity index 100%
rename from resources/model/SimpleRC_Parameters.csv
rename to unittests/resources/model/SimpleRC_Parameters.csv
diff --git a/resources/optimization/ControlCSV.csv b/unittests/resources/optimization/ControlCSV.csv
similarity index 100%
rename from resources/optimization/ControlCSV.csv
rename to unittests/resources/optimization/ControlCSV.csv
diff --git a/resources/optimization/PriceCSV.csv b/unittests/resources/optimization/PriceCSV.csv
similarity index 100%
rename from resources/optimization/PriceCSV.csv
rename to unittests/resources/optimization/PriceCSV.csv
diff --git a/resources/optimization/SimpleRC_Constraints.csv b/unittests/resources/optimization/SimpleRC_Constraints.csv
similarity index 100%
rename from resources/optimization/SimpleRC_Constraints.csv
rename to unittests/resources/optimization/SimpleRC_Constraints.csv
diff --git a/resources/optimization/SimpleRC_Prices.csv b/unittests/resources/optimization/SimpleRC_Prices.csv
similarity index 100%
rename from resources/optimization/SimpleRC_Prices.csv
rename to unittests/resources/optimization/SimpleRC_Prices.csv
diff --git a/resources/optimization/sampleConstraintCSV_Constant.csv b/unittests/resources/optimization/sampleConstraintCSV_Constant.csv
similarity index 100%
rename from resources/optimization/sampleConstraintCSV_Constant.csv
rename to unittests/resources/optimization/sampleConstraintCSV_Constant.csv
diff --git a/resources/optimization/sampleConstraintCSV_Setback.csv b/unittests/resources/optimization/sampleConstraintCSV_Setback.csv
similarity index 100%
rename from resources/optimization/sampleConstraintCSV_Setback.csv
rename to unittests/resources/optimization/sampleConstraintCSV_Setback.csv
diff --git a/resources/weather/BerkeleyCSV.csv b/unittests/resources/weather/BerkeleyCSV.csv
similarity index 100%
rename from resources/weather/BerkeleyCSV.csv
rename to unittests/resources/weather/BerkeleyCSV.csv
diff --git a/resources/weather/Tamb.csv b/unittests/resources/weather/Tamb.csv
similarity index 100%
rename from resources/weather/Tamb.csv
rename to unittests/resources/weather/Tamb.csv
diff --git a/resources/weather/USA_CA_San.Francisco.Intl.AP.724940_TMY3.epw b/unittests/resources/weather/USA_CA_San.Francisco.Intl.AP.724940_TMY3.epw
similarity index 100%
rename from resources/weather/USA_CA_San.Francisco.Intl.AP.724940_TMY3.epw
rename to unittests/resources/weather/USA_CA_San.Francisco.Intl.AP.724940_TMY3.epw
diff --git a/resources/weather/USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw b/unittests/resources/weather/USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw
similarity index 100%
rename from resources/weather/USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw
rename to unittests/resources/weather/USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw
diff --git a/unittests/test_exodata.py b/unittests/test_exodata.py
index 97aef0f..f32d949 100755
--- a/unittests/test_exodata.py
+++ b/unittests/test_exodata.py
@@ -22,7 +22,7 @@ class WeatherFromEPW(TestCaseMPCPy):
'''
def setUp(self):
- self.epw_filepath = os.path.join(utility.get_MPCPy_path(), 'resources', 'weather', \
+ self.epw_filepath = os.path.join(self.get_unittest_path(), 'resources', 'weather', \
'USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw');
self.weather = exodata.WeatherFromEPW(self.epw_filepath);
@@ -57,7 +57,7 @@ class WeatherFromCSV(TestCaseMPCPy):
'''
def setUp(self):
- self.csv_filepath = os.path.join(utility.get_MPCPy_path(), 'resources', 'weather', 'BerkeleyCSV.csv');
+ self.csv_filepath = os.path.join(self.get_unittest_path(), 'resources', 'weather', 'BerkeleyCSV.csv');
self.geography = [37.8716, -122.2727];
self.variable_map = {'TemperatureF' : ('weaTDryBul', units.degF), \
'Dew PointF' : ('weaTDewPoi', units.degF), \
@@ -153,7 +153,7 @@ class InternalFromCSV(TestCaseMPCPy):
'''
def setUp(self):
- self.csv_filepath = os.path.join(utility.get_MPCPy_path(), 'resources', 'internal', 'sampleCSV.csv');
+ self.csv_filepath = os.path.join(self.get_unittest_path(), 'resources', 'internal', 'sampleCSV.csv');
self.variable_map = {'intRad_wes' : ('wes', 'intRad', units.W_m2), \
'intCon_wes' : ('wes', 'intCon', units.W_m2), \
'intLat_wes' : ('wes', 'intLat', units.W_m2), \
@@ -220,7 +220,7 @@ class ControlFromCSV(TestCaseMPCPy):
'''
def setUp(self):
- csv_filepath = os.path.join(utility.get_MPCPy_path(), 'resources', 'building', 'ControlCSV_0.csv');
+ csv_filepath = os.path.join(self.get_unittest_path(), 'resources', 'building', 'ControlCSV_0.csv');
variable_map = {'conHeat_wes' : ('conHeat_wes', units.unit1), \
'conHeat_hal' : ('conHeat_hal', units.unit1), \
'conHeat_eas' : ('conHeat_eas', units.unit1)};
@@ -244,7 +244,7 @@ class OtherInputFromCSV(TestCaseMPCPy):
'''
def setUp(self):
- csv_filepath = os.path.join(utility.get_MPCPy_path(), 'resources', 'weather', 'Tamb.csv');
+ csv_filepath = os.path.join(self.get_unittest_path(), 'resources', 'weather', 'Tamb.csv');
variable_map = {'T' : ('Tamb', units.degC)};
# Instantiate other input object
self.otherinput = exodata.OtherInputFromCSV(csv_filepath, \
@@ -266,7 +266,7 @@ class ParameterFromCSV(TestCaseMPCPy):
'''
def setUp(self):
- csv_filepath = os.path.join(utility.get_MPCPy_path(), 'resources', 'model', 'LBNL71T_Parameters.csv');
+ csv_filepath = os.path.join(self.get_unittest_path(), 'resources', 'model', 'LBNL71T_Parameters.csv');
# Instantiate weather object
self.parameters = exodata.ParameterFromCSV(csv_filepath);
@@ -284,7 +284,7 @@ class ConstraintFromCSV(TestCaseMPCPy):
'''
def setUp(self):
- csv_filepath = os.path.join(utility.get_MPCPy_path(), 'resources', 'optimization', 'sampleConstraintCSV_Setback.csv');
+ csv_filepath = os.path.join(self.get_unittest_path(), 'resources', 'optimization', 'sampleConstraintCSV_Setback.csv');
variable_map = {'wesTdb_min' : ('wesTdb', 'GTE', units.degC), \
'wesTdb_max' : ('wesTdb', 'LTE', units.degC), \
'easTdb_min' : ('easTdb', 'GTE', units.degC), \
@@ -320,7 +320,7 @@ def setUp(self):
start_time_occupancy = '3/1/2012';
final_time_occupancy = '3/7/2012 23:55:00';
# Load occupancy models
- with open(os.path.join(utility.get_MPCPy_path(), 'unittests', 'references', 'test_models',\
+ with open(os.path.join(self.get_unittest_path(), 'references', 'test_models',\
'OccupancyFromQueueing', 'occupancy_model_estimated.txt'), 'r') as f:
occupancy_model = pickle.load(f);
# Define state variables and values
@@ -352,7 +352,7 @@ class PriceFromCSV(TestCaseMPCPy):
'''
def setUp(self):
- csv_filepath = os.path.join(utility.get_MPCPy_path(), 'resources', 'optimization', 'PriceCSV.csv');
+ csv_filepath = os.path.join(self.get_unittest_path(), 'resources', 'optimization', 'PriceCSV.csv');
variable_map = {'pi_e' : ('pi_e', units.unit1)};
# Instantiate weather object
self.prices = exodata.PriceFromCSV(csv_filepath, \
@@ -374,7 +374,7 @@ class Type(TestCaseMPCPy):
'''
def setUp(self):
- self.epw_filepath = utility.get_MPCPy_path()+os.sep + 'resources' + os.sep + 'weather' + os.sep + 'USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw';
+ self.epw_filepath = os.path.join(self.get_unittest_path(), 'resources', 'weather', 'USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw');
self.weather = exodata.WeatherFromEPW(self.epw_filepath);
def test_set_time_interval(self):
'''Test this method sets the time metrics properly in the exodata source.'''
diff --git a/unittests/test_models.py b/unittests/test_models.py
index b5f56d9..be17306 100755
--- a/unittests/test_models.py
+++ b/unittests/test_models.py
@@ -26,7 +26,6 @@ class SimpleRC(TestCaseMPCPy):
def setUp(self):
self.start_time = '1/1/2017';
self.final_time = '1/2/2017';
- self.MPCPyPath = utility.get_MPCPy_path();
# Set measurements
self.measurements = {};
self.measurements['T_db'] = {'Sample' : variables.Static('T_db_sample', 1800, units.s)};
@@ -34,10 +33,10 @@ def setUp(self):
def test_simulate(self):
'''Test simulation of a model.'''
# Set model paths
- mopath = os.path.join(self.MPCPyPath, 'resources', 'model', 'Simple.mo');
+ mopath = os.path.join(self.get_unittest_path(), 'resources', 'model', 'Simple.mo');
modelpath = 'Simple.RC';
# Gather control inputs
- control_csv_filepath = os.path.join(self.MPCPyPath, 'resources', 'model', 'SimpleRC_Input.csv');
+ control_csv_filepath = os.path.join(self.get_unittest_path(), 'resources', 'model', 'SimpleRC_Input.csv');
variable_map = {'q_flow_csv' : ('q_flow', units.W)};
controls = exodata.ControlFromCSV(control_csv_filepath, variable_map);
controls.collect_data(self.start_time, self.final_time);
@@ -58,7 +57,7 @@ def test_simulate(self):
def test_simulate_noinputs(self):
'''Test simulation of a model with no external inputs.'''
# Set model paths
- mopath = os.path.join(self.MPCPyPath, 'resources', 'model', 'Simple.mo');
+ mopath = os.path.join(self.get_unittest_path(), 'resources', 'model', 'Simple.mo');
modelpath = 'Simple.RC_noinputs';
# Instantiate model
self.model = models.Modelica(models.JModelica, \
@@ -74,7 +73,7 @@ def test_simulate_noinputs(self):
def test_estimate_error_nofreeparameters(self):
'''Test error raised if no free parameters passed.'''
# Set model paths
- mopath = os.path.join(self.MPCPyPath, 'resources', 'model', 'Simple.mo');
+ mopath = os.path.join(self.get_unittest_path(), 'resources', 'model', 'Simple.mo');
modelpath = 'Simple.RC_noinputs';
# Instantiate model
self.model_no_params = models.Modelica(models.JModelica, \
@@ -108,12 +107,11 @@ class EstimateFromJModelica(TestCaseMPCPy):
'''
def setUp(self):
- self.MPCPyPath = utility.get_MPCPy_path();
## Setup building fmu emulation
- self.building_source_file_path = self.MPCPyPath + os.sep + 'resources' + os.sep + 'building' + os.sep + 'LBNL71T_Emulation_JModelica_v2.fmu';
+ self.building_source_file_path = os.path.join(self.get_unittest_path(), 'resources', 'building', 'LBNL71T_Emulation_JModelica_v2.fmu');
self.zone_names = ['wes', 'hal', 'eas'];
- self.weather_path = self.MPCPyPath + os.sep + 'resources' + os.sep + 'weather' + os.sep + 'USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw';
- self.internal_path = self.MPCPyPath + os.sep + 'resources' + os.sep + 'internal' + os.sep + 'sampleCSV.csv';
+ self.weather_path = os.path.join(self.get_unittest_path(), 'resources', 'weather', 'USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw');
+ self.internal_path = os.path.join(self.get_unittest_path(), 'resources', 'internal', 'sampleCSV.csv');
self.internal_variable_map = {'intRad_wes' : ('wes', 'intRad', units.W_m2), \
'intCon_wes' : ('wes', 'intCon', units.W_m2), \
'intLat_wes' : ('wes', 'intLat', units.W_m2), \
@@ -123,7 +121,7 @@ def setUp(self):
'intRad_eas' : ('eas', 'intRad', units.W_m2), \
'intCon_eas' : ('eas', 'intCon', units.W_m2), \
'intLat_eas' : ('eas', 'intLat', units.W_m2)};
- self.control_path = self.MPCPyPath + os.sep + 'resources' + os.sep + 'building' + os.sep + 'ControlCSV_0.csv';
+ self.control_path = os.path.join(self.get_unittest_path(), 'resources', 'building', 'ControlCSV_0.csv');
self.control_variable_map = {'conHeat_wes' : ('conHeat_wes', units.unit1), \
'conHeat_hal' : ('conHeat_hal', units.unit1), \
'conHeat_eas' : ('conHeat_eas', units.unit1)};
@@ -137,7 +135,7 @@ def setUp(self):
self.measurements['easPhvac'] = {'Sample' : variables.Static('easTdb_sample', 1800, units.s)};
self.measurements['Ptot'] = {'Sample' : variables.Static('easTdb_sample', 1800, units.s)};
## Setup model
- self.mopath = self.MPCPyPath + os.sep + 'resources' + os.sep + 'model' + os.sep + 'LBNL71T_MPC.mo';
+ self.mopath = os.path.join(self.get_unittest_path(), 'resources', 'model', 'LBNL71T_MPC.mo');
self.modelpath = 'LBNL71T_MPC.MPC';
self.libraries = os.environ.get('MODELICAPATH');
self.estimate_method = models.JModelica;
@@ -146,8 +144,8 @@ def setUp(self):
self.weather = exodata.WeatherFromEPW(self.weather_path);
self.internal = exodata.InternalFromCSV(self.internal_path, self.internal_variable_map, tz_name = self.weather.tz_name);
self.control = exodata.ControlFromCSV(self.control_path, self.control_variable_map, tz_name = self.weather.tz_name);
- # Parameters
- self.parameters = exodata.ParameterFromCSV(self.MPCPyPath + os.sep + 'resources' + os.sep + 'model' + os.sep + 'LBNL71T_Parameters.csv');
+ # Parameters
+ self.parameters = exodata.ParameterFromCSV(os.path.join(self.get_unittest_path(), 'resources', 'model', 'LBNL71T_Parameters.csv'));
self.parameters.collect_data();
self.parameters.data['lat'] = {};
self.parameters.data['lat']['Value'] = self.weather.lat;
@@ -242,7 +240,7 @@ def test_estimate_and_validate(self):
self.building.collect_measurements(self.start_time_validation, self.final_time_validation);
self.model.measurements = self.building.measurements;
self.model.validate(self.start_time_validation, self.final_time_validation, \
- os.path.join(self.MPCPyPath, 'unittests', 'outputs', 'model_validation'));
+ os.path.join(self.get_unittest_path(), 'outputs', 'model_validation'));
# Check references
RMSE = {};
for key in self.model.RMSE.keys():
@@ -260,20 +258,19 @@ class EstimateFromUKF(TestCaseMPCPy):
def setUp(self):
self.start_time = '1/1/2017';
self.final_time = '1/10/2017';
- self.MPCPyPath = utility.get_MPCPy_path();
# Set measurements
self.measurements = {};
self.measurements['T_db'] = {'Sample' : variables.Static('T_db_sample', 1800, units.s)};
# Set model paths
- mopath = os.path.join(self.MPCPyPath, 'resources', 'model', 'Simple.mo');
+ mopath = os.path.join(self.get_unittest_path(), 'resources', 'model', 'Simple.mo');
modelpath = 'Simple.RC';
self.moinfo = (mopath, modelpath, {})
# Gather parameters
- parameter_csv_filepath = os.path.join(self.MPCPyPath, 'resources', 'model', 'SimpleRC_Parameters.csv');
+ parameter_csv_filepath = os.path.join(self.get_unittest_path(), 'resources', 'model', 'SimpleRC_Parameters.csv');
self.parameters = exodata.ParameterFromCSV(parameter_csv_filepath);
self.parameters.collect_data();
# Gather control inputs
- control_csv_filepath = os.path.join(self.MPCPyPath, 'resources', 'model', 'SimpleRC_Input.csv');
+ control_csv_filepath = os.path.join(self.get_unittest_path(), 'resources', 'model', 'SimpleRC_Input.csv');
variable_map = {'q_flow_csv' : ('q_flow', units.W)};
self.controls = exodata.ControlFromCSV(control_csv_filepath, variable_map);
self.controls.collect_data(self.start_time, self.final_time);
@@ -329,10 +326,8 @@ def setUp(self):
# Testing time
self.start_time = '3/8/2013';
self.final_time = '3/15/2013 23:59';
- # Set path variable(s)
- self.MPCPyPath = utility.get_MPCPy_path();
# Setup building measurement collection from csv
- self.csv_filepath = self.MPCPyPath+os.sep + 'resources' + os.sep + 'building' + os.sep + 'OccData.csv';
+ self.csv_filepath = os.path.join(self.get_unittest_path(), 'resources', 'building', 'OccData.csv');
# Measurements
self.measurements = {};
self.measurements['occupancy'] = {'Sample' : variables.Static('occupancy_sample', 300, units.s)};
@@ -401,7 +396,7 @@ def test_validate(self):
self.occupancy.set_simulate_options(simulate_options);
np.random.seed(1);
self.occupancy.validate(self.start_time, self.final_time, \
- os.path.join(self.MPCPyPath, 'unittests', 'outputs', \
+ os.path.join(self.get_unittest_path(), 'outputs', \
'occupancy_model_validate'));
# Check references
RMSE = {};
diff --git a/unittests/test_optimization.py b/unittests/test_optimization.py
index 13b488f..180d282 100755
--- a/unittests/test_optimization.py
+++ b/unittests/test_optimization.py
@@ -24,9 +24,9 @@ def setUp(self):
self.start_time = '1/1/2017';
self.final_time = '1/2/2017';
# Set .mo path
- self.mopath = os.path.join(utility.get_MPCPy_path(), 'resources', 'model', 'Simple.mo');
+ self.mopath = os.path.join(self.get_unittest_path(), 'resources', 'model', 'Simple.mo');
# Gather inputs
- control_csv_filepath = utility.get_MPCPy_path()+os.sep + 'resources' + os.sep + 'model' + os.sep + 'SimpleRC_Input.csv';
+ control_csv_filepath = os.path.join(self.get_unittest_path(), 'resources', 'model', 'SimpleRC_Input.csv');
control_variable_map = {'q_flow_csv' : ('q_flow', units.W)};
self.controls = exodata.ControlFromCSV(control_csv_filepath, control_variable_map);
self.controls.collect_data(self.start_time, self.final_time);
@@ -35,7 +35,7 @@ def setUp(self):
self.measurements['T_db'] = {'Sample' : variables.Static('T_db_sample', 1800, units.s)};
self.measurements['q_flow'] = {'Sample' : variables.Static('q_flow_sample', 1800, units.s)};
# Gather constraints
- constraint_csv_filepath = utility.get_MPCPy_path()+os.sep + 'resources' + os.sep + 'optimization' + os.sep + 'SimpleRC_Constraints.csv';
+ constraint_csv_filepath = os.path.join(self.get_unittest_path(), 'resources', 'optimization', 'SimpleRC_Constraints.csv');
constraint_variable_map = {'q_flow_min' : ('q_flow', 'GTE', units.W), \
'T_db_min' : ('T_db', 'GTE', units.K), \
'T_db_max' : ('T_db', 'LTE', units.K)};
@@ -102,7 +102,7 @@ def test_set_problem_type(self):
# Set new problem type
opt_problem.set_problem_type(optimization.EnergyCostMin);
# Gather prices
- price_csv_filepath = os.path.join(utility.get_MPCPy_path(), 'resources', 'optimization', 'SimpleRC_Prices.csv');
+ price_csv_filepath = os.path.join(self.get_unittest_path(), 'resources', 'optimization', 'SimpleRC_Prices.csv');
price_variable_map = {'energy' : ('pi_e', units.unit1)};
price = exodata.PriceFromCSV(price_csv_filepath, price_variable_map);
price.collect_data(self.start_time, self.final_time);
@@ -262,9 +262,8 @@ class OptimizeAdvancedFromJModelica(TestCaseMPCPy):
'''
def setUp(self):
- self.MPCPyPath = utility.get_MPCPy_path();
## Setup model
- self.mopath = self.MPCPyPath + os.sep + 'resources' + os.sep + 'model' + os.sep + 'LBNL71T_MPC.mo';
+ self.mopath = os.path.join(self.get_unittest_path(), 'resources', 'model', 'LBNL71T_MPC.mo');
self.modelpath = 'LBNL71T_MPC.MPC';
self.libraries = os.environ.get('MODELICAPATH');
self.estimate_method = models.JModelica;
@@ -288,11 +287,11 @@ def setUp(self):
self.start_time_optimization = '1/2/2015';
self.final_time_optimization = '1/3/2015';
# Weather
- self.weather_path = self.MPCPyPath + os.sep + 'resources' + os.sep + 'weather' + os.sep + 'USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw';
+ self.weather_path = os.path.join(self.get_unittest_path(), 'resources', 'weather', 'USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw');
self.weather = exodata.WeatherFromEPW(self.weather_path);
self.weather.collect_data(self.start_time_exodata, self.final_time_exodata);
# Internal
- self.internal_path = self.MPCPyPath + os.sep + 'resources' + os.sep + 'internal' + os.sep + 'sampleCSV.csv';
+ self.internal_path = os.path.join(self.get_unittest_path(), 'resources', 'internal', 'sampleCSV.csv');
self.internal_variable_map = {'intRad_wes' : ('wes', 'intRad', units.W_m2), \
'intCon_wes' : ('wes', 'intCon', units.W_m2), \
'intLat_wes' : ('wes', 'intLat', units.W_m2), \
@@ -305,18 +304,18 @@ def setUp(self):
self.internal = exodata.InternalFromCSV(self.internal_path, self.internal_variable_map, tz_name = self.weather.tz_name);
self.internal.collect_data(self.start_time_exodata, self.final_time_exodata);
# Control (as initialization)
- self.control_path = self.MPCPyPath + os.sep + 'resources' + os.sep + 'optimization' + os.sep + 'ControlCSV.csv';
+ self.control_path = os.path.join(self.get_unittest_path(), 'resources', 'optimization', 'ControlCSV.csv');
self.control_variable_map = {'conHeat_wes' : ('conHeat_wes', units.unit1), \
'conHeat_hal' : ('conHeat_hal', units.unit1), \
'conHeat_eas' : ('conHeat_eas', units.unit1)};
self.control = exodata.ControlFromCSV(self.control_path, self.control_variable_map, tz_name = self.weather.tz_name);
self.control.collect_data(self.start_time_exodata, self.final_time_exodata);
# Parameters
- self.parameters_path = self.MPCPyPath + os.sep + 'unittests' + os.sep + 'outputs' + os.sep + 'model_parameters.txt';
+ self.parameters_path = os.path.join(self.get_unittest_path(), 'outputs', 'model_parameters.txt');
self.parameters = exodata.ParameterFromCSV(self.parameters_path);
self.parameters.collect_data();
# Constraints
- self.constraints_path = self.MPCPyPath + os.sep + 'resources' + os.sep + 'optimization' + os.sep + 'sampleConstraintCSV_Constant.csv';
+ self.constraints_path = os.path.join(self.get_unittest_path(), 'resources', 'optimization', 'sampleConstraintCSV_Constant.csv');
self.constraints_variable_map = {'wesTdb_min' : ('wesTdb', 'GTE', units.degC), \
'wesTdb_max' : ('wesTdb', 'LTE', units.degC), \
'easTdb_min' : ('easTdb', 'GTE', units.degC), \
@@ -341,7 +340,7 @@ def setUp(self):
self.constraints.data['easTdb']['Cyclic'] = variables.Static('easTdb_cyclic', 1, units.boolean_integer);
self.constraints.data['halTdb']['Cyclic'] = variables.Static('halTdb_cyclic', 1, units.boolean_integer);
# Prices
- self.prices_path = self.MPCPyPath + os.sep + 'resources' + os.sep + 'optimization' + os.sep + 'PriceCSV.csv';
+ self.prices_path = os.path.join(self.get_unittest_path(), 'resources', 'optimization', 'PriceCSV.csv');
self.price_variable_map = {'pi_e' : ('pi_e', units.unit1)};
self.prices = exodata.PriceFromCSV(self.prices_path, self.price_variable_map, tz_name = self.weather.tz_name);
self.prices.collect_data(self.start_time_exodata, self.final_time_exodata);
diff --git a/unittests/test_systems.py b/unittests/test_systems.py
index 1ac8e60..8b97a5f 100755
--- a/unittests/test_systems.py
+++ b/unittests/test_systems.py
@@ -9,7 +9,6 @@
from mpcpy import systems
from mpcpy import variables
from mpcpy import units
-from mpcpy import utility
from testing import TestCaseMPCPy
from matplotlib import pyplot as plt
import os
@@ -18,15 +17,13 @@
class EmulationFromFMU(TestCaseMPCPy):
#%% FMU
def setUp(self):
- # Set path variable(s)
- MPCPyPath = utility.get_MPCPy_path();
# Setup building
- self.building_source_file_path = os.path.join(MPCPyPath, 'resources', 'building', \
+ self.building_source_file_path = os.path.join(self.get_unittest_path(), 'resources', 'building', \
'LBNL71T_Emulation_JModelica_v2.fmu');
self.zone_names = ['wes', 'hal', 'eas'];
- weather_path = os.path.join(MPCPyPath, 'resources', 'weather', \
+ weather_path = os.path.join(self.get_unittest_path(), 'resources', 'weather', \
'USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw');
- internal_path = os.path.join(MPCPyPath, 'resources', 'internal', 'sampleCSV.csv');
+ internal_path = os.path.join(self.get_unittest_path(), 'resources', 'internal', 'sampleCSV.csv');
internal_variable_map = {'intRad_wes' : ('wes', 'intRad', units.W_m2), \
'intCon_wes' : ('wes', 'intCon', units.W_m2), \
'intLat_wes' : ('wes', 'intLat', units.W_m2), \
@@ -36,7 +33,7 @@ def setUp(self):
'intRad_eas' : ('eas', 'intRad', units.W_m2), \
'intCon_eas' : ('eas', 'intCon', units.W_m2), \
'intLat_eas' : ('eas', 'intLat', units.W_m2)};
- control_path = os.path.join(MPCPyPath, 'resources', 'building', 'ControlCSV_0.csv');
+ control_path = os.path.join(self.get_unittest_path(), 'resources', 'building', 'ControlCSV_0.csv');
control_variable_map = {'conHeat_wes' : ('conHeat_wes', units.unit1), \
'conHeat_hal' : ('conHeat_hal', units.unit1), \
'conHeat_eas' : ('conHeat_eas', units.unit1)};
@@ -130,16 +127,14 @@ def plot_measurements(self, name):
plt.legend(loc='upper center', bbox_to_anchor=(0.5, 1.1), ncol=4, prop={'size':12});
plt.ylabel(variable.quantity_name + ' [' + variable.display_unit.name + ']');
plt.rcParams.update({'font.size': 16});
- plt.savefig(self.MPCPyPath + os.sep + 'unittests' + os.sep + 'resources' + os.sep + name + '.png');
+ plt.savefig(os.path.join(self.get_unittest_path(), 'outputs', name + '.png'));
plt.close();
class RealfromCSV(TestCaseMPCPy):
#%% CSV
def setUp(self):
- # Set path variable(s)
- MPCPyPath = utility.get_MPCPy_path();
# Setup building measurement collection from csv
- self.csv_filepath = os.path.join(MPCPyPath, 'resources', 'building', 'OccData.csv');
+ self.csv_filepath = os.path.join(self.get_unittest_path(), 'resources', 'building', 'OccData.csv');
# Measurements
self.measurements = {};
self.measurements['occupancy'] = {'Sample' : variables.Static('occupancy_sample', 300, units.s)};
diff --git a/unittests/test_utility.py b/unittests/test_utility.py
index 64e4b60..ac2724b 100755
--- a/unittests/test_utility.py
+++ b/unittests/test_utility.py
@@ -10,17 +10,20 @@
from mpcpy import units
from mpcpy import systems
from mpcpy import models
+from testing import TestCaseMPCPy
#%% General methods test
-class TestEmulationFromFMU(unittest.TestCase):
+class TestEmulationFromFMU(TestCaseMPCPy):
def setUp(self):
self.parameter_data = {};
self.parameter_data['par'] = {};
self.parameter_data['par']['Value'] = 1;
# instantiate building fmu v1.0
- self.building_1 = systems.EmulationFromFMU({}, fmupath = utility.get_MPCPy_path()+os.sep + 'resources' + os.sep + 'building' + os.sep + 'LBNL71T_Emulation_JModelica_v1.fmu', parameter_data = self.parameter_data);
+ fmupath_1 = os.path.join(self.get_unittest_path(), 'resources', 'building', 'LBNL71T_Emulation_JModelica_v1.fmu');
+ self.building_1 = systems.EmulationFromFMU({}, fmupath = fmupath_1, parameter_data = self.parameter_data);
# instantiate building fmu v2.0
- self.building_2 = systems.EmulationFromFMU({}, fmupath = utility.get_MPCPy_path()+os.sep + 'resources' + os.sep + 'building' + os.sep + 'LBNL71T_Emulation_JModelica_v2.fmu', parameter_data = self.parameter_data);
+ fmupath_2 = os.path.join(self.get_unittest_path(), 'resources', 'building', 'LBNL71T_Emulation_JModelica_v2.fmu');
+ self.building_2 = systems.EmulationFromFMU({}, fmupath = fmupath_2, parameter_data = self.parameter_data);
def test_fmu_version(self):
# fmu 1.0
self.assertEqual(self.building_1.fmu_version, '1.0');
@@ -45,9 +48,9 @@ def test_get_unit_class_from_unit_string(self):
def test_free_parameter_check(self):
self.assertEqual(self.building_1.parameter_data['par']['Free'].get_base_data(), 0);
-class TestFMIVersionDefault(unittest.TestCase):
+class TestFMIVersionDefault(TestCaseMPCPy):
def setUp(self):
- self.mopath = utility.get_MPCPy_path()+os.sep + 'resources' + os.sep + 'model' + os.sep + 'Simple.mo';
+ self.mopath = os.path.join(self.get_unittest_path(), 'resources', 'model', 'Simple.mo');
self.modelpath = 'Simple.RC';
def test_fmi_default(self):
@@ -56,9 +59,9 @@ def test_fmi_default(self):
model = models.Modelica(models.JModelica, models.RMSE, {}, moinfo = (self.mopath, self.modelpath, {}));
self.assertEqual(model.fmu_version, '2.0');
-class TestGetInputNames(unittest.TestCase):
+class TestGetInputNames(TestCaseMPCPy):
def setUp(self):
- self.mopath = utility.get_MPCPy_path()+os.sep + 'resources' + os.sep + 'model' + os.sep + 'Simple.mo';
+ self.mopath = os.path.join(self.get_unittest_path(), 'resources', 'model', 'Simple.mo');
self.modelpath = 'Simple.RC';
def test_fmi_version(self):
diff --git a/unittests/testing.py b/unittests/testing.py
index 23fd28a..f1307cf 100644
--- a/unittests/testing.py
+++ b/unittests/testing.py
@@ -18,6 +18,15 @@ class TestCaseMPCPy(unittest.TestCase):
__metaclass__ = ABCMeta;
+ def get_unittest_path(self):
+ '''Returns the path to the unittest directory.
+
+ '''
+
+ unittest_path = os.path.join(utility.get_MPCPy_path(), 'unittests');
+
+ return unittest_path;
+
def get_ref_path(self):
'''Returns the path to the test data reference file.