Skip to content

Commit

Permalink
Graphical changes to basic components
Browse files Browse the repository at this point in the history
  • Loading branch information
@saroele
saroele committed Nov 19, 2014
1 parent 518b9b7 commit 0f73ffe
Show file tree
Hide file tree
Showing 10 changed files with 95 additions and 33 deletions.
51 changes: 43 additions & 8 deletions FastBuildings/Input/BaseClasses/Partial_SIM.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,47 @@ partial model Partial_SIM
Your model is using an outer \"sim\" component but
an inner \"sim\" component is not defined.
For simulation drag a sim from FastBuildings.Input
into your model to specify your Simulation Input Manager.", Diagram(coordinateSystem(extent = {{-100,-100},{100,100}}, preserveAspectRatio = false, initialScale = 0.1, grid = {2,2}), graphics), Icon(coordinateSystem(extent = {{-100,-100},{100,100}}, preserveAspectRatio = false, initialScale = 0.1, grid = {2,2}), graphics={ Ellipse(origin = {-16.2795,-2.51383}, extent = {{-15.3545,13.7557},{40.6536,-39.7386}}, endAngle = 360),Line(origin = {35.7667,32.6395}, points={{
-14.5098,-17.7778},{10.2333,11.3605}}), Line(origin = {-32.2373,35.083}, points={{
10.9804,-21.5686},{-11.7627,10.917}}), Line(origin = {-70.357,-0.181041}, points={{
22.3529,-5.4902},{-13.643,-3.81896}}), Line(origin = {-56.8326,-62.6043}, points={{
26.9885,18.6224},{-1.1674,-9.3957}}), Line(origin = {42.2926,-65.0779}, points={{
-21.4379,25.098},{3.7074,-8.9221}}), Line(origin = {60.0704,-13.7557}, points = {{-20.915,2.61438},{20.915,3.66013}}),Text(origin={
-0.6119,74.1468}, fillColor = {0,0,255}, extent={{
-98.6119,24.1468},{98.6119,-24.1468}}, textString = "%name")}));
into your model to specify your Simulation Input Manager.", Diagram(coordinateSystem(extent = {{-100,-100},{100,100}}, preserveAspectRatio = false, initialScale = 0.1, grid = {2,2}), graphics), Icon(coordinateSystem(extent={{-100,
-100},{100,100}}, preserveAspectRatio=false, initialScale = 0.1, grid = {2,2}), graphics={
Text(origin={
0.3881,85.1468}, fillColor=
{0,0,255}, extent={{
-99.6119,13.1468},{99.6119,-13.1468}},
textString="%name",
lineColor={0,0,255}),
Ellipse(
extent={{-32,24},{30,-34}},
lineColor={0,0,255},
fillPattern=FillPattern.Solid,
fillColor={0,0,255}),
Line(
points={{14,26},{34,54}},
color={0,0,255},
thickness=0.5,
smooth=Smooth.None),
Line(
points={{36,-8},{38,-8},{74,-12}},
color={0,0,255},
thickness=0.5,
smooth=Smooth.None),
Line(
points={{16,-34},{30,-66}},
color={0,0,255},
thickness=0.5,
smooth=Smooth.None),
Line(
points={{-18,-34},{-34,-64}},
color={0,0,255},
thickness=0.5,
smooth=Smooth.None),
Line(
points={{-36,-6},{-76,-4}},
color={0,0,255},
thickness=0.5,
smooth=Smooth.None),
Line(
points={{-22,24},{-40,52}},
color={0,0,255},
thickness=0.5,
smooth=Smooth.None)}));
end Partial_SIM;
10 changes: 7 additions & 3 deletions FastBuildings/Zones/BaseClasses/Capacitor.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,13 @@ model Capacitor "Lumped thermal capacity"
{10,10}}, rotation = 0)));
equation
c * der(heaPor.T) = heaPor.Q_flow;
annotation(Diagram, Icon(graphics={ Text(rotation = 0, lineColor = {0,0,255}, fillColor = {0,0,0}, pattern = LinePattern.Solid,
fillPattern = FillPattern.None,
lineThickness = 0.25, extent = {{-130.804,110.853},{129.196,59.8534}}, textString = "%name"),
annotation(Diagram, Icon(graphics={ Text(rotation = 0, lineColor={95,95,95}, fillColor=
{0,0,0}, pattern=
LinePattern.Solid,
fillPattern=FillPattern.None,
lineThickness=0.25, extent={{
-100,92},{100,60}},
textString="%name"),
Line(
points={{0,-98},{0,0}},
color={95,95,95},
Expand Down
19 changes: 15 additions & 4 deletions FastBuildings/Zones/BaseClasses/Partials/Partial_SZ.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,22 @@ within FastBuildings.Zones.BaseClasses.Partials;
partial model Partial_SZ "Single zone partial model, no air node"

parameter Integer nIrr = 1 "Number of irradiation inputs/windows";
HT.Interfaces.HeatPort_a heaPorCon "Convective heat transfer" annotation(Placement(visible = true, transformation(extent = {{90,-10},{110,10}})));
HT.Interfaces.HeatPort_a heaPorRad "Radiative heat transfer" annotation(Placement(transformation(extent = {{90,-50},{110,-30}})));
HT.Interfaces.HeatPort_a heaPorCon "Convective heat transfer" annotation(Placement(visible = true, transformation(extent={{92,-8},
{108,8}})));
HT.Interfaces.HeatPort_a heaPorRad "Radiative heat transfer" annotation(Placement(transformation(extent={{92,-48},
{108,-32}})));
//parameter Boolean booEmb = true "if true, add a heatPort for Embedded heat transfer";
HT.Interfaces.HeatPort_b heaPorEmb
"Heat transfer to embedded systems, like tabs" annotation(Placement(visible = true, transformation(origin = {100,39.9057}, extent = {{-10,-10},{10,10}}, rotation = 0), iconTransformation(origin = {100,39.9057}, extent = {{-10,-10},{10,10}}, rotation = 0)));
"Heat transfer to embedded systems, like tabs" annotation(Placement(
visible=true,
transformation(
origin={99.9999,39.9528},
extent={{-7.9999,-7.9528},{7.9999,7.9528}},
rotation=0),
iconTransformation(
origin={100,39.9057},
extent={{-10,-10},{10,10}},
rotation=0)));
Modelica.Blocks.Interfaces.RealOutput TZon
"Zone temperature. Most often this will be air temperature"
annotation (Placement(transformation(extent={{96,-90},{116,-70}}),
Expand All @@ -15,7 +26,7 @@ partial model Partial_SZ "Single zone partial model, no air node"
"Input data, to be provided by an inner submodel of PartialSIM"
annotation (Placement(transformation(extent={{-200,80},{-180,100}})));

annotation(Diagram(coordinateSystem(extent={{-200,-100},{100,100}}, preserveAspectRatio=true, initialScale = 0.1, grid = {2,2}), graphics), Icon(coordinateSystem(extent={{-200,
annotation(Diagram(coordinateSystem(extent={{-200,-100},{100,100}}, preserveAspectRatio=false, initialScale = 0.1, grid = {2,2}), graphics), Icon(coordinateSystem(extent={{-200,
-100},{100,100}}, preserveAspectRatio=true, initialScale = 0.1, grid = {2,2}), graphics={ Polygon(origin = {0.130719,0.130719}, points={{
-200.131,99.8693},{-200.131,-40.1307},{-60.1307,-40.1307},{
-60.1307,-100.131},{99.8693,-100.131},{99.8693,99.8693},{-200.131,
Expand Down
2 changes: 1 addition & 1 deletion FastBuildings/Zones/BaseClasses/Partials/Partial_SZ_ZonEmb.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ protected

equation
connect(resEmbExt.heaPor_b, heaPorEmb) annotation (Line(
points={{90,40},{94,40},{94,39.9057},{100,39.9057}},
points={{90,40},{94,40},{94,39.9528},{99.9999,39.9528}},
color={191,0,0},
smooth=Smooth.None));
connect(resEmbExt.heaPor_a, capEmb.heaPor) annotation (Line(
Expand Down
2 changes: 1 addition & 1 deletion FastBuildings/Zones/BaseClasses/Partials/Partial_SZ_ZonWalEmb.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ protected

equation
connect(resEmbExt.heaPor_b, heaPorEmb) annotation (Line(
points={{90,40},{94,40},{94,39.9057},{100,39.9057}},
points={{90,40},{94,40},{94,39.9528},{99.9999,39.9528}},
color={191,0,0},
smooth=Smooth.None));
connect(resEmbExt.heaPor_a, capEmb.heaPor) annotation (Line(
Expand Down
2 changes: 1 addition & 1 deletion FastBuildings/Zones/BaseClasses/Partials/Partial_SZ_ZonWalIntEmb.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ protected

equation
connect(resEmbExt.heaPor_b, heaPorEmb) annotation (Line(
points={{90,40},{94,40},{94,39.9057},{100,39.9057}},
points={{90,40},{94,40},{94,39.9528},{99.9999,39.9528}},
color={191,0,0},
smooth=Smooth.None));
connect(resEmbExt.heaPor_a, capEmb.heaPor) annotation (Line(
Expand Down
25 changes: 14 additions & 11 deletions FastBuildings/Zones/BaseClasses/Resistance.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,19 @@ extends FastBuildings.Zones.BaseClasses.Partials.TwoPort;
equation
heaPor_a.Q_flow * r = heaPor_a.T - heaPor_b.T;
heaPor_a.Q_flow + heaPor_b.Q_flow = 0;
annotation(Diagram(coordinateSystem(preserveAspectRatio = true, extent = {{-100,-100},{100,100}}), graphics), Icon(graphics={ Text(rotation = 0, lineColor = {0,0,255}, fillColor = {0,0,0}, pattern = LinePattern.Solid,
fillPattern = FillPattern.None,
lineThickness = 0.25, extent = {{-133.961,98.903},{126.039,47.903}}, textString = "%name"),
Line(
points={{-100,0},{100,0}},
annotation(Diagram(coordinateSystem(preserveAspectRatio = true, extent = {{-100,-100},{100,100}}), graphics), Icon(
coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100,
100}}), graphics={ Text(rotation = 0, lineColor=
{95,95,95}, fillColor=
{0,0,0}, pattern=
LinePattern.Solid,
fillPattern=FillPattern.None,
lineThickness=0.25, extent={{
-99.961,90.903},{100,60}},
textString="%name"), Line(
points={{-90,0},{-60,0},{-50,-20},{-30,20},{-10,-20},{10,20},{30,-20},
{50,20},{60,0},{90,0}},
color={95,95,95},
smooth=Smooth.None),
Rectangle(
extent={{-80,20},{80,-20}},
lineColor={95,95,95},
fillColor={95,95,95},
fillPattern=FillPattern.Solid)}));
thickness=0.5,
smooth=Smooth.None)}));
end Resistance;
13 changes: 11 additions & 2 deletions FastBuildings/Zones/Windows/PartialWindow.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ partial model PartialWindow "Partial window model"
-0.52412}, extent = {{-12,-12},{12,12}}, rotation = 0)));

annotation(Diagram(graphics),
Icon(graphics={
Icon(coordinateSystem(preserveAspectRatio=false, extent={
{-100,-100},{100,100}}),
graphics={
Rectangle(
extent={{-60,80},{60,-80}},
lineColor={95,95,95},
Expand All @@ -30,5 +32,12 @@ partial model PartialWindow "Partial window model"
Line(
points={{-60,-4},{60,-4}},
color={95,95,95},
smooth=Smooth.None)}));
smooth=Smooth.None),
Text(
extent={{-100,102},{100,82}},
lineColor={95,95,95},
lineThickness=0.5,
fillColor={95,95,95},
fillPattern=FillPattern.Solid,
textString="%name")}));
end PartialWindow;
2 changes: 1 addition & 1 deletion FastBuildings/Zones/ZonWalEmb_C.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ equation
color={191,0,0},
smooth=Smooth.None));
connect(resGro.heaPor_a, capEmb.heaPor) annotation (Line(
points={{-40,-46},{-40,-26},{60,-26},{60,60}},
points={{-14,-42},{-14,-26},{60,-26},{60,60}},
color={191,0,0},
smooth=Smooth.None));
annotation (Diagram(coordinateSystem(preserveAspectRatio=true, extent={{-200,
Expand Down
2 changes: 1 addition & 1 deletion FastBuildings/Zones/ZonWalEmb_D.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ model ZonWalEmb_D
"Total thermal resistance of infiltration and static heat losses, in K/W";
equation
connect(resGro.heaPor_a, capEmb.heaPor) annotation (Line(
points={{-40,-46},{-40,-26},{60,-26},{60,60}},
points={{-14,-42},{-14,-26},{60,-26},{60,60}},
color={191,0,0},
smooth=Smooth.None));
annotation (Diagram(coordinateSystem(preserveAspectRatio=true, extent={{-200,
Expand Down

0 comments on commit 0f73ffe

Please sign in to comment.