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.

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

Radiant control from Integral Group #2647

Open
wants to merge 71 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
71 commits
Select commit Hold shift + click to select a range
8d67a34
Added radiant sequences
fionamwoods Jun 24, 2020
7973371
Uploaded interior and exterior zone radiant models
fionamwoods Jun 24, 2020
22fc276
Added test thermal zones
fionamwoods Jun 24, 2020
9f00655
Added new glazing system
fionamwoods Jun 24, 2020
40f7880
Added new R-25 wall
fionamwoods Jun 24, 2020
1d16286
Merge pull request #2 from lbl-srg/master
fionamwoods Jul 1, 2020
f78a1e7
Merge pull request #1 from fionamwoods/radiant
fionamwoods Jul 8, 2020
ceaf817
Radiant control as of 7/23 added
fionamwoods Jul 23, 2020
145ee3d
Test repo
fionamwoods Jul 23, 2020
791ea90
Merge pull request #3 from lbl-srg/master
fionamwoods Jul 23, 2020
2008edc
Nat vent control draft #1
fionamwoods Aug 19, 2020
e1c9229
Radiant changes and nat vent
fionamwoods Aug 19, 2020
58bf641
Radiant changes nat vent add try 2
fionamwoods Aug 19, 2020
51ffe01
Nat vent add try 2
fionamwoods Aug 19, 2020
1cabf9f
Fixed errors with duplicate packages in same file
fionamwoods Aug 19, 2020
b9bd24b
Radiant and nat vent
fionamwoods Sep 16, 2020
8f94d1e
Attempt to add sublockouts
fionamwoods Sep 17, 2020
ed822e7
Sublockout fix:
fionamwoods Sep 17, 2020
65b988f
Merge https://github.com/lbl-srg/modelica-buildings
fionamwoods Sep 22, 2020
1ccb873
Syntax changes
fionamwoods Sep 24, 2020
a5897bf
Lighting no longer as one file
fionamwoods Sep 24, 2020
5384c7c
Updated to match Modelica naming conventions; committed reference res…
fionamwoods Oct 5, 2020
eed3d5e
Added reference results, replaced Modelica blocks with Buildings Libr…
fionamwoods Oct 6, 2020
3a9aa61
Added rev sections, finalized comments
fionamwoods Oct 7, 2020
a0ee2f8
Final clean-up of room model to add each to boundary conditions & avo…
fionamwoods Oct 7, 2020
90017e5
Merge https://github.com/lbl-srg/modelica-buildings
fionamwoods Oct 7, 2020
749f5de
Removed old wall
fionamwoods Oct 7, 2020
74c2ebe
Attempt to fix libraries
fionamwoods Oct 8, 2020
96d07eb
fix accidentally edited packages
fionamwoods Oct 8, 2020
c452d06
fix edited files
fionamwoods Oct 8, 2020
908808b
Water issue
fionamwoods Oct 8, 2020
d48e74d
Final comments
fionamwoods Oct 8, 2020
fe0244d
Attempt #3 to fix accidental changes
fionamwoods Oct 8, 2020
f6284b9
Merge branch 'master' of https://github.com/lbl-srg/modelica-buildings
fionamwoods Oct 8, 2020
b41d457
fix errors on radiant validation models ControlPlusLockoutPerimeter a…
fionamwoods Oct 19, 2020
a2ffb8d
New reference results
fionamwoods Oct 19, 2020
56a24cd
Merge pull request #2087 from fionamwoods/master
milicag Oct 19, 2020
d84aecb
updated documentation formatting and converted package paths to links…
milicag Sep 8, 2021
94d0e0a
merged master in, removed Alarms package [ci skip]
milicag Sep 23, 2021
987a477
removed a parameter that does not exist in the instance class [ci skip]
milicag Sep 23, 2021
c21d18d
temp var rename script, updated hysteresis offset [ci skip]
milicag Sep 23, 2021
f0e31a8
added further models to the variable rename lists [ci skip]
milicag Sep 23, 2021
b656f94
updated reference results, removed obsolete parameter, package test r…
milicag Sep 23, 2021
edc4e1f
edits to formatting and small edits to documentation, added to rename…
milicag Sep 24, 2021
befe7bd
updated and added variables to rename [ci skip]
milicag Sep 24, 2021
8c266ef
renamed part of the variables, up to AllLockouts validation test [ci …
milicag Sep 24, 2021
f4c630b
renamed lockouts until the AllLockout validation test [ci skip]
milicag Sep 25, 2021
db13c70
renamed variables in the lockout models [ci skip]
milicag Sep 25, 2021
e2abcf4
renamed all besides the main controller and its validation models [ci…
milicag Sep 25, 2021
95aa695
renamed variables in the main controller and two of its 3 validators …
milicag Sep 27, 2021
f6d0f4c
updated the last test, finished draft variable rename [ci skip]
milicag Sep 27, 2021
7fbf897
removed obsolete and duplicate models, removed result file names from…
milicag Sep 27, 2021
156ec81
updated reference results [ci skip]
milicag Sep 28, 2021
4253b57
updated simulation statistics in the reference results [ci skip]
milicag Sep 28, 2021
9ce8e15
removed models that are not radiant control [ci skip]
milicag Sep 28, 2021
a5d3c83
removed natural ventilation related models [ci skip]
milicag Sep 28, 2021
4a31bd3
added links to documentation [ci skip]
milicag Sep 28, 2021
e5691cb
Merge remote-tracking branch 'origin' into issue2176_radiant_control_…
milicag Sep 28, 2021
976dfd4
fixed a part of the html errors, fixed revision notes [ci skip]
milicag Sep 28, 2021
8aca5fa
further small edits to html and documentation [ci skip]
milicag Sep 28, 2021
22e5e5e
moved models to OBC package [ci skip]
milicag Sep 29, 2021
c25b5da
reverted auto-introduced edits [ci skip]
milicag Sep 29, 2021
7f1040b
resolved html errors, formatted documentation [ci skip]
milicag Sep 29, 2021
99f1091
re-added the dependencies, updated translation statistics in the refe…
milicag Sep 29, 2021
29e30be
added missing comments [ci skip]
milicag Sep 30, 2021
bdc25c7
resolved warnings found by modelica-json parser [ci skip]
milicag Sep 30, 2021
422fee8
local tests ok for the package, addresses radiant control portion of …
milicag Sep 30, 2021
3b5abb9
updated package order [ci skip]
milicag Sep 30, 2021
77d1810
minor edit
milicag Sep 30, 2021
20e1aa2
ensured files can be verified
milicag Sep 30, 2021
405ab3d
removed scripts related to a removed package
milicag Sep 30, 2021
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
Prev Previous commit
Next Next commit
re-added the dependencies, updated translation statistics in the refe…
…rence results [ci skip]
milicag committed Sep 29, 2021
commit 99f1091fa10ca9fed6accf6c827127e616704cf0
Original file line number Diff line number Diff line change
@@ -330,7 +330,7 @@ Fluid.Movers.FlowControlled_m_flow pumHot(
Modelica.Thermal.HeatTransfer.Components.ThermalConductor conBel3(G=0.2)
"Combined convection and radiation resistance below the slab"
annotation (Placement(transformation(extent={{-182,280},{-162,300}})));
ThermalZones.Detailed.FLEXLAB.Rooms.X3A.TestCellRadiantInterior radInt(
Buildings.ThermalZones.Detailed.FLEXLAB.Rooms.X3A.TestCellRadiantInterior radInt(
nConExtWin=0,
nConBou=5,
energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyStateInitial,
Original file line number Diff line number Diff line change
@@ -279,7 +279,7 @@ Fluid.Movers.FlowControlled_m_flow pumHot(
Buildings.Controls.OBC.CDL.Continuous.Sources.Constant TIntSet(k=294)
"Indoor temperature of adjacent conditioned spaces"
annotation (Placement(transformation(extent={{198,232},{242,276}})));
ThermalZones.Detailed.FLEXLAB.Rooms.X3A.TestCellRadiantExterior radExt(
Buildings.ThermalZones.Detailed.FLEXLAB.Rooms.X3A.TestCellRadiantExterior radExt(
nSurBou=1,
hRoo=3,
steadyStateWindow=false,
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
last-generated=2021-09-28
last-generated=2021-09-29
statistics-initialization=
{
"linear": "0",
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
last-generated=2021-09-28
last-generated=2021-09-29
statistics-initialization=
{
"linear": "0",
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
ASHRAE901Gla
RadiantGlaSB70XL
Original file line number Diff line number Diff line change
@@ -5,5 +5,7 @@ Construction2
Construction3
Construction5and8
Construction9
ConstructionRadiantR25Wall
ExteriorDoorInsulated
ExteriorDoorUninsulated

Original file line number Diff line number Diff line change
@@ -3,3 +3,5 @@ ClosetFullBed
Electrical
TestCell
TestCellFullBed
TestCellRadiantExterior
TestCellRadiantInterior