Merge pull request #1338 from google/cstirdivant-patch-3

Subfield cleanup

ontology/yaml/resources/subfields/subfields.yaml

@@ -52,8 +52,8 @@ component:
   luminaire: "Complete lighting unit, consisting of one or more lamps, their socket/holders, wiring and optics such as lenses and reflectors to distribute the light."
   motor: "A machine, especially one powered by electricity or internal combustion, that supplies motive power for a vehicle or for some other device with moving parts."
   pump: "Component used for the distribution of liquid media (e.g., water, glycol)."
-  riser: "A central (typically vertical) supply pipe or duct that distributes media (e.g., water, air) to multiple floors of a building."
   rectifier: "Component that converts alternating current to direct current."
+  riser: "A central (typically vertical) supply pipe or duct that distributes media (e.g., water, air) to multiple floors of a building."
   scrubber: "An equipment that is used to remove harmful materials from exhaust air before they are released into the environment"
   shade: "Window covering (typically used to regulate the amount of sunlight coming through the window)."
   switch: "Component to disrupt an electrical cirucit."
@@ -70,15 +70,15 @@ descriptor:
   ammonia: "Ammonia gas."
   blowdown: "Process of expelling water filled with mineral deposits for the purposes of water treatment."
   blue: "Blue light fracture of ambient light."
-  boost: "The ampification of a object or media; for example, a booster pump is used to increase the speed of the water flowing through it."
+  boost: "The amplification of a object or media; for example, a booster pump is used to increase the speed of the water flowing through it."
   broken: "A state of disrepair; fractured or segmented."
   building: "Applies to the entire building or group of zones within building (e.g., building_air_static_pressure_sensor)."
   bypass: "Route which fluid takes to bypass a process."
   calendar: "A system structured around the days, weeks, and the months, used to manage schedules."
   call: "An action of speaking or meeting among multiple people."
   carbon: "Nonmetallic chemical element with the atomic number of six (e.g., graphite)."
-  chilled: "Cold water (typically 40 - 50F)."
   changeover: "Connecting to a different equipment circuit (e.g., switching between chiller and hot water)."
+  chilled: "Cold water (typically 40 - 50F)."
   cie: "Abbreviation for the International Commission on Illumination (CIE light color schema)."
   circulation: "Process or component used to circulate fluid through a device or system; for exmaple, a circulation pump onboard a boiler."
   co: "Chemical formula and abbreviation for carbon monoxide."
@@ -95,15 +95,15 @@ descriptor:
   control: "The process of governing the actions of a device."
   cooling: "Process, measured effect or requirement for cooling."
   dc: "Abbreviation for direct current, which is a one-directional flow of electric charge."
+  defrost: "De-freezing ice from a surface."
   dehumidification: "Process of removing moisture from air."
   detection: "Process of identifying conditions."
   detergent: "Water-soluble cleansing agent."
   direction: "Direction in which particular entity is moving or is present."
   discharge: "Media leaving system to enter ambient conditioned space. Typically applies only to air-side systems."
   diverting: "Controlling the flow of fluids or gases by diverting the flow from one pathway to another."
-  dutycycle: "The fraction of one period in which a signal or system is active."
-  defrost: "De-freezing ice from a surface."
   drain: "Media drained from system; typically applied to water-side system "
+  dutycycle: "The fraction of one period in which a signal or system is active."
   east: "Cardinal direction; opposite of west."
   economizer: "Process or component responsible for the utilization of free cooling."
   electric: "Process or component driven by electricity (as to distinguish from natural gas, for instance)."
@@ -117,11 +117,10 @@ descriptor:
   exchange: "The act of giving somethng and receiving something else; for example, the transfer of heat from one fluid stream to another."
   exercise: "Mode of running equipment to maintain functionality ('exercise mode')."
   exhaust: "Process or component used in the removal of air from a conditioned system to the outside atmosphere."
-  panel: "An interface to control a device."
   fabric: "Textile material."
   failed: "Indicates that a point is not operating as intended or is incapable of operating."
-  fire: "The combustion or burning of substances with the potential to cause physical damage."
   filtration: "Process of filtering contaminating elements from equipment or a system."
+  fire: "The combustion or burning of substances with the potential to cause physical damage."
   floor: "Lower surface of a room or zone."
   flue: "Chimney for conveying exhaust gas."
   formaldehyde: "A simple, pungent organic compound (gas under standard conditions), simplest of the aldehydes."
@@ -133,11 +132,11 @@ descriptor:
   ground: "The solid surface of the earth."
   group: "A set of entities or devices"
   guide: "To direct the course or movement of a media; for example, a vane is used to guide the flow of air."
-  h2s: "Chemical formula and abbreviation for hydrogen sulfide."
   h2: "Chemical formula and abbreviation for hydrogen."
+  h2s: "Chemical formula and abbreviation for hydrogen sulfide."
   hash: "A computed value that is converted from an original value."
-  heating: "Process, measured effect or requirement for heating."
   heat: "Quality of media indicating energy level."
+  heating: "Process, measured effect or requirement for heating."
   high: "Level of control or measurement; above medium and low; opposite of low."
   hot: "Used to describe something at a high (or relatively high) temperature."
   hsl: "Abbreviation for hue, saturation, and lightness; typically used in light color control."
