Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change __ctrlFlow annotations #4093

Merged
merged 4 commits into from
Jan 22, 2025
+11 −11
Merged

Change __ctrlFlow annotations #4093

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5ebd8af
Change __ctrlFlow annotations
AntoineGautier Jan 10, 2025
d75d239
Fix description strings
AntoineGautier Jan 10, 2025
7b5019d
Merge branch 'master' of github.com:lbl-srg/modelica-buildings into i…
AntoineGautier Jan 13, 2025
bfa3afa
Update checksum
AntoineGautier Jan 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Buildings/Resources/Scripts/travis/templates/AirHandlersFans.checksum
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
c07bc835970e730c2e3e7c2e7487b371
871da6b74c9f493dd4a4e12e0589afd1
2 changes: 1 addition & 1 deletion Buildings/Resources/Scripts/travis/templates/Plants.HeatPumps.checksum
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
77560e40fe65800506b841193ca43fd6
cea8833433e2ef85285ade2ceaf980fd
2 changes: 1 addition & 1 deletion Buildings/Resources/Scripts/travis/templates/ZoneEquipment.checksum
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
c66f628a17e46629d8b75226f9559a19
5376a9103524e8ce186e4015664766e8
2 changes: 1 addition & 1 deletion Buildings/Templates/AirHandlersFans/VAVMultiZone.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,7 @@ equation
connect(fanSupBlo.port_b, coiHeaPre.port_a)
annotation (Line(points={{-30,-200},{10,-200}}, color={0,127,255}));
annotation (
__ctrlFlow_template,
__ctrlFlow(routing="template"),
defaultComponentName="VAV",
Icon(coordinateSystem(preserveAspectRatio=false), graphics={
Rectangle(
Expand Down
1 change: 0 additions & 1 deletion Buildings/Templates/AirHandlersFans/package.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package AirHandlersFans "Air handlers and fans"
extends Modelica.Icons.Package;

annotation (
__ctrlFlow_template,
Documentation(info="<html>
<p>
This package contains templates for air handlers and fans.
Expand Down
2 changes: 1 addition & 1 deletion Buildings/Templates/Plants/Controls/HeatPumps/package.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
within Buildings.Templates.Plants.Controls;
package HeatPumps
package HeatPumps "Controllers for heat pump plants"
annotation (Documentation(info="<html>
<p>
This package contains control sequences for heat pump plants.
Expand Down
2 changes: 1 addition & 1 deletion Buildings/Templates/Plants/HeatPumps/package.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
within Buildings.Templates.Plants;
package HeatPumps "Heat pump plant"
package HeatPumps "Heat pump plants"
extends Modelica.Icons.Package;
annotation (
Documentation(
Expand Down
2 changes: 1 addition & 1 deletion Buildings/Templates/ZoneEquipment/VAVBoxCoolingOnly.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ model VAVBoxCoolingOnly "VAV terminal unit cooling only"
"Guideline 36 controller for VAV terminal unit cooling only");

annotation (
__ctrlFlow_template,
__ctrlFlow(routing="template"),
defaultComponentName="VAVBox",
Documentation(info="<html>
<h4>Description</h4>
Expand Down
2 changes: 1 addition & 1 deletion Buildings/Templates/ZoneEquipment/VAVBoxReheat.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ model VAVBoxReheat "VAV terminal unit with reheat"
"Guideline 36 controller for VAV terminal unit with reheat");

annotation (
__ctrlFlow_template,
__ctrlFlow(routing="template"),
defaultComponentName="VAVBox",
Documentation(info="<html>
<h4>Description</h4>
Expand Down
1 change: 0 additions & 1 deletion Buildings/Templates/ZoneEquipment/package.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package ZoneEquipment "Zone equipment"
extends Modelica.Icons.Package;

annotation (
__ctrlFlow_template,
Documentation(info="<html>
<p>
This package contains templates for zone equipment (HVAC terminal units).
Expand Down
4 changes: 3 additions & 1 deletion Buildings/Templates/package.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ within Buildings;
package Templates "Package with templates for various HVAC systems"
extends Modelica.Icons.Package;

annotation (Documentation(info="<html>
annotation (
__ctrlFlow(routing="root"),
Documentation(info="<html>
<p>
This package contains templates for common HVAC systems.
A template is defined as a user-configurable model that can represent various
Expand Down