From 7422db849b7c6f2b4a8ffa85c1caf4f973d9ce4a Mon Sep 17 00:00:00 2001 From: Douglas Plumley Date: Thu, 16 Nov 2023 15:29:12 -0500 Subject: [PATCH 1/2] Added simple representation of a photovoltaic panel. --- data/attr.yaml | 69 ++++++++++++++++----------- data/electrical/equip.electrical.yaml | 8 ++++ 2 files changed, 48 insertions(+), 29 deletions(-) diff --git a/data/attr.yaml b/data/attr.yaml index dbe189a..d9e8ec3 100644 --- a/data/attr.yaml +++ b/data/attr.yaml @@ -2,7 +2,7 @@ ##Attribute definitions ### ###Common, non-numerical Attributes #### -manufacturer: +manufacturer: name: Manufacturer description: Brand, make or manufacturer under which equipment, device or object is sold domain: common @@ -10,14 +10,14 @@ manufacturer: - equip - device haystack: - type: + type: - attr - manufacturer identification: - kind: Str google_ontology: manufacturer_label -model: +model: name: Model Name description: Model name or series descriptor domain: common @@ -25,7 +25,7 @@ model: - equip - device haystack: - type: + type: - attr - model identification: @@ -40,7 +40,7 @@ modelNumber: - equip - device haystack: - type: + type: - attr - model - number @@ -56,22 +56,22 @@ serialNumber: - equip - device haystack: - type: + type: - attr - serialNumber identification: - kind: Str ###Typical Site & Spatial Attributes #### -netArea: +netArea: name: Net Area domain: spatial - description: Area of a space exclusive of walls, utility areas and circulation spaces. + description: Area of a space exclusive of walls, utility areas and circulation spaces. entity: - site - space haystack: - type: + type: - attr - area - net @@ -79,15 +79,15 @@ netArea: - kind: Number unit_type: area -grossArea: +grossArea: name: Gross Area domain: spatial - description: Area of a space inclusive of walls, utility areas and circulation spaces. + description: Area of a space inclusive of walls, utility areas and circulation spaces. entity: - site - space haystack: - type: + type: - attr - area - gross @@ -95,30 +95,30 @@ grossArea: - kind: Number unit_type: area -bioSafetyLevel: +bioSafetyLevel: name: Biosafety Level domain: spatial - description: Biosafety levels (BSL) are used to identify the protective measures needed in a laboratory setting to protect workers, the environment, and the public. + description: Biosafety levels (BSL) are used to identify the protective measures needed in a laboratory setting to protect workers, the environment, and the public. haystack: - type: + type: - attr - level - bioSafety identification: - kind: Str - - enum: - - BSL-1 - - BSL-2 - - BSL-3 - - BSL-4 + - enum: + - BSL-1 + - BSL-2 + - BSL-3 + - BSL-4 ###Typical Occupancy Attributes ### -ratedOccupancy: +ratedOccupancy: name: Rated Occupancy domain: occupancy - description: Amount of occupants a space is allowed to hold from a life-safety or legal perpsective. + description: Amount of occupants a space is allowed to hold from a life-safety or legal perpsective. haystack: - type: + type: - attr - occupancy - rated @@ -126,12 +126,12 @@ ratedOccupancy: - kind: Number unit_type: dimesionless -designOccupancy: +designOccupancy: name: Design Occupancy domain: occupancy - description: Amount of occupants a space would typically be expected to contain. + description: Amount of occupants a space would typically be expected to contain. haystack: - type: + type: - attr - occupancy - design @@ -144,7 +144,7 @@ ratedCurrent: name: Rated Current domain: electrical haystack: - type: + type: - rated - current - attr @@ -156,11 +156,22 @@ ratedVoltage: name: Rated Voltage domain: electrical haystack: - type: + type: - rated - voltage - attr identification: - kind: Number unit_type: electric_potential - + +ratedWattage: + name: Rated Wattage + domain: electrical + haystack: + type: + - rated + - wattage + - attr + identification: + - kind: Number + unit_type: electric_wattage diff --git a/data/electrical/equip.electrical.yaml b/data/electrical/equip.electrical.yaml index 84e0b47..a86e866 100644 --- a/data/electrical/equip.electrical.yaml +++ b/data/electrical/equip.electrical.yaml @@ -545,3 +545,11 @@ XFMR: - equipRef reference_optional: - spaceRef +PVP: + name: Photovoltaic Panel + description: A collection of photovoltaic cells arranged into a panel to produce electrical energy. + brick_ontology: Photovoltaic Panel + attributes: + - ratedVoltage + - ratedCurrent + - ratedWattage From 54ce51b52763cea8ccab824758f2bcd45509696d Mon Sep 17 00:00:00 2001 From: Douglas Plumley Date: Thu, 16 Nov 2023 15:32:45 -0500 Subject: [PATCH 2/2] Restored original formatting. --- data/attr.yaml | 58 +++++++++++++++++++++++++------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/data/attr.yaml b/data/attr.yaml index d9e8ec3..5af4220 100644 --- a/data/attr.yaml +++ b/data/attr.yaml @@ -2,7 +2,7 @@ ##Attribute definitions ### ###Common, non-numerical Attributes #### -manufacturer: +manufacturer: name: Manufacturer description: Brand, make or manufacturer under which equipment, device or object is sold domain: common @@ -10,14 +10,14 @@ manufacturer: - equip - device haystack: - type: + type: - attr - manufacturer identification: - kind: Str google_ontology: manufacturer_label -model: +model: name: Model Name description: Model name or series descriptor domain: common @@ -25,7 +25,7 @@ model: - equip - device haystack: - type: + type: - attr - model identification: @@ -40,7 +40,7 @@ modelNumber: - equip - device haystack: - type: + type: - attr - model - number @@ -56,22 +56,22 @@ serialNumber: - equip - device haystack: - type: + type: - attr - serialNumber identification: - kind: Str ###Typical Site & Spatial Attributes #### -netArea: +netArea: name: Net Area domain: spatial - description: Area of a space exclusive of walls, utility areas and circulation spaces. + description: Area of a space exclusive of walls, utility areas and circulation spaces. entity: - site - space haystack: - type: + type: - attr - area - net @@ -79,15 +79,15 @@ netArea: - kind: Number unit_type: area -grossArea: +grossArea: name: Gross Area domain: spatial - description: Area of a space inclusive of walls, utility areas and circulation spaces. + description: Area of a space inclusive of walls, utility areas and circulation spaces. entity: - site - space haystack: - type: + type: - attr - area - gross @@ -95,30 +95,30 @@ grossArea: - kind: Number unit_type: area -bioSafetyLevel: +bioSafetyLevel: name: Biosafety Level domain: spatial - description: Biosafety levels (BSL) are used to identify the protective measures needed in a laboratory setting to protect workers, the environment, and the public. + description: Biosafety levels (BSL) are used to identify the protective measures needed in a laboratory setting to protect workers, the environment, and the public. haystack: - type: + type: - attr - level - bioSafety identification: - kind: Str - - enum: - - BSL-1 - - BSL-2 - - BSL-3 - - BSL-4 + - enum: + - BSL-1 + - BSL-2 + - BSL-3 + - BSL-4 ###Typical Occupancy Attributes ### -ratedOccupancy: +ratedOccupancy: name: Rated Occupancy domain: occupancy - description: Amount of occupants a space is allowed to hold from a life-safety or legal perpsective. + description: Amount of occupants a space is allowed to hold from a life-safety or legal perpsective. haystack: - type: + type: - attr - occupancy - rated @@ -126,12 +126,12 @@ ratedOccupancy: - kind: Number unit_type: dimesionless -designOccupancy: +designOccupancy: name: Design Occupancy domain: occupancy - description: Amount of occupants a space would typically be expected to contain. + description: Amount of occupants a space would typically be expected to contain. haystack: - type: + type: - attr - occupancy - design @@ -144,7 +144,7 @@ ratedCurrent: name: Rated Current domain: electrical haystack: - type: + type: - rated - current - attr @@ -156,7 +156,7 @@ ratedVoltage: name: Rated Voltage domain: electrical haystack: - type: + type: - rated - voltage - attr @@ -168,7 +168,7 @@ ratedWattage: name: Rated Wattage domain: electrical haystack: - type: + type: - rated - wattage - attr