From 844ad5d48e6612c01b0f872b2b00d18f4dbc66ac Mon Sep 17 00:00:00 2001 From: mlauster Date: Mon, 23 May 2016 21:18:53 +0200 Subject: [PATCH 1/4] fixes grammar issues in OpenModelica #250 --- .../BaseClasses/{partialAHU.mo => PartialAHU.mo} | 0 .../{partialBuildingPhysics.mo => PartialBuildingPhysics.mo} | 0 .../EqAirTemp/{partialEqAirTemp.mo => PartialEqAirTemp.mo} | 0 ...{partialReducedOrderModel.mo => PartialReducedOrderModel.mo} | 0 .../Multizone/{partialMultizone.mo => PartialMultizone.mo} | 0 .../{partialThermalZone.mo => PartialThermalZone.mo} | 0 .../{partialHeaterCooler.mo => PartialHeaterCooler.mo} | 0 .../{partialHeaterCoolerPI.mo => PartialHeaterCoolerPI.mo} | 0 AixLib/package.mo | 2 +- 9 files changed, 1 insertion(+), 1 deletion(-) rename AixLib/Airflow/AirHandlingUnit/BaseClasses/{partialAHU.mo => PartialAHU.mo} (100%) rename AixLib/Building/LowOrder/BaseClasses/BuildingPhysics/{partialBuildingPhysics.mo => PartialBuildingPhysics.mo} (100%) rename AixLib/Building/LowOrder/BaseClasses/EqAirTemp/{partialEqAirTemp.mo => PartialEqAirTemp.mo} (100%) rename AixLib/Building/LowOrder/BaseClasses/ReducedOrderModel/{partialReducedOrderModel.mo => PartialReducedOrderModel.mo} (100%) rename AixLib/Building/LowOrder/Multizone/{partialMultizone.mo => PartialMultizone.mo} (100%) rename AixLib/Building/LowOrder/ThermalZone/{partialThermalZone.mo => PartialThermalZone.mo} (100%) rename AixLib/Utilities/Sources/HeaterCooler/{partialHeaterCooler.mo => PartialHeaterCooler.mo} (100%) rename AixLib/Utilities/Sources/HeaterCooler/{partialHeaterCoolerPI.mo => PartialHeaterCoolerPI.mo} (100%) diff --git a/AixLib/Airflow/AirHandlingUnit/BaseClasses/partialAHU.mo b/AixLib/Airflow/AirHandlingUnit/BaseClasses/PartialAHU.mo similarity index 100% rename from AixLib/Airflow/AirHandlingUnit/BaseClasses/partialAHU.mo rename to AixLib/Airflow/AirHandlingUnit/BaseClasses/PartialAHU.mo diff --git a/AixLib/Building/LowOrder/BaseClasses/BuildingPhysics/partialBuildingPhysics.mo b/AixLib/Building/LowOrder/BaseClasses/BuildingPhysics/PartialBuildingPhysics.mo similarity index 100% rename from AixLib/Building/LowOrder/BaseClasses/BuildingPhysics/partialBuildingPhysics.mo rename to AixLib/Building/LowOrder/BaseClasses/BuildingPhysics/PartialBuildingPhysics.mo diff --git a/AixLib/Building/LowOrder/BaseClasses/EqAirTemp/partialEqAirTemp.mo b/AixLib/Building/LowOrder/BaseClasses/EqAirTemp/PartialEqAirTemp.mo similarity index 100% rename from AixLib/Building/LowOrder/BaseClasses/EqAirTemp/partialEqAirTemp.mo rename to AixLib/Building/LowOrder/BaseClasses/EqAirTemp/PartialEqAirTemp.mo diff --git a/AixLib/Building/LowOrder/BaseClasses/ReducedOrderModel/partialReducedOrderModel.mo b/AixLib/Building/LowOrder/BaseClasses/ReducedOrderModel/PartialReducedOrderModel.mo similarity index 100% rename from AixLib/Building/LowOrder/BaseClasses/ReducedOrderModel/partialReducedOrderModel.mo rename to AixLib/Building/LowOrder/BaseClasses/ReducedOrderModel/PartialReducedOrderModel.mo diff --git a/AixLib/Building/LowOrder/Multizone/partialMultizone.mo b/AixLib/Building/LowOrder/Multizone/PartialMultizone.mo similarity index 100% rename from AixLib/Building/LowOrder/Multizone/partialMultizone.mo rename to AixLib/Building/LowOrder/Multizone/PartialMultizone.mo diff --git a/AixLib/Building/LowOrder/ThermalZone/partialThermalZone.mo b/AixLib/Building/LowOrder/ThermalZone/PartialThermalZone.mo similarity index 100% rename from AixLib/Building/LowOrder/ThermalZone/partialThermalZone.mo rename to AixLib/Building/LowOrder/ThermalZone/PartialThermalZone.mo diff --git a/AixLib/Utilities/Sources/HeaterCooler/partialHeaterCooler.mo b/AixLib/Utilities/Sources/HeaterCooler/PartialHeaterCooler.mo similarity index 100% rename from AixLib/Utilities/Sources/HeaterCooler/partialHeaterCooler.mo rename to AixLib/Utilities/Sources/HeaterCooler/PartialHeaterCooler.mo diff --git a/AixLib/Utilities/Sources/HeaterCooler/partialHeaterCoolerPI.mo b/AixLib/Utilities/Sources/HeaterCooler/PartialHeaterCoolerPI.mo similarity index 100% rename from AixLib/Utilities/Sources/HeaterCooler/partialHeaterCoolerPI.mo rename to AixLib/Utilities/Sources/HeaterCooler/PartialHeaterCoolerPI.mo diff --git a/AixLib/package.mo b/AixLib/package.mo index c33ccbeb43..e3d9dbf4be 100644 --- a/AixLib/package.mo +++ b/AixLib/package.mo @@ -1,6 +1,6 @@ within ; package AixLib - annotation(uses(Modelica(version = "3.2.1")), version = "0.3.0", Documentation(info = " + annotation(uses(Modelica(version = "3.2.1")), version = "0.3.1", Documentation(info = "

