Merge pull request #161 from RWTH-EBC/issue150_BugReplaceable

RWTH-EBC · Feb 17, 2016 · cad9a2d · cad9a2d
2 parents 84b7811 + 692ac33
commit cad9a2d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/AixLib/Building/LowOrder/Multizone/partialMultizone.mo b/AixLib/Building/LowOrder/Multizone/partialMultizone.mo
@@ -7,21 +7,19 @@ protected
     "Choose setup for zones" annotation (choicesAllMatching=false);
   parameter Integer orientations[:]=zoneParam.n "Number cardinal directions";
 public
-  replaceable AixLib.Building.LowOrder.ThermalZone.ThermalZoneEquipped zone[buildingParam.numZones](
-      zoneParam=zoneParam) constrainedby
-    AixLib.Building.LowOrder.ThermalZone.partialThermalZone
-    "Choose thermal zone model"                                                         annotation (Placement(transformation(extent={{40,35},
+  replaceable AixLib.Building.LowOrder.ThermalZone.ThermalZoneEquipped zone[buildingParam.numZones] constrainedby
+    AixLib.Building.LowOrder.ThermalZone.partialThermalZone(zoneParam=zoneParam)
+    "Choose thermal zone model" annotation (Placement(transformation(extent={{40,35},
             {80,75}})),choicesAllMatching=true);
   AixLib.Utilities.Interfaces.SolarRad_in radIn[max(orientations)]
-    "Solar radiation"                                                                annotation (
+    "Solar radiation" annotation (
       Placement(transformation(
         extent={{-10,-10},{10,10}},
         rotation=270,
         origin={-20,92}), iconTransformation(
         extent={{-10,-10},{10,10}},
         rotation=270,
         origin={-62,90})));
-
   Modelica.Blocks.Interfaces.RealInput internalGains[3*buildingParam.numZones]
     "Input profiles for internal gains persons, machines, light"
     annotation (Placement(transformation(extent={{20,-20},{-20,20}},

diff --git a/AixLib/package.mo b/AixLib/package.mo
@@ -1,6 +1,6 @@
 within ;
 package AixLib
-  annotation(uses(Modelica(version = "3.2.1")), version = "0.2.4", Documentation(info = "<html>
+  annotation(uses(Modelica(version = "3.2.1")), version = "0.2.5", Documentation(info = "<html>
  <p>The free open-source <code>AixLib</code> 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. </p>
  <p>Various connectors of the Modelica Standard Library are used, e.g. <code>Modelica.Fluid</code> and <code>Modelica.HeatTransfer</code>. These are accompanied by own connectors for simplified hydraulics (no <code>fluid.media</code>, 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 <code>Modelica.Media</code> library. If possible and necessary, components use continuously differentiable equations. In general, zero mass flow rate and reverse flow are supported.</p>
  <p>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.</p>

diff --git a/README.md b/README.md
@@ -23,7 +23,7 @@ Parts of **AixLib** have been developed within public funded projects and with f
 
 ### Version
 
-The current version 0.2.4 is a pre-release.
+The current version 0.2.5 is a pre-release.
 
 ### How to contribute to the development of AixLib