Merge branch 'develop' into skip-ipynb_checkpoint

NREL · Sep 3, 2024 · 6393235 · 6393235
2 parents 0aab033 + 64f58b7
commit 6393235
Show file tree

Hide file tree

Showing 9 changed files with 752 additions and 7,716 deletions.
diff --git a/libraries/ashrae/223p/nrel-templates/connections.yml b/libraries/ashrae/223p/nrel-templates/connections.yml
@@ -108,3 +108,11 @@ junction:
       args: {"name": "out15"}
     - template: air-outlet-cp
       args: {"name": "out16"}
+
+pipe:
+  body: >
+    @prefix P: <urn:___param___#> .
+    @prefix s223: <http://data.ashrae.org/standard223#> .
+    P:name a s223:Pipe ;
+      s223:hasMedium s223:Fluid-Water ;
+      s223:cnx P:a, P:b .
diff --git a/libraries/ashrae/223p/nrel-templates/devices.yml b/libraries/ashrae/223p/nrel-templates/devices.yml
@@ -321,6 +321,24 @@ hw-valve:
     - template: run-status
       args: {"name": "feedback"}
 
+belimo-energy-valve:
+  body: >
+    @prefix P: <urn:___param___#> .
+    @prefix s223: <http://data.ashrae.org/standard223#> .
+    P:name a s223:Valve ;
+      s223:contains P:flow-sensor ;
+      s223:hasProperty P:flow ;
+      s223:hasConnectionPoint P:in, P:out .
+  dependencies:
+    - template: water-inlet-cp
+      args: {"name": "in"}
+    - template: water-outlet-cp
+      args: {"name": "out"}
+    - template: water-flow
+      args: {"name": "flow"}
+    - template: sensor
+      args: {"name": "flow-sensor", "property": "flow", "where": "out"}
+
 sensor:
   body: >
     @prefix P: <urn:___param___#> .

diff --git a/libraries/ashrae/223p/nrel-templates/properties.yml b/libraries/ashrae/223p/nrel-templates/properties.yml
@@ -39,6 +39,7 @@ water-static-pressure:
     @prefix unit: <http://qudt.org/vocab/unit/> .
     @prefix s223: <http://data.ashrae.org/standard223#> .
     P:name a s223:QuantifiableObservableProperty ;
+      s223:ofMedium s223:Fluid-Water ;
       qudt:hasQuantityKind quantitykind:Pressure ;
       qudt:hasUnit unit:PSI .
 
@@ -72,6 +73,7 @@ water-differential-pressure:
     @prefix unit: <http://qudt.org/vocab/unit/> .
     @prefix s223: <http://data.ashrae.org/standard223#> .
     P:name a s223:QuantifiableObservableProperty ;
+        s223:ofMedium s223:Fluid-Water ;
         qudt:hasQuantityKind quantitykind:Pressure;
         qudt:hasUnit unit:PSI .
 
@@ -83,6 +85,7 @@ air-temperature:
     @prefix unit: <http://qudt.org/vocab/unit/> .
     @prefix s223: <http://data.ashrae.org/standard223#> .
     P:name a s223:QuantifiableObservableProperty ;
+        s223:ofMedium s223:Fluid-Air ;
         qudt:hasQuantityKind quantitykind:Temperature;
         qudt:hasUnit unit:DEG_C .
 
@@ -94,6 +97,7 @@ air-flow:
     @prefix unit: <http://qudt.org/vocab/unit/> .
     @prefix s223: <http://data.ashrae.org/standard223#> .
     P:name a s223:QuantifiableObservableProperty ;
+        s223:ofMedium s223:Fluid-Air ;
         qudt:hasQuantityKind quantitykind:VolumeFlowRate;
         qudt:hasUnit unit:FT3-PER-MIN .
 
@@ -105,6 +109,7 @@ water-temperature:
     @prefix unit: <http://qudt.org/vocab/unit/> .
     @prefix s223: <http://data.ashrae.org/standard223#> .
     P:name a s223:QuantifiableObservableProperty ;
+        s223:ofMedium s223:Fluid-Water ;
         qudt:hasQuantityKind quantitykind:Temperature;
         qudt:hasUnit unit:DEG_C .
 
@@ -116,6 +121,7 @@ water-flow:
     @prefix unit: <http://qudt.org/vocab/unit/> .
     @prefix s223: <http://data.ashrae.org/standard223#> .
     P:name a s223:QuantifiableObservableProperty ;
+        s223:ofMedium s223:Fluid-Water ;
         qudt:hasQuantityKind quantitykind:VolumeFlowRate;
         qudt:hasUnit unit:FT3-PER-MIN .
 

diff --git a/libraries/ashrae/223p/nrel-templates/spaces.yml b/libraries/ashrae/223p/nrel-templates/spaces.yml
@@ -9,6 +9,16 @@ hvac-zone:
     - template: hvac-space
       args: {"name": "domain-space"}
 
+hvac-zone-contains-space:
+  body: >
+    @prefix P: <urn:___param___#> .
+    @prefix s223: <http://data.ashrae.org/standard223#> .
+    P:name a s223:Zone ;
+      s223:hasDomainSpace P:domain-space .
+  dependencies:
+    - template: hvac-space
+      args: {"name": "domain-space"}
+
 hvac-space:
   body: >
     @prefix P: <urn:___param___#> .