Skip to content

Commit

Permalink
Merge branch 'develop' from saroele in master from open-ideas. In cas…
Browse files Browse the repository at this point in the history 
…e of conflict, changes from saroele are chosen.
  • Loading branch information
@saroele
saroele committed Jan 11, 2015
2 parents 69dc522 + d1e15c5 commit c374cfe
Show file tree
Hide file tree
Showing 118 changed files with 2,953 additions and 289 deletions.
77 changes: 77 additions & 0 deletions FastBuildings/Buildings/BaseClasses/Partial2Zone.mo
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
within FastBuildings.Buildings.BaseClasses;
partial model Partial2Zone "Two-zone partial"

replaceable FastBuildings.Zones.BaseClasses.Partials.Partial_SZ zon1
annotation (Placement(visible=true, transformation(
origin={-29.0598,0.34188},
extent={{-10,-10},{10,10}},
rotation=0)));
replaceable FastBuildings.HVAC.Partial_HVAC hva1 annotation (Placement(
visible=true, transformation(
origin={18.1197,0.683761},
extent={{-10,-10},{10,10}},
rotation=0)));
outer Input.SIM_Inputs_2Zones simFasBui
"Weather data, to be provided by an inner submodel of Partial_SIM" annotation(Placement(visible = true, transformation(origin={-90.1538,
89.5214}, extent = {{-10,-10},{10,10}}, rotation = 0)));
replaceable FastBuildings.Zones.BaseClasses.Partials.Partial_SZ zon2
annotation (Placement(visible=true, transformation(
origin={-27.0598,-59.6581},
extent={{-10,-10},{10,10}},
rotation=0)));
replaceable Zones.BaseClasses.Wall_1C bou constrainedby
FastBuildings.Zones.BaseClasses.Partials.TwoPort
"boundary wall between zon1 and zon2" annotation (ChoicesAllMatching=true,
Placement(transformation(
extent={{-10,-10},{10,10}},
rotation=90,
origin={-6,-30})));
replaceable FastBuildings.HVAC.Partial_HVAC hva2 annotation (Placement(
visible=true, transformation(
origin={20.1197,-59.3162},
extent={{-10,-10},{10,10}},
rotation=0)));
equation
connect(zon1.TZon, hva1.TZon) annotation (Line(points={{-19.0598,-7.65812},{
7.86325,-7.65812},{7.86325,-7.35031},{8.1619,-7.35031}}));
connect(zon1.heaPorRad, hva1.heaPorRad) annotation (Line(points={{-19.0598,
-3.65812},{8.20513,-3.65812},{8.20513,-3.31624},{8.1027,-3.31624}}));
connect(zon1.heaPorCon, hva1.heaPorCon) annotation (Line(points={{-19.0598,
0.34188},{8.20513,0.34188},{8.20513,0.690581},{8.1367,0.690581}}));
connect(zon1.heaPorEmb, hva1.heaPorEmb) annotation (Line(points={{-19.0598,
4.33245},{8.54701,4.33245},{8.54701,4.67694},{8.1367,4.67694}}));
connect(bou.heaPor_b, hva1.heaPorCon) annotation (Line(
points={{-6,-20},{-6,0},{8.20513,0},{8.20513,0.690581},{8.1367,0.690581}},
color={191,0,0},
smooth=Smooth.None));

connect(zon2.TZon, hva2.TZon) annotation (Line(
points={{-17.0598,-67.6581},{-4,-67.6581},{-4,-67.3503},{10.1619,-67.3503}},
color={0,0,127},
smooth=Smooth.None));