The free open-source AixLib library is being developed for research and teaching purposes. It aims at dynamic simulations of thermal and hydraulic systems to develop control strategies for HVAC systems and analyse interactions in complex systems. It is used for simulations on component, building and city district level. As this library is developed mainly for academic purposes, user-friendliness and model robustness is not a main task. This research focus thus influences the layout and philosophy of the library.

Various connectors of the Modelica Standard Library are used, e.g. Modelica.Fluid and Modelica.HeatTransfer. These are accompanied by own connectors for simplified hydraulics (no fluid.media, incompressible, one phase) , shortwave radiation (intensity), longwave radiation (heat flow combined with a virtual temperature) and combined longwave radiation and thermal. The pressure in the connectors is the total pressure. The used media models are simplified from the Modelica.Media library. If possible and necessary, components use continuously differentiable equations. In general, zero mass flow rate and reverse flow are supported.

Most models have been analytically verified. In addition, hydraulic components are compared to empirical data such as performance curves. High and low order building models have been validated using a standard test suite provided by the ANSI/ASHRAE Standard 140 and VDI 6007 Guideline. The library has only been tested with Dymola.

From 6ea5bbd79b4e4f8bcd0777fd826131d6cf6f7390 Mon Sep 17 00:00:00 2001 From: marcusfuchs Date: Tue, 24 May 2016 09:22:33 +0200 Subject: [PATCH 2/4] Increase version number in README --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index c8a9fa8bf0..4164346aa2 100644 --- a/README.md +++ b/README.md @@ -19,14 +19,14 @@ Parts of **AixLib** have been developed within public funded projects and with f ### Description -**AixLib** contains simplified models of HVAC systems as well as low and higher order building models. +**AixLib** contains simplified models of HVAC systems as well as low and higher order building models. ### Version -The current version 0.2.5 is a pre-release. +The current version 0.3.1 is a pre-release. ### How to contribute to the development of AixLib -You are invited to contribute to the development of **AixLib**. +You are invited to contribute to the development of **AixLib**. Issues can be reported using this site's [Issues section](https://github.com/RWTH-EBC/AixLib/issues). Furthermore, you are welcome to contribute via [Pull Requests](https://github.com/RWTH-EBC/AixLib/pulls). The workflow for changes is described in our [Wiki](https://github.com/RWTH-EBC/AixLib/wiki). From d92b39f5ee2bfcfee416ef303c1e8263dee6b529 Mon Sep 17 00:00:00 2001 From: marcusfuchs Date: Tue, 24 May 2016 09:51:29 +0200 Subject: [PATCH 3/4] Renaming for OM compliance --- AixLib/Utilities/Sources/HeaterCooler/PartialHeaterCooler.mo | 4 ++-- .../Utilities/Sources/HeaterCooler/PartialHeaterCoolerPI.mo | 4 ++-- AixLib/Utilities/Sources/HeaterCooler/package.order | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/AixLib/Utilities/Sources/HeaterCooler/PartialHeaterCooler.mo b/AixLib/Utilities/Sources/HeaterCooler/PartialHeaterCooler.mo index 8513efb70a..3d4466183e 100644 --- a/AixLib/Utilities/Sources/HeaterCooler/PartialHeaterCooler.mo +++ b/AixLib/Utilities/Sources/HeaterCooler/PartialHeaterCooler.mo @@ -1,5 +1,5 @@ within AixLib.Utilities.Sources.HeaterCooler; -partial model partialHeaterCooler +partial model PartialHeaterCooler Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_a heatCoolRoom "Heat port to thermal zone" annotation(Placement(transformation(extent={{80,-50}, @@ -35,4 +35,4 @@ partial model partialHeaterCooler
  • June, 2014  by Moritz Lauster:
    Added some basic documentation
    • ")); -end partialHeaterCooler; +end PartialHeaterCooler; diff --git a/AixLib/Utilities/Sources/HeaterCooler/PartialHeaterCoolerPI.mo b/AixLib/Utilities/Sources/HeaterCooler/PartialHeaterCoolerPI.mo index 0701f7c143..bd07c182f4 100644 --- a/AixLib/Utilities/Sources/HeaterCooler/PartialHeaterCoolerPI.mo +++ b/AixLib/Utilities/Sources/HeaterCooler/PartialHeaterCoolerPI.mo @@ -1,5 +1,5 @@ within AixLib.Utilities.Sources.HeaterCooler; -partial model partialHeaterCoolerPI +partial model PartialHeaterCoolerPI extends AixLib.Utilities.Sources.HeaterCooler.partialHeaterCooler; parameter Real h_heater = 0 "Upper limit controller output of the heater" annotation(Dialog(tab = "Heater", group = "Controller",enable=not recOrSep)); parameter Real l_heater = 0 "Lower limit controller output of the heater" annotation(Dialog(tab = "Heater", group = "Controller",enable=not recOrSep)); @@ -88,4 +88,4 @@ equation Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100, 100}})), Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100,100}}))); -end partialHeaterCoolerPI; +end PartialHeaterCoolerPI; diff --git a/AixLib/Utilities/Sources/HeaterCooler/package.order b/AixLib/Utilities/Sources/HeaterCooler/package.order index eb43e63932..675950aade 100644 --- a/AixLib/Utilities/Sources/HeaterCooler/package.order +++ b/AixLib/Utilities/Sources/HeaterCooler/package.order @@ -1,3 +1,3 @@ HeaterCoolerPI -partialHeaterCooler -partialHeaterCoolerPI +PartialHeaterCooler +PartialHeaterCoolerPI \ No newline at end of file From d99fb750ed528ba6ff0e6d6355768c731aeaf0e7 Mon Sep 17 00:00:00 2001 From: mlauster Date: Tue, 24 May 2016 12:47:17 +0200 Subject: [PATCH 4/4] fixes bug out of bugfix in HeaterCoolerPI.mo and PartialHeaterCoolerPI.mo #250 --- AixLib/Utilities/Sources/HeaterCooler/HeaterCoolerPI.mo | 2 +- AixLib/Utilities/Sources/HeaterCooler/PartialHeaterCoolerPI.mo | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/AixLib/Utilities/Sources/HeaterCooler/HeaterCoolerPI.mo b/AixLib/Utilities/Sources/HeaterCooler/HeaterCoolerPI.mo index 40582912a1..15b35b5fc3 100644 --- a/AixLib/Utilities/Sources/HeaterCooler/HeaterCoolerPI.mo +++ b/AixLib/Utilities/Sources/HeaterCooler/HeaterCoolerPI.mo @@ -1,6 +1,6 @@ within AixLib.Utilities.Sources.HeaterCooler; model HeaterCoolerPI "heater and cooler with variable setpoints" - extends AixLib.Utilities.Sources.HeaterCooler.partialHeaterCoolerPI; + extends AixLib.Utilities.Sources.HeaterCooler.PartialHeaterCoolerPI; parameter Boolean Heater_on = true "Activates the heater" annotation(Dialog(tab = "Heater",enable=not recOrSep)); parameter Boolean Cooler_on = true "Activates the cooler" annotation(Dialog(tab = "Cooler",enable=not recOrSep)); parameter Boolean staOrDyn = true "Static or dynamic activation of heater" annotation(choices(choice = true "Static", choice = false "Dynamic", diff --git a/AixLib/Utilities/Sources/HeaterCooler/PartialHeaterCoolerPI.mo b/AixLib/Utilities/Sources/HeaterCooler/PartialHeaterCoolerPI.mo index bd07c182f4..20d416be49 100644 --- a/AixLib/Utilities/Sources/HeaterCooler/PartialHeaterCoolerPI.mo +++ b/AixLib/Utilities/Sources/HeaterCooler/PartialHeaterCoolerPI.mo @@ -1,6 +1,6 @@ within AixLib.Utilities.Sources.HeaterCooler; partial model PartialHeaterCoolerPI - extends AixLib.Utilities.Sources.HeaterCooler.partialHeaterCooler; + extends AixLib.Utilities.Sources.HeaterCooler.PartialHeaterCooler; parameter Real h_heater = 0 "Upper limit controller output of the heater" annotation(Dialog(tab = "Heater", group = "Controller",enable=not recOrSep)); parameter Real l_heater = 0 "Lower limit controller output of the heater" annotation(Dialog(tab = "Heater", group = "Controller",enable=not recOrSep)); parameter Real KR_heater = 1000 "Gain of the heating controller" annotation(Dialog(tab = "Heater", group = "Controller",enable=not recOrSep));