Skip to content

Commit

Permalink
Merge pull request #251 from RWTH-EBC/issue250_OMBugs
Browse files Browse the repository at this point in the history
fixes grammar issues in OpenModelica
  • Loading branch information
marcusfuchs committed May 24, 2016
2 parents 7804a42 + d99fb75 commit 8b6d399
Show file tree
Hide file tree
Showing 12 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion AixLib/Utilities/Sources/HeaterCooler/HeaterCoolerPI.mo
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
Original file line number Diff line number Diff line change
@@ -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},
Expand Down Expand Up @@ -35,4 +35,4 @@ partial model partialHeaterCooler
<li><i>June, 2014&nbsp;</i> by Moritz Lauster:<br/>Added some basic documentation</li>
</ul>
</html>"));
end partialHeaterCooler;
end PartialHeaterCooler;
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
within AixLib.Utilities.Sources.HeaterCooler;
partial model partialHeaterCoolerPI
extends AixLib.Utilities.Sources.HeaterCooler.partialHeaterCooler;
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));
parameter Real KR_heater = 1000 "Gain of the heating controller" annotation(Dialog(tab = "Heater", group = "Controller",enable=not recOrSep));
Expand Down Expand Up @@ -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;
4 changes: 2 additions & 2 deletions AixLib/Utilities/Sources/HeaterCooler/package.order
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
HeaterCoolerPI
partialHeaterCooler
partialHeaterCoolerPI
PartialHeaterCooler
PartialHeaterCoolerPI
2 changes: 1 addition & 1 deletion AixLib/package.mo
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
within ;
package AixLib
annotation(uses(Modelica(version = "3.2.1")), version = "0.3.0", Documentation(info = "<html>
annotation(uses(Modelica(version = "3.2.1")), version = "0.3.1", 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>
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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).

0 comments on commit 8b6d399

Please sign in to comment.