connect(zon2.heaPorEmb, hva2.heaPorEmb) annotation (Line(
points={{-17.0598,-55.6675},{-3.5299,-55.6675},{-3.5299,-55.323},{10.1367,
-55.323}},
color={191,0,0},
smooth=Smooth.None));
connect(zon2.heaPorCon, hva2.heaPorCon) annotation (Line(
points={{-17.0598,-59.6581},{-3.5299,-59.6581},{-3.5299,-59.3094},{
10.1367,-59.3094}},
color={191,0,0},
smooth=Smooth.None));
connect(zon2.heaPorRad, hva2.heaPorRad) annotation (Line(
points={{-17.0598,-63.6581},{-3.5299,-63.6581},{-3.5299,-63.3162},{
10.1027,-63.3162}},
color={191,0,0},
smooth=Smooth.None));
connect(bou.heaPor_a, hva2.heaPorCon) annotation (Line(
points={{-6,-40},{-6,-60},{-3.5299,-60},{-3.5299,-59.3094},{10.1367,
-59.3094}},
color={191,0,0},
smooth=Smooth.None));
annotation(Diagram(coordinateSystem(extent={{-100,-100},{100,100}}, preserveAspectRatio=false, initialScale = 0.1, grid = {2,2}),
graphics), Icon(coordinateSystem(extent = {{-100,-100},{100,100}}, preserveAspectRatio = true, initialScale = 0.1, grid = {2,2}), graphics={ Rectangle(origin= {0.854701,-33.6752}, extent= {{-77.7778,-66.4957},{77.7778,66.4957}}),Polygon(origin= {-1.03388,65.2156}, points= {{-95.7183,-32.3951},{95.7347,-32.3951},{-2.04304,32.5622},{-95.7183,-32.3951}}),Text(origin= {0,-40.17}, lineColor=
{170,0,0}, extent= {{-58.8,37.44},{58.8,-37.44}},
textString="Z2")}));
end Partial2Zone;
50 changes: 50 additions & 0 deletions FastBuildings/Buildings/BaseClasses/PartialBuilding_IDEAS.mo
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
within FastBuildings.Buildings.BaseClasses;
partial model PartialBuilding_IDEAS "Multizone building, compatible with IDEAS"

extends IDEAS.Interfaces.BaseClasses.Structure(nZones=1, final nEmb=nZones);
parameter Integer nIrr(min = 1) "Number of irradiation vectors";
inner FastBuildings.Input.SIM_Inputs simFasBui(nIrr=nIrr)
"Weather data, to be provided by an inner submodel of Partial_SIM" annotation(Placement(visible = true, transformation(origin={-138.154,
89.5214}, extent = {{-10,-10},{10,10}}, rotation = 0)));
replaceable Zones.BaseClasses.Partials.Partial_SZ[nZones] zon(nIrr=nIrr)
"Array of zones" annotation(choicesAllMatching = true, Placement(visible = true, transformation(origin={1.4701,
-2.8291}, extent={{
-64.5299,-42.8291},{64.5299,42.8291}}, rotation = 0)));
IDEAS.Climate.Meteo.Solar.RadSol[nIrr] radSol(
each A=1,
inc=inc,
azi=azi) "Solar radiation processor for each nIrr"
annotation (Placement(transformation(extent={{-148,34},{-128,54}})));

parameter SI.Angle inc[nIrr]
"inclination, one value for each solar radiation to be computed";
parameter SI.Angle azi[nIrr]
"azimuth, one value for each solar radiation to be included";
equation
simFasBui.TAmb = sim.Te;
simFasBui.TSet = 0;
simFasBui.qHeaCoo = 0;
simFasBui.powEle = 0;
for i in 1:nIrr loop
simFasBui.irr[i] = radSol[i].solDir + radSol[i].solDif;
end for;