@@ -154,8 +153,8 @@ descriptor:
   lighting: "Illumination of a room."
   limit: "A boundary condition for a control (e.g., low limit)."
   line: "Refers to the incoming electrical feed (e.g., line current)."
-  load: "Electrical load which indicates the consumption of electrical power."
   liquid: "A state of matter that flows and takes the form of its container, but which changes its volume very little with changes in pressure."
+  load: "Electrical load which indicates the consumption of electrical power."
   local: "A definite spatial location involving only a subset of the larger surrounding area."
   loop: "Recirculating loop."
   low: "Level of control or measurement; below medium and high; opposite of high."
@@ -178,13 +177,14 @@ descriptor:
   occupied: "State of being within scheduled (time of day or week) run-time parameters."
   oil: "A viscous liquid derived from petroleum, especially for use as a fuel or lubricant."
   ongoing: "Hapenning currently, right now."
-  output: "The output of a control loop (e.g. PID Loop Output)"
-  overload: "An electrical load that exceeds available electrical power "
+  output: "The output of a control loop (e.g. PID loop output)."
+  outside: "Process or measurement of local atmospheric conditions."
   over: "Refering to exceeding the required or expected"
+  overload: "An electrical load that exceeds available electrical power."
   override: "An action that interrupts, cancels, or changes the current action or status."
   ozone: "Highly reactive gaseous compound comprised of three oxygen atoms."
+  panel: "An interface to control a device."
   particle: "A very fine clump of solid matter."
-  outside: "Process or measurement of local atmospheric conditions."
   phase: "A phase of three-phase power distribution systems."
   phase1: "The first (nominally A) phase of three-phase power distribution systems."
   phase2: "The second (nominally B) phase of three-phase power distribution systems."
@@ -214,9 +214,6 @@ descriptor:
   return: "Measurement or process of media as it is returned from the end-use equipment within the system."
   reversing: "Reverses direction of flow (e.g., the reversing valve on a heat pump changes the direction that the refrigerant flows around the circuit)."
   room: "A space that can be occupied, or a part or division of a building or floor enclosed by walls."
-  so2: "Chemical formula and abbreviation for sulfur dioxide."
-  source1: "Redundant power source 1 provision typically for an automatic transfer switch (ATS)."
-  source2: "Redundant power source 2 provision typically for an automatic transfer switch (ATS)."
   scene: "The holistic ambience achieved from coordinated control of an area's lighting levels and colors. One of many stored setpoints that may be recalled to apply predetermined lighting levels across a number of fixtures."
   schedule: "Refers to the time-of-day run-time requirements for the equipment."
   season: "Weather conditions under which certain systems or processes are enabled."
@@ -225,7 +222,10 @@ descriptor:
   side: "Position relative to an an object."
   signal: "An electric current or electromagnetic field used to convey data from one device to another."
   smoke: "Visible, suspended particles created during a fire."
+  so2: "Chemical formula and abbreviation for sulfur dioxide."
   source: "The upstream source of thermal heat (typically used for heat exchangers)."
+  source1: "Redundant power source 1 provision typically for an automatic transfer switch (ATS)."
+  source2: "Redundant power source 2 provision typically for an automatic transfer switch (ATS)."
   south: "Cardinal direction; opposite of north"
   southeast: "Inter-cardinal direction between South and East."
   southwest: "Inter-cardinal direction between South and West."
@@ -347,12 +347,15 @@ measurement_descriptor:
   end: "Indicates a final part of something, especially a period of time."
   extent: "The range over which something has spread."
   fade: "Descending change of a value (e.g., lighting fade)."
+  hue: "Number on a color wheel from 0 to 360°."  
   lost: "Indicates that a point has lost some quality or quantity inadvertently."
   match: "A function that matches something against others."
   motion: "Detectable movement of a thing."
   index: "An integer which indicates the location of a particular data point in a list or numbered set (e.g., index 1 of ['a','b','c'] would return 'b', assuming the indexing starts at 0)."
   offset: "The amount or distance by which something is deviating from some threshold or baseline."
   open: "Indicates full open (for two-position actuators). This is the default sense if unspecified."
+  operating: "State when a device is active." 
+  orientation: "Description of cardinal direction."  
   position: "A particular way in which something is placed or arranged, such as a door in the open position."
   probability: "The extent to which something is probable; the likelihood of something happening or being the case."
   reactive: "Power that is returned to the source (i.e., not consumed by the load)."
@@ -369,9 +372,6 @@ measurement_descriptor:
   tilt: "Degree of radial rotation."
   up: "The direction of a spatial movement, opposite of down."
   wetbulb: "Describes air temperature measured at 100% relative humidity (saturation)."
-  operating: "State when a device is active."
-  hue: "Number on a color wheel from 0 to 360°."
-  orientation: "Description of cardinal direction."
 point_type:
   accumulator: "The total accumulated quantity (e.g., total energy accumulated)."
   alarm: "A point that interprets some input values qualitatively (e.g., as good or bad, normal or in alarm, etc.). Alarms are always binary."