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

ASHRAE Guideline 36, Section 4 #263

Open
wants to merge 119 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 113 commits
Commits
Show all changes
119 commits
Select commit Hold shift + click to select a range
614a593
add 4.12 fan coil unit template
MatthewSteen Jun 16, 2023
e91fdf7
Merge branch 'develop' into guideline36-section4
MatthewSteen Jun 16, 2023
fae2fd7
add 4.12 fan coil unit shapes, update components shapes
MatthewSteen Jun 23, 2023
6dac4ba
4.12 cleanup prefixes
MatthewSteen Jun 23, 2023
b430da0
components prefix cleanup
MatthewSteen Jun 23, 2023
7ac8343
address FCU template review comments
MatthewSteen Jun 29, 2023
d71efc2
cleanup FCU template params and optionals
MatthewSteen Jul 17, 2023
521815e
clean up 4.12 fcu shapes
MatthewSteen Jul 26, 2023
1061c3e
cleanup 4.12 fcu and components shapes and templates
MatthewSteen Jul 27, 2023
304ce61
add 4.11 components shapes
MatthewSteen Aug 7, 2023
288cd31
add 4.11 hot water plant shapes
MatthewSteen Aug 7, 2023
d1727a3
replace deprecated supply/return with leaving/entering
MatthewSteen Aug 12, 2023
c80b9a2
put sh:path inside sh:property
MatthewSteen Aug 12, 2023
966cfe4
4.11 cleanup with new loop implementation
MatthewSteen Aug 30, 2023
5269e60
4.11 more cleanup
MatthewSteen Sep 6, 2023
ee7f624
add 4.10 chilled water plant shapes
MatthewSteen Sep 13, 2023
f328424
update components shapes
MatthewSteen Sep 13, 2023
4a1ead1
Update libraries/ashrae/guideline36/4.10-chilled-water-plant.ttl
MatthewSteen Sep 28, 2023
b7a1149
address review comments
MatthewSteen Oct 3, 2023
594b7ef
few fixes per @gtfierro
MatthewSteen Oct 25, 2023
65ac15c
add 4.11 hot water plant templates
MatthewSteen Feb 13, 2024
2a8e522
cleanup 4.11 hot water plant template
MatthewSteen Feb 18, 2024
93af6f3
add 4.10 chilled water plant templates
MatthewSteen Feb 21, 2024
2864c0b
cleanup 4.10 chilled water plant templates
MatthewSteen Feb 22, 2024
504bbed
water-side components templates
MatthewSteen Feb 22, 2024
86ef30e
cleanup water-side components shapes
MatthewSteen Feb 22, 2024
de85b4c
cleanup 4.10 chilled water plant shapes
MatthewSteen Feb 22, 2024
6782c56
cleanup 4.11 hot water plant shapes
MatthewSteen Feb 22, 2024
67af3cc
update HW valve switches
MatthewSteen Feb 22, 2024
89f0b92
update comment
MatthewSteen Feb 22, 2024
3e48153
Merge branch 'develop' into guideline36-section4
MatthewSteen Feb 22, 2024
e3b44d8
Merge branch 'guideline36-section4' into guideline36-section4-wtr-side
MatthewSteen Feb 22, 2024
5680be8
syntax
MatthewSteen Feb 22, 2024
cbb0a7f
Merge pull request #265 from NREL/guideline36-section4-wtr-side
MatthewSteen Jun 5, 2024
cb486fe
fix TTL syntax for tests
MatthewSteen Jun 20, 2024
4fa5506
more TTL syntax fixes for tests
MatthewSteen Jun 20, 2024
7c72450
Merge branch 'develop' into guideline36-section4
MatthewSteen Jul 3, 2024
62d39aa
components.ttl. conflicts
MatthewSteen Jul 3, 2024
2ba2c79
Merge branch 'develop' into guideline36-section4
MatthewSteen Jul 3, 2024
c5f51df
make CHW and HW loop names unique to pass sqlalchemy unique contraint
MatthewSteen Jul 3, 2024
b408c5e
cleanup 4.1 shapes
MatthewSteen Jul 4, 2024
727bb21
cleanup 4.2 shapes
MatthewSteen Jul 4, 2024
1258bf9
cleanup 4.3 shapes
MatthewSteen Jul 4, 2024
6f70402
cleanup 4.4 shapes
MatthewSteen Jul 4, 2024
faa03df
cleanup 4.5 shapes
MatthewSteen Jul 4, 2024
c75d28a
cleanup 4.6 shapes
MatthewSteen Aug 1, 2024
019c10f
add 4.7 shapes
MatthewSteen Aug 6, 2024
e0777cb
cleanup 4.8 shapes
MatthewSteen Aug 6, 2024
993d7c2
add 4.9 shapes
MatthewSteen Aug 6, 2024
64b5e51
add 4.9 shape for zone temp
MatthewSteen Aug 6, 2024
3ee9bee
mv multiple-zone-vav-AHU.ttl
MatthewSteen Aug 7, 2024
ec94b6f
remove rdf prefix, add separate damper types
MatthewSteen Aug 12, 2024
c30f25f
add and cleanup components
MatthewSteen Aug 13, 2024
3a4726e
cleanup comments and labels, misc fixes
MatthewSteen Aug 13, 2024
e86e104
cleanup terminal unit subject names
MatthewSteen Aug 13, 2024
233f96d
pushed the 4.3 YML instead of TTL
MatthewSteen Aug 13, 2024
2eabdd9
rename terminal unit shape files
MatthewSteen Aug 13, 2024
ba0df3f
rename terminal unit template files
MatthewSteen Aug 13, 2024
6cd366b
rename AHU template files
MatthewSteen Aug 13, 2024
ed63d90
rename AHU template files
MatthewSteen Aug 19, 2024
d787270
cleanup 4.1, 4.2, 4.3, 4.4, 4.5, 4.9, 4.12 templates
MatthewSteen Aug 19, 2024
ba2c0d5
rename 4.6, 4.7, 4.8 shape files
MatthewSteen Aug 19, 2024
0cf99fb
cleanup 4.6, 4.7, 4.8 shapes
MatthewSteen Aug 21, 2024
441518a
cleanup 4.6, 4.7, 4.8 templates
MatthewSteen Aug 21, 2024
72366b4
move 4.4 and 4.5 decks to components
MatthewSteen Aug 21, 2024
12264ce
cleanup 4.1, 4.2, 4.3, 4.4, 4.5 templates
MatthewSteen Aug 21, 2024
4f53d77
cleanup 4.9, 4.12 templates
MatthewSteen Aug 21, 2024
a644828
update components template
MatthewSteen Aug 21, 2024
d827731
add dual duct decks shapes to components
MatthewSteen Aug 21, 2024
99622da
change 4.3 class
MatthewSteen Aug 21, 2024
5329eab
fix 4.3 damper template
MatthewSteen Aug 21, 2024
67fcc9d
remove comments from 4.6 template
MatthewSteen Aug 21, 2024
cd5e949
Merge branch 'develop' into guideline36-section4
MatthewSteen Sep 11, 2024
0947487
brick 1.3 => 1.4
MatthewSteen Sep 11, 2024
b2b4e3c
update Brick to 1.4.1
gtfierro Sep 11, 2024
bc677e3
Update Brick 1.3 -> 1.4 references
gtfierro Sep 11, 2024
e6452a3
move the target query out of the hot loop; we probably do not need to…
gtfierro Sep 12, 2024
6194eba
Merge branch 'develop' into gtf-notebook-runtime-fix
gtfierro Sep 12, 2024
45213ec
reduce the number of shapes we check in the notebook
gtfierro Sep 12, 2024
627e388
Merge branch 'gtf-notebook-runtime-fix' of github.com:NREL/BuildingMO…
gtfierro Sep 12, 2024
e29894d
fix composition of shacl shapes
gtfierro Sep 12, 2024
5a8bfce
break out integration tests to only run once
gtfierro Sep 12, 2024
ece4028
remove commented line
gtfierro Sep 12, 2024
ad69055
break out libraries into its own test
gtfierro Sep 12, 2024
62b95f4
remove libraries from integration
gtfierro Sep 13, 2024
c4ca75f
Merge remote-tracking branch 'origin/gtf-notebook-runtime-fix' into u…
gtfierro Sep 13, 2024
1a42b32
Revert "Merge branch 'develop' into guideline36-section4"
MatthewSteen Sep 13, 2024
7c41159
Merge pull request #332 from NREL/guideline36-section4-air-side
MatthewSteen Sep 13, 2024
84c883e
Merge branch 'develop' into guideline36-section4
MatthewSteen Sep 16, 2024
219c9c8
Merge remote-tracking branch 'origin/develop' into develop
MatthewSteen Sep 16, 2024
3863a49
conflicts Merge branch 'develop' into guideline36-section4
MatthewSteen Sep 16, 2024
00c1110
Merge branch 'develop' into update-brick-141
gtfierro Sep 16, 2024
0401fd0
Merge remote-tracking branch 'origin/update-brick-141' into guideline…
gtfierro Sep 16, 2024
bde009c
update 4.10 and 4.11 brick library version to 1.4
MatthewSteen Sep 17, 2024
9579cba
update g36 ontology imported brick version to 1.4
MatthewSteen Sep 17, 2024
c22fedc
fix WSE bypass valve template
MatthewSteen Sep 18, 2024
f0647d5
Merge branch 'develop' into guideline36-section4
MatthewSteen Sep 18, 2024
61aca92
fix internal Brick
gtfierro Sep 18, 2024
3fc64ec
Merge branch 'develop' into guideline36-section4
MatthewSteen Sep 18, 2024
89cb799
update Brick subset
gtfierro Sep 18, 2024
5af5036
Merge branch 'guideline36-section4' of github.com:NREL/BuildingMOTIF …
gtfierro Sep 18, 2024
1a5caeb
rogue ontology declarations -- only 1 per library!
gtfierro Sep 19, 2024
375767d
bump more 1.3 -> 1.4
gtfierro Sep 19, 2024
8e99932
use the correct SHACL engine
gtfierro Sep 19, 2024
7300ad4
1.3 -> 1.4
gtfierro Sep 19, 2024
6f4af0e
update template names
gtfierro Sep 19, 2024
74e11db
update template names and 1.3->1.4
gtfierro Sep 19, 2024
9e65862
Merge branch 'guideline36-section4' of github.com:NREL/BuildingMOTIF …
gtfierro Sep 19, 2024
9335feb
Reapply "Merge branch 'develop' into guideline36-section4"
MatthewSteen Sep 19, 2024
f7f84b6
fix validation for g36 in api test
gtfierro Sep 19, 2024
4bfbc0d
Merge branch 'guideline36-section4' of github.com:NREL/BuildingMOTIF …
gtfierro Sep 19, 2024
f4fb6ef
drop owl import
gtfierro Sep 19, 2024
6099766
reformatting
gtfierro Sep 19, 2024
b5a9e9a
change method name test_model_against_shapes -> validate_model_agains…
gtfierro Sep 19, 2024
eae7436
update 223p notebook
gtfierro Sep 19, 2024
a79c859
use g36 5.16.14 fc-1 instead of fc-3, which doesn't work
MatthewSteen Sep 19, 2024
cbf7a9a
disable test_validate_model_against_shapes
MatthewSteen Sep 19, 2024
03a8787
update g36 5.16.14 shapes to match develop
MatthewSteen Sep 19, 2024
0f608af
update shape uris
MatthewSteen Sep 20, 2024
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: 2 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,8 @@ jobs:
run: poetry install --all-extras
- name: integration tests
run: poetry run pytest tests/integration
- name: library tests
run: poetry run pytest tests/library
- name: bacnet tests
run: |
cd tests/integration/fixtures/bacnet
Expand Down
5 changes: 4 additions & 1 deletion buildingmotif/dataclasses/model.py
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,10 @@ def test_model_against_shapes(
"""
ontology_graph = rdflib.Graph()
for shape_collection in shape_collections:
ontology_graph += shape_collection.graph
ontology_graph += shape_collection.resolve_imports(
error_on_missing_imports=False
).graph
ontology_graph.remove((None, OWL.imports, None))

model_graph = copy_graph(self.graph)

Expand Down
Loading
Loading