connect(zon.heaPorEmb, heatPortEmb) annotation (Line(
points={{66,14.2622},{105,14.2622},{105,60},{150,60}},
color={191,0,0},
smooth=Smooth.None));
connect(zon.heaPorCon, heatPortCon) annotation (Line(
points={{66,-2.8291},{90,-2.8291},{90,-4},{120,-4},{120,20},{150,20}},
color={191,0,0},
smooth=Smooth.None));
connect(zon.heaPorRad, heatPortRad) annotation (Line(
points={{66,-19.9607},{106,-19.9607},{106,-20},{150,-20}},
color={191,0,0},
smooth=Smooth.None));
connect(zon.TZon, TSensor) annotation (Line(
points={{66,-37.0924},{106,-37.0924},{106,-60},{156,-60}},
color={0,0,127},
smooth=Smooth.None));
annotation (Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-150,
-100},{150,100}}), graphics));
end PartialBuilding_IDEAS;
2 changes: 1 addition & 1 deletion FastBuildings/Buildings/BaseClasses/PartialSingleZone.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ equation
0.34188},{8.20513,0.34188},{8.20513,0.690581},{8.1367,0.690581}}));
connect(zon.heaPorEmb,hva.heaPorEmb) annotation(Line(points={{-19.0598,
4.33245},{8.54701,4.33245},{8.54701,4.67694},{8.1367,4.67694}}));
annotation(Diagram(coordinateSystem(extent = {{-100,-100},{100,100}}, preserveAspectRatio = true, initialScale = 0.1, grid = {2,2})), Icon(coordinateSystem(extent = {{-100,-100},{100,100}}, preserveAspectRatio = true, initialScale = 0.1, grid = {2,2}), graphics={ Rectangle(origin = {0.854701,-33.6752}, extent = {{-77.7778,-66.4957},{77.7778,66.4957}}),Polygon(origin = {-1.03388,65.2156}, points = {{-95.7183,-32.3951},{95.7347,-32.3951},{-2.04304,32.5622},{-95.7183,-32.3951}}),Text(origin = {0,-40.17}, lineColor = {170,0,0}, extent = {{-58.8,37.44},{58.8,-37.44}}, textString = "SZ")}));
annotation(Diagram(coordinateSystem(extent = {{-100,-100},{100,100}}, preserveAspectRatio = true, initialScale = 0.1, grid = {2,2})), Icon(coordinateSystem(extent = {{-100,-100},{100,100}}, preserveAspectRatio = true, initialScale = 0.1, grid = {2,2}), graphics={ Rectangle(origin= {0.854701,-33.6752}, extent= {{-77.7778,-66.4957},{77.7778,66.4957}}),Polygon(origin= {-1.03388,65.2156}, points= {{-95.7183,-32.3951},{95.7347,-32.3951},{-2.04304,32.5622},{-95.7183,-32.3951}}),Text(origin= {0,-40.17}, lineColor= {170,0,0}, extent= {{-58.8,37.44},{58.8,-37.44}}, textString= "SZ")}));
end PartialSingleZone;
4 changes: 4 additions & 0 deletions FastBuildings/Buildings/BaseClasses/package.mo
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
within FastBuildings.Buildings;
package BaseClasses
import SI = Modelica.SIunits;
import HT = Modelica.Thermal.HeatTransfer;



end BaseClasses;
4 changes: 3 additions & 1 deletion FastBuildings/Buildings/BaseClasses/package.order
View file
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
PartialSingleZone
PartialSingleZone
PartialBuilding_IDEAS
Partial2Zone
35 changes: 35 additions & 0 deletions FastBuildings/Buildings/SZ_TAmb_QHea.mo
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
within FastBuildings.Buildings;
model SZ_TAmb_QHea "replaceable RC model for the zone"

Modelica.Blocks.Interfaces.RealInput TAmb annotation(Placement(visible = true, transformation(origin = {-103.237,22.1465}, extent = {{-12,-12},{12,12}}, rotation = 0), iconTransformation(origin = {-103.237,22.1465}, extent = {{-12,-12},{12,12}}, rotation = 0)));
replaceable FastBuildings.RCModels.Partial_RC RC "RC model" annotation(Placement(visible = true, transformation(origin = {54.4858,17.5143}, extent = {{-12,-12},{12,12}}, rotation = 0)));
HT.Sources.PrescribedTemperature TAmb2HeaPor annotation(Placement(visible = true, transformation(origin = {-49.7445,22.1465}, extent = {{-7.45106,-7.45106},{7.45106,7.45106}}, rotation = 0)));
FastBuildings.HVAC.H_Input hvac annotation(Placement(visible = true, transformation(origin = {-1.36286,0}, extent = {{-12,-12},{12,12}}, rotation = 0)));
Modelica.Blocks.Interfaces.RealInput QHea annotation(Placement(visible = true, transformation(origin = {-103.578,-40.5452}, extent = {{-12,-12},{12,12}}, rotation = 0), iconTransformation(origin = {-103.578,-40.5452}, extent = {{-12,-12},{12,12}}, rotation = 0)));
equation
connect(QHea,hvac.QHea) annotation(Line(points={{-103.578,-40.5452},{
-31.0051,-40.5452},{-31.0051,-7.49574},{-13.8739,-7.49574},{
-13.8739,-7.15502}}));
connect(RC.TZon,hvac.TZon) annotation(Line(points={{66.9152,17.8823},{
84.1567,17.8823},{84.1567,-57.2402},{-35.4344,-57.2402},{-35.4344,
4.70274e-005},{-13.7922,4.70274e-005},{-13.7922,-0.0408857}}));
connect(hvac.heatPortCon,RC.heatPortCon) annotation(Line(points={{10.6575,
9.60818},{19.7615,9.60818},{19.7615,16.0136},{42.5894,16.0136},{
42.5894,17.5143},{42.4858,17.5143}}));
connect(hvac.heatPortRad,RC.heatPortRad) annotation(Line(points={{10.6167,
4.2657e-007},{22.1465,4.2657e-007},{22.1465,13.2879},{42.2487,
13.2879},{42.2487,12.7143},{42.4858,12.7143}}));
connect(hvac.heatPortEmb,RC.heatPortEmb) annotation(Line(points={{10.6575,
-9.60817},{30.6644,-9.60817},{30.6644,8.51789},{42.4858,8.51789},{
42.4858,7.90298}}));
connect(TAmb,TAmb2HeaPor.T) annotation(Line(points={{-103.237,22.1465},{
-65.5393,22.1465},{-65.5393,22.1465},{-58.6858,22.1465}}));
connect(TAmb2HeaPor.port,RC.heatPortAmb) annotation(Line(points={{
-42.2934,22.1465},{38.4729,22.1465},{38.4729,22.3143},{42.4858,
22.3143}}));
annotation(Icon(graphics={ Rectangle(rotation= 0, lineColor= {0,0,255}, fillColor= {170,0,0}, pattern= LinePattern.Solid,
fillPattern= FillPattern.Solid,
lineThickness= 0.25, extent= {{-79.046,-100.17},{80.4089,20.1022}}),Polygon(points= {{-99.4889,8},{0.340716,87.7274},{99.1482,8},{-99.4889,8}}, rotation= 0, lineColor= {0,0,255}, fillColor= {170,0,0}, pattern= LinePattern.Solid,
fillPattern= FillPattern.Solid,
lineThickness= 0.25)}), Diagram);
end SZ_TAmb_QHea;
13 changes: 13 additions & 0 deletions FastBuildings/Buildings/Z2_Inputs.mo
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
within FastBuildings.Buildings;
model Z2_Inputs "2-zone building, with HVAC read from inputs"
extends FastBuildings.Buildings.BaseClasses.Partial2Zone(
redeclare FastBuildings.HVAC.Heating_Input hva1,
redeclare FastBuildings.HVAC.Heating_Input hva2,
bou(r=1e-3, c=1e6));
equation
connect(simFasBui.qHeaCoo1, hva1.qHeaCoo);
connect(simFasBui.qHeaCoo2, hva2.qHeaCoo);

annotation(Icon(coordinateSystem(extent = {{-100,-100},{100,100}}, preserveAspectRatio = true, initialScale = 0.1, grid = {2,2})), Diagram(coordinateSystem(extent={{-100,
-100},{100,100}}, preserveAspectRatio=false, initialScale = 0.1, grid = {2,2}), graphics));
end Z2_Inputs;
6 changes: 6 additions & 0 deletions FastBuildings/Buildings/package.mo
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
within FastBuildings;
package Buildings "Package containing fully operational single building models"







end Buildings;
12 changes: 7 additions & 5 deletions FastBuildings/Buildings/package.order
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
SZ_Design
SZ_Inputs
SZ_Inputs_powEle
SZ_Controlled
BaseClasses
SZ_Design
SZ_Inputs
SZ_Inputs_powEle
SZ_Controlled
BaseClasses
SZ_TAmb_QHea
Z2_Inputs
Binary file added FastBuildings/DesignPrinciples.pdf
View file
Binary file not shown.
Loading

0 comments on commit c374cfe

Please sign in to comment.