honeybee-openstudio 2.10.4 → 2.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f6244a8a9d855497fd78c192ffbc9ede6cd337a9ed4ed1cbabdf654bb361056
-  data.tar.gz: 5572eb94ca3afea26ea15449e58c762e57973fa763f65671b2855a291b79706f
+  metadata.gz: 4ea8287dc3fbd44cbc9ace3fa6253da4559280691e18ad33c746c4d0f3fde9c7
+  data.tar.gz: d77bac64d0434bcbf4b9b09b41acae037ed87d432590b4efff38b24eb4938be7
 SHA512:
-  metadata.gz: 99de2b8728e7529d8046e5d5730c4edb66e159f93ab2776e60cab777d0de22fcc669034340a0d898fc8804f8007532f7df3caa5aaff845b08dce1fdb10f1a677
-  data.tar.gz: d5ab7db18ff0b5f53431d898361314dc1650329da2471d63040590a7c119c4cd43b9b3e63de5bcb8ba7ffa2d83b6a255a9f44dfcf3b7cc41e8fed4f5ee3d217e
+  metadata.gz: d67be0f1946d78f1c5ef10bf20af4e320434854a323a4d5594a4922790b1b64bddd2ae53ab2d5043cc3c67fd305984f3689ce1fe3b12a18896134999800b0bcf
+  data.tar.gz: 7ddf3fadbb997e04af867c8c9618772492568175ab50537546e2f10a3efe1eded2436c8180553f3fd842da39c99da8efe4a31e14da05fd873e1cd067312ef4a8

data/.gitignore

@@ -7,6 +7,7 @@
 /coverage/
 /doc/
 /pkg/
+/spec/coverage/
 /spec/output/
 /spec/reports/
 /spec/test/

data/honeybee-openstudio.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'honeybee-openstudio'
-  spec.version       = '2.10.4'
+  spec.version       = '2.12.0'
   spec.authors       = ['Tanushree Charan', 'Dan Macumber', 'Chris Mackey', 'Mostapha Sadeghipour Roudsari']
   spec.email         = ['tanushree.charan@nrel.gov', 'chris@ladybug.tools']
 

data/lib/files/Honeybee.rb

@@ -42,25 +42,34 @@ module URBANopt
       # class level variables
       @@instance_lock = Mutex.new
       @@osw = nil
+      @@mapper_measures = nil
       @@geometry = nil
 
       def initialize()
-
         # do initialization of class variables in thread safe way
         @@instance_lock.synchronize do
-            if @@osw.nil?
+          # load the OSW for this class
+          if @@osw.nil?
+            osw_path = File.join(File.dirname(__FILE__), 'honeybee_workflow.osw')
+            File.open(osw_path, 'r') do |file|
+              @@osw = JSON.parse(file.read, symbolize_names: true)
+            end
+          # configure OSW with extension gem paths for measures and files
+          # all extension gems must be required before this line
+          @@osw = OpenStudio::Extension.configure_osw(@@osw)
+          end
 
-              # load the OSW for this class
-              osw_path = File.join(File.dirname(__FILE__), 'honeybee_workflow.osw')
-              File.open(osw_path, 'r') do |file|
-                @@osw = JSON.parse(file.read, symbolize_names: true)
+          # load the mapper measure variables if the file exists
+          if @@mapper_measures.nil?
+            map_meas_path = File.join(File.dirname(__FILE__), 'mapper_measures.json')
+            if File.file?(map_meas_path)
+              File.open(map_meas_path, 'r') do |file|
+                @@mapper_measures = JSON.parse(file.read)
               end
-
-            # configure OSW with extension gem paths for measures and files
-            # all extension gems must be required before this line
-            @@osw = OpenStudio::Extension.configure_osw(@@osw)
             end
           end
+
+        end
       end
 
       def create_osw(scenario, features, feature_names)
@@ -76,7 +85,6 @@ module URBANopt
         # take the centroid of the vertices as the location of the building
         feature_vertices_coordinates = feature.feature_json[:geometry][:coordinates][0]
         feature_location = feature.find_feature_center(feature_vertices_coordinates).to_s
-
         if feature_names.size == 1
           feature_name = feature_names[0]
         end
@@ -93,12 +101,15 @@ module URBANopt
             OpenStudio::Extension.set_measure_argument(
                 osw, 'from_honeybee_model', 'model_json', feature.detailed_model_filename)
 
-            # check if there is a HVAC key in the feature JSON properties
-            building_hash = feature.to_hash
-            if building_hash.key?(:system_type)
-              # assume the typical building measure is in the OSW and add the system type
-              OpenStudio::Extension.set_measure_argument(
-                  osw, 'create_typical_building_from_model', 'system_type', system_type)
+            # add any of the mapper measure variables
+            if not @@mapper_measures.nil?
+              @@mapper_measures.each do |map_measure_param|
+                # get the attribute from the feature
+                feature_param = feature.send(map_measure_param[2])
+                # set the measure argument
+                OpenStudio::Extension.set_measure_argument(
+                  osw, map_measure_param[0], map_measure_param[1], feature_param)
+              end
             end
 
             # add the feature id and name to the reporting measure

data/lib/files/urbanopt_Gemfile

@@ -29,4 +29,4 @@ else
 end
 
 # include the honeybee-openstudio-gem
-gem 'honeybee-openstudio', '2.10.3'
+gem 'honeybee-openstudio', '2.11.3'

data/lib/honeybee.rb

@@ -77,6 +77,7 @@ require 'honeybee/load/infiltration'
 require 'honeybee/load/ventilation'
 require 'honeybee/load/setpoint_thermostat'
 require 'honeybee/load/setpoint_humidistat'
+require 'honeybee/load/daylight'
 
 # import the schedule objects
 require 'honeybee/schedule/type_limit'

data/lib/honeybee/_defaults/model.json

@@ -3,7 +3,7 @@
   "servers": [],
   "info": {
     "description": "Honeybee model schema.",
-    "version": "1.39.12",
+    "version": "1.42.2",
     "title": "Honeybee Model Schema",
     "contact": {
       "name": "Ladybug Tools",
@@ -139,6 +139,11 @@
       "x-displayName": "ControlType",
       "description": "<SchemaDefinition schemaRef=\"#/components/schemas/ControlType\" />\n"
     },
+    {
+      "name": "daylightingcontrol_model",
+      "x-displayName": "DaylightingControl",
+      "description": "<SchemaDefinition schemaRef=\"#/components/schemas/DaylightingControl\" />\n"
+    },
     {
       "name": "door_model",
       "x-displayName": "Door",
@@ -907,6 +912,7 @@
         "constructionset_model",
         "constructionsetabridged_model",
         "controltype_model",
+        "daylightingcontrol_model",
         "door_model",
         "doorconstructionset_model",
         "doorconstructionsetabridged_model",
@@ -2276,7 +2282,7 @@
           },
           "radiant_fraction": {
             "title": "Radiant Fraction",
-            "description": "The radiant fraction of sensible heat released by people. The defaultvalue is 0.30.",
+            "description": "The radiant fraction of sensible heat released by people. (Default: 0.3).",
             "default": 0.3,
             "minimum": 0,
             "maximum": 1,
@@ -2350,7 +2356,7 @@
           },
           "visible_fraction": {
             "title": "Visible Fraction",
-            "description": "The fraction of heat from lights that goes into the zone as visible (short-wave) radiation. The default value is `0.25`.",
+            "description": "The fraction of heat from lights that goes into the zone as visible (short-wave) radiation. (Default: 0.25).",
             "default": 0.25,
             "minimum": 0,
             "maximum": 1,
@@ -2359,7 +2365,7 @@
           },
           "radiant_fraction": {
             "title": "Radiant Fraction",
-            "description": "The fraction of heat from lights that is long-wave radiation. Default value is `0.32`.",
+            "description": "The fraction of heat from lights that is long-wave radiation. (Default: 0.32).",
             "default": 0.32,
             "minimum": 0,
             "maximum": 1,
@@ -2368,7 +2374,7 @@
           },
           "return_air_fraction": {
             "title": "Return Air Fraction",
-            "description": "The fraction of the heat from lights that goes into the zone return air. Default value is `0`.",
+            "description": "The fraction of the heat from lights that goes into the zone return air. (Default: 0).",
             "default": 0.0,
             "minimum": 0,
             "maximum": 1,
@@ -2805,6 +2811,76 @@
         ],
         "additionalProperties": false
       },
+      "DaylightingControl": {
+        "title": "DaylightingControl",
+        "description": "Base class for all objects that are not extensible with additional keys.\n\nThis effectively includes all objects except for the Properties classes\nthat are assigned to geometry objects.",
+        "type": "object",
+        "properties": {
+          "sensor_position": {
+            "title": "Sensor Position",
+            "description": "A point as 3 (x, y, z) values for the position of the daylight sensor within the parent Room. This point should lie within the Room volume in order for the results to be meaningful.",
+            "minItems": 3,
+            "maxItems": 3,
+            "type": "array",
+            "items": {
+              "type": "number",
+              "format": "double"
+            }
+          },
+          "type": {
+            "title": "Type",
+            "default": "DaylightingControl",
+            "pattern": "^DaylightingControl$",
+            "type": "string",
+            "readOnly": true
+          },
+          "illuminance_setpoint": {
+            "title": "Illuminance Setpoint",
+            "description": "A number for the illuminance setpoint in lux beyond which electric lights are dimmed if there is sufficient daylight.",
+            "default": 300,
+            "exclusiveMinimum": 0,
+            "type": "number",
+            "format": "double"
+          },
+          "control_fraction": {
+            "title": "Control Fraction",
+            "description": "A number between 0 and 1 that represents the fraction of the Room lights that are dimmed when the illuminance at the sensor position is at the specified illuminance. 1 indicates that all lights are dim-able while 0 indicates that no lights are dim-able. Deeper rooms should have lower control fractions to account for the face that the lights in the back of the space do not dim in response to suitable daylight at the front of the room.",
+            "default": 1,
+            "minimum": 0,
+            "maximum": 1,
+            "type": "number",
+            "format": "double"
+          },
+          "min_power_input": {
+            "title": "Min Power Input",
+            "description": "A number between 0 and 1 for the the lowest power the lighting system can dim down to, expressed as a fraction of maximum input power.",
+            "default": 0.3,
+            "minimum": 0,
+            "maximum": 1,
+            "type": "number",
+            "format": "double"
+          },
+          "min_light_output": {
+            "title": "Min Light Output",
+            "description": "A number between 0 and 1 the lowest lighting output the lighting system can dim down to, expressed as a fraction of maximum light output.",
+            "default": 0.2,
+            "minimum": 0,
+            "maximum": 1,
+            "type": "number",
+            "format": "double"
+          },
+          "off_at_minimum": {
+            "title": "Off At Minimum",
+            "description": "Boolean to note whether lights should switch off completely when they get to the minimum power input.",
+            "default": false,
+            "type": "boolean"
+          }
+        },
+        "required": [
+          "sensor_position"
+        ],
+        "additionalProperties": false
+      },
       "VentilationControlAbridged": {
         "title": "VentilationControlAbridged",
         "description": "Base class for all objects that are not extensible with additional keys.\n\nThis effectively includes all objects except for the Properties classes\nthat are assigned to geometry objects.",
@@ -2977,6 +3053,15 @@
               }
             ]
           },
+          "daylighting_control": {
+            "title": "Daylighting Control",
+            "description": "An optional DaylightingControl object to dictate the dimming of lights. If None, the lighting will respond only to the schedule and not the daylight conditions within the room.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/DaylightingControl"
+              }
+            ]
+          },
           "window_vent_control": {
             "title": "Window Vent Control",
             "description": "An optional VentilationControl object to dictate the opening of windows. If None, the windows will never open.",
@@ -3628,7 +3713,7 @@
           },
           "materials": {
             "title": "Materials",
-            "description": "List of opaque materials. The order of the materials is from outside to inside.",
+            "description": "List of opaque material definitions that are referenced in the layers. Note that the order of materials does not matter and there is no need to specify duplicated materials in this list.",
             "minItems": 1,
             "maxItems": 10,
             "type": "array",
@@ -4245,7 +4330,7 @@
           },
           "materials": {
             "title": "Materials",
-            "description": "List of glazing and gas materials. The order of the materials is from outside to inside. If a SimpleGlazSys material is used, it must be the only material in the construction. For multi-layered constructions, adjacent glass layers must be separated by one and only one gas layer.",
+            "description": "List of glazing and gas material definitions that are referenced in the layers. Note that the order of materials does not matter and there is no need to specify duplicated materials in this list.",
             "minItems": 1,
             "maxItems": 8,
             "type": "array",
@@ -5971,12 +6056,12 @@
         "title": "Vintages",
         "description": "An enumeration.",
         "enum": [
-          "90.1-2013",
-          "90.1-2010",
-          "90.1-2007",
-          "90.1-2004",
-          "DOE Ref 1980-2004",
-          "DOE Ref Pre-1980"
+          "ASHRAE_2013",
+          "ASHRAE_2010",
+          "ASHRAE_2007",
+          "ASHRAE_2004",
+          "DOE_Ref_1980_2004",
+          "DOE_Ref_Pre_1980"
         ],
         "type": "string"
       },
@@ -5995,21 +6080,21 @@
         "title": "VAVEquipmentType",
         "description": "An enumeration.",
         "enum": [
-          "VAV chiller with gas boiler reheat",
-          "VAV chiller with central air source heat pump reheat",
-          "VAV chiller with district hot water reheat",
-          "VAV chiller with PFP boxes",
-          "VAV chiller with gas coil reheat",
-          "VAV air-cooled chiller with gas boiler reheat",
-          "VAV air-cooled chiller with central air source heat pump reheat",
-          "VAV air-cooled chiller with district hot water reheat",
-          "VAV air-cooled chiller with PFP boxes",
-          "VAV air-cooled chiller with gas coil reheat",
-          "VAV district chilled water with gas boiler reheat",
-          "VAV district chilled water with central air source heat pump reheat",
-          "VAV district chilled water with district hot water reheat",
-          "VAV district chilled water with PFP boxes",
-          "VAV district chilled water with gas coil reheat"
+          "VAV_Chiller_Boiler",
+          "VAV_Chiller_ASHP",
+          "VAV_Chiller_DHW",
+          "VAV_Chiller_PFP",
+          "VAV_Chiller_GasCoil",
+          "VAV_ACChiller_Boiler",
+          "VAV_ACChiller_ASHP",
+          "VAV_ACChiller_DHW",
+          "VAV_ACChiller_PFP",
+          "VAV_ACChiller_GasCoil",
+          "VAV_DCW_Boiler",
+          "VAV_DCW_ASHP",
+          "VAV_DCW_DHW",
+          "VAV_DCW_PFP",
+          "VAV_DCW_GasCoil"
         ],
         "type": "string"
       },
@@ -6032,7 +6117,7 @@
           },
           "vintage": {
             "description": "Text for the vintage of the template system. This will be used to set efficiencies for various pieces of equipment within the system. Further information about these defaults can be found in the version of ASHRAE 90.1 corresponding to the selected vintage. Read-only versions of the standard can be found at: https://www.ashrae.org/technical-resources/standards-and-guidelines/read-only-versions-of-ashrae-standards",
-            "default": "90.1-2013",
+            "default": "ASHRAE_2013",
             "allOf": [
               {
                 "$ref": "#/components/schemas/Vintages"
@@ -6093,7 +6178,7 @@
           },
           "equipment_type": {
             "description": "Text for the specific type of system equipment from the VAVEquipmentType enumeration.",
-            "default": "VAV chiller with gas boiler reheat",
+            "default": "VAV_Chiller_Boiler",
             "allOf": [
               {
                 "$ref": "#/components/schemas/VAVEquipmentType"
@@ -6110,11 +6195,11 @@
         "title": "PVAVEquipmentType",
         "description": "An enumeration.",
         "enum": [
-          "PVAV with gas boiler reheat",
-          "PVAV with central air source heat pump reheat",
-          "PVAV with district hot water reheat",
-          "PVAV with PFP boxes",
-          "PVAV with gas heat with electric reheat"
+          "PVAV_Boiler",
+          "PVAV_ASHP",
+          "PVAV_DHW",
+          "PVAV_PFP",
+          "PVAV_BoilerElectricReheat"
         ],
         "type": "string"
       },
@@ -6137,7 +6222,7 @@
           },
           "vintage": {
             "description": "Text for the vintage of the template system. This will be used to set efficiencies for various pieces of equipment within the system. Further information about these defaults can be found in the version of ASHRAE 90.1 corresponding to the selected vintage. Read-only versions of the standard can be found at: https://www.ashrae.org/technical-resources/standards-and-guidelines/read-only-versions-of-ashrae-standards",
-            "default": "90.1-2013",
+            "default": "ASHRAE_2013",
             "allOf": [
               {
                 "$ref": "#/components/schemas/Vintages"
@@ -6198,7 +6283,7 @@
           },
           "equipment_type": {
             "description": "Text for the specific type of system equipment from the VAVEquipmentType enumeration.",
-            "default": "PVAV with gas boiler reheat",
+            "default": "PVAV_Boiler",
             "allOf": [
               {
                 "$ref": "#/components/schemas/PVAVEquipmentType"
@@ -6215,26 +6300,26 @@
         "title": "PSZEquipmentType",
         "description": "An enumeration.",
         "enum": [
-          "PSZ-AC with baseboard electric",
-          "PSZ-AC with baseboard gas boiler",
-          "PSZ-AC with baseboard district hot water",
-          "PSZ-AC with gas unit heaters",
-          "PSZ-AC with electric coil",
-          "PSZ-AC with gas coil",
-          "PSZ-AC with gas boiler",
-          "PSZ-AC with central air source heat pump",
-          "PSZ-AC with district hot water",
-          "PSZ-AC with no heat",
-          "PSZ-AC district chilled water with baseboard electric",
-          "PSZ-AC district chilled water with baseboard gas boiler",
-          "PSZ-AC district chilled water with gas unit heaters",
-          "PSZ-AC district chilled water with electric coil",
-          "PSZ-AC district chilled water with gas coil",
-          "PSZ-AC district chilled water with gas boiler",
-          "PSZ-AC district chilled water with central air source heat pump",
-          "PSZ-AC district chilled water with district hot water",
-          "PSZ-AC district chilled water with no heat",
-          "PSZ-HP"
+          "PSZAC_ElectricBaseboard",
+          "PSZAC_BoilerBaseboard",
+          "PSZAC_DHWBaseboard",
+          "PSZAC_GasHeaters",
+          "PSZAC_ElectricCoil",
+          "PSZAC_GasCoil",
+          "PSZAC_Boiler",
+          "PSZAC_ASHP",
+          "PSZAC_DHW",
+          "PSZAC",
+          "PSZAC_DCW_ElectricBaseboard",
+          "PSZAC_DCW_BoilerBaseboard",
+          "PSZAC_DCW_GasHeaters",
+          "PSZAC_DCW_ElectricCoil",
+          "PSZAC_DCW_GasCoil",
+          "PSZAC_DCW_Boiler",
+          "PSZAC_DCW_ASHP",
+          "PSZAC_DCW_DHW",
+          "PSZAC_DCW",
+          "PSZHP"
         ],
         "type": "string"
       },
@@ -6257,7 +6342,7 @@
           },
           "vintage": {
             "description": "Text for the vintage of the template system. This will be used to set efficiencies for various pieces of equipment within the system. Further information about these defaults can be found in the version of ASHRAE 90.1 corresponding to the selected vintage. Read-only versions of the standard can be found at: https://www.ashrae.org/technical-resources/standards-and-guidelines/read-only-versions-of-ashrae-standards",
-            "default": "90.1-2013",
+            "default": "ASHRAE_2013",
             "allOf": [
               {
                 "$ref": "#/components/schemas/Vintages"
@@ -6318,7 +6403,7 @@
           },
           "equipment_type": {
             "description": "Text for the specific type of system equipment from the PVAVEquipmentType enumeration.",
-            "default": "PSZ-AC with baseboard electric",
+            "default": "PSZAC_ElectricBaseboard",
             "allOf": [
               {
                 "$ref": "#/components/schemas/PSZEquipmentType"
@@ -6335,16 +6420,16 @@
         "title": "PTACEquipmentType",
         "description": "An enumeration.",
         "enum": [
-          "PTAC with baseboard electric",
-          "PTAC with baseboard gas boiler",
-          "PTAC with baseboard district hot water",
-          "PTAC with gas unit heaters",
-          "PTAC with electric coil",
-          "PTAC with gas coil",
-          "PTAC with gas boiler",
-          "PTAC with central air source heat pump",
-          "PTAC with district hot water",
-          "PTAC with no heat",
+          "PTAC_ElectricBaseboard",
+          "PTAC_BoilerBaseboard",
+          "PTAC_DHWBaseboard",
+          "PTAC_GasHeaters",
+          "PTAC_ElectricCoil",
+          "PTAC_GasCoil",
+          "PTAC_Boiler",
+          "PTAC_ASHP",
+          "PTAC_DHW",
+          "PTAC",
           "PTHP"
         ],
         "type": "string"
@@ -6368,7 +6453,7 @@
           },
           "vintage": {
             "description": "Text for the vintage of the template system. This will be used to set efficiencies for various pieces of equipment within the system. Further information about these defaults can be found in the version of ASHRAE 90.1 corresponding to the selected vintage. Read-only versions of the standard can be found at: https://www.ashrae.org/technical-resources/standards-and-guidelines/read-only-versions-of-ashrae-standards",
-            "default": "90.1-2013",
+            "default": "ASHRAE_2013",
             "allOf": [
               {
                 "$ref": "#/components/schemas/Vintages"
@@ -6429,7 +6514,7 @@
           },
           "equipment_type": {
             "description": "Text for the specific type of system equipment from the PTACEquipmentType enumeration.",
-            "default": "PTAC with baseboard electric",
+            "default": "PTAC_ElectricBaseboard",
             "allOf": [
               {
                 "$ref": "#/components/schemas/PTACEquipmentType"
@@ -6446,7 +6531,7 @@
         "title": "FurnaceEquipmentType",
         "description": "An enumeration.",
         "enum": [
-          "Forced air furnace"
+          "Furnace"
         ],
         "type": "string"
       },
@@ -6469,7 +6554,7 @@
           },
           "vintage": {
             "description": "Text for the vintage of the template system. This will be used to set efficiencies for various pieces of equipment within the system. Further information about these defaults can be found in the version of ASHRAE 90.1 corresponding to the selected vintage. Read-only versions of the standard can be found at: https://www.ashrae.org/technical-resources/standards-and-guidelines/read-only-versions-of-ashrae-standards",
-            "default": "90.1-2013",
+            "default": "ASHRAE_2013",
             "allOf": [
               {
                 "$ref": "#/components/schemas/Vintages"
@@ -6530,7 +6615,7 @@
           },
           "equipment_type": {
             "description": "Text for the specific type of system equipment from the FurnaceEquipmentType enumeration.",
-            "default": "Forced air furnace",
+            "default": "Furnace",
             "allOf": [
               {
                 "$ref": "#/components/schemas/FurnaceEquipmentType"
@@ -6547,24 +6632,24 @@
         "title": "FCUwithDOASEquipmentType",
         "description": "An enumeration.",
         "enum": [
-          "DOAS with fan coil chiller with boiler",
-          "DOAS with fan coil chiller with central air source heat pump",
-          "DOAS with fan coil chiller with district hot water",
-          "DOAS with fan coil chiller with baseboard electric",
-          "DOAS with fan coil chiller with gas unit heaters",
-          "DOAS with fan coil chiller with no heat",
-          "DOAS with fan coil air-cooled chiller with boiler",
-          "DOAS with fan coil air-cooled chiller with central air source heat pump",
-          "DOAS with fan coil air-cooled chiller with district hot water",
-          "DOAS with fan coil air-cooled chiller with baseboard electric",
-          "DOAS with fan coil air-cooled chiller with gas unit heaters",
-          "DOAS with fan coil air-cooled chiller with no heat",
-          "DOAS with fan coil district chilled water with boiler",
-          "DOAS with fan coil district chilled water with central air source heat pump",
-          "DOAS with fan coil district chilled water with district hot water",
-          "DOAS with fan coil district chilled water with baseboard electric",
-          "DOAS with fan coil district chilled water with gas unit heaters",
-          "DOAS with fan coil district chilled water with no heat"
+          "DOAS_FCU_Chiller_Boiler",
+          "DOAS_FCU_Chiller_ASHP",
+          "DOAS_FCU_Chiller_DHW",
+          "DOAS_FCU_Chiller_ElectricBaseboard",
+          "DOAS_FCU_Chiller_GasHeaters",
+          "DOAS_FCU_Chiller",
+          "DOAS_FCU_ACChiller_Boiler",
+          "DOAS_FCU_ACChiller_ASHP",
+          "DOAS_FCU_ACChiller_DHW",
+          "DOAS_FCU_ACChiller_ElectricBaseboard",
+          "DOAS_FCU_ACChiller_GasHeaters",
+          "DOAS_FCU_ACChiller",
+          "DOAS_FCU_DCW_Boiler",
+          "DOAS_FCU_DCW_ASHP",
+          "DOAS_FCU_DCW_DHW",
+          "DOAS_FCU_DCW_ElectricBaseboard",
+          "DOAS_FCU_DCW_GasHeaters",
+          "DOAS_FCU_DCW"
         ],
         "type": "string"
       },
@@ -6587,7 +6672,7 @@
           },
           "vintage": {
             "description": "Text for the vintage of the template system. This will be used to set efficiencies for various pieces of equipment within the system. Further information about these defaults can be found in the version of ASHRAE 90.1 corresponding to the selected vintage. Read-only versions of the standard can be found at: https://www.ashrae.org/technical-resources/standards-and-guidelines/read-only-versions-of-ashrae-standards",
-            "default": "90.1-2013",
+            "default": "ASHRAE_2013",
             "allOf": [
               {
                 "$ref": "#/components/schemas/Vintages"
@@ -6639,7 +6724,7 @@
           },
           "equipment_type": {
             "description": "Text for the specific type of system equipment from the FCUwithDOASEquipmentType enumeration.",
-            "default": "DOAS with fan coil chiller with boiler",
+            "default": "DOAS_FCU_Chiller_Boiler",
             "allOf": [
               {
                 "$ref": "#/components/schemas/FCUwithDOASEquipmentType"
@@ -6656,10 +6741,10 @@
         "title": "WSHPwithDOASEquipmentType",
         "description": "An enumeration.",
         "enum": [
-          "DOAS with water source heat pumps fluid cooler with boiler",
-          "DOAS with water source heat pumps cooling tower with boiler",
-          "DOAS with water source heat pumps with ground source heat pump",
-          "DOAS with water source heat pumps district chilled water with district hot water"
+          "DOAS_WSHP_FluidCooler_Boiler",
+          "DOAS_WSHP_CoolingTower_Boiler",
+          "DOAS_WSHP_GSHP",
+          "DOAS_WSHP_DCW_DHW"
         ],
         "type": "string"
       },
@@ -6682,7 +6767,7 @@
           },
           "vintage": {
             "description": "Text for the vintage of the template system. This will be used to set efficiencies for various pieces of equipment within the system. Further information about these defaults can be found in the version of ASHRAE 90.1 corresponding to the selected vintage. Read-only versions of the standard can be found at: https://www.ashrae.org/technical-resources/standards-and-guidelines/read-only-versions-of-ashrae-standards",
-            "default": "90.1-2013",
+            "default": "ASHRAE_2013",
             "allOf": [
               {
                 "$ref": "#/components/schemas/Vintages"
@@ -6734,7 +6819,7 @@
           },
           "equipment_type": {
             "description": "Text for the specific type of system equipment from the WSHPwithDOASEquipmentType enumeration.",
-            "default": "DOAS with water source heat pumps fluid cooler with boiler",
+            "default": "DOAS_WSHP_FluidCooler_Boiler",
             "allOf": [
               {
                 "$ref": "#/components/schemas/WSHPwithDOASEquipmentType"
@@ -6751,7 +6836,7 @@
         "title": "VRFwithDOASEquipmentType",
         "description": "An enumeration.",
         "enum": [
-          "DOAS with VRF"
+          "DOAS_VRF"
         ],
         "type": "string"
       },
@@ -6774,7 +6859,7 @@
           },
           "vintage": {
             "description": "Text for the vintage of the template system. This will be used to set efficiencies for various pieces of equipment within the system. Further information about these defaults can be found in the version of ASHRAE 90.1 corresponding to the selected vintage. Read-only versions of the standard can be found at: https://www.ashrae.org/technical-resources/standards-and-guidelines/read-only-versions-of-ashrae-standards",
-            "default": "90.1-2013",
+            "default": "ASHRAE_2013",
             "allOf": [
               {
                 "$ref": "#/components/schemas/Vintages"
@@ -6826,7 +6911,7 @@
           },
           "equipment_type": {
             "description": "Text for the specific type of system equipment from the VRFwithDOASEquipmentType enumeration.",
-            "default": "DOAS with VRF",
+            "default": "DOAS_VRF",
             "allOf": [
               {
                 "$ref": "#/components/schemas/VRFwithDOASEquipmentType"
@@ -6843,24 +6928,24 @@
         "title": "FCUEquipmentType",
         "description": "An enumeration.",
         "enum": [
-          "Fan coil chiller with boiler",
-          "Fan coil chiller with central air source heat pump",
-          "Fan coil chiller with district hot water",
-          "Fan coil chiller with baseboard electric",
-          "Fan coil chiller with gas unit heaters",
-          "Fan coil chiller with no heat",
-          "Fan coil air-cooled chiller with boiler",
-          "Fan coil air-cooled chiller with central air source heat pump",
-          "Fan coil air-cooled chiller with district hot water",
-          "Fan coil air-cooled chiller with baseboard electric",
-          "Fan coil air-cooled chiller with gas unit heaters",
-          "Fan coil air-cooled chiller with no heat",
-          "Fan coil district chilled water with boiler",
-          "Fan coil district chilled water with central air source heat pump",
-          "Fan coil district chilled water with district hot water",
-          "Fan coil district chilled water with baseboard electric",
-          "Fan coil district chilled water with gas unit heaters",
-          "Fan coil district chilled water with no heat"
+          "FCU_Chiller_Boiler",
+          "FCU_Chiller_ASHP",
+          "FCU_Chiller_DHW",
+          "FCU_Chiller_ElectricBaseboard",
+          "FCU_Chiller_GasHeaters",
+          "FCU_Chiller",
+          "FCU_ACChiller_Boiler",
+          "FCU_ACChiller_ASHP",
+          "FCU_ACChiller_DHW",
+          "FCU_ACChiller_ElectricBaseboard",
+          "FCU_ACChiller_GasHeaters",
+          "FCU_ACChiller",
+          "FCU_DCW_Boiler",
+          "FCU_DCW_ASHP",
+          "FCU_DCW_DHW",
+          "FCU_DCW_ElectricBaseboard",
+          "FCU_DCW_GasHeaters",
+          "FCU_DCW"
         ],
         "type": "string"
       },
@@ -6883,7 +6968,7 @@
           },
           "vintage": {
             "description": "Text for the vintage of the template system. This will be used to set efficiencies for various pieces of equipment within the system. Further information about these defaults can be found in the version of ASHRAE 90.1 corresponding to the selected vintage. Read-only versions of the standard can be found at: https://www.ashrae.org/technical-resources/standards-and-guidelines/read-only-versions-of-ashrae-standards",
-            "default": "90.1-2013",
+            "default": "ASHRAE_2013",
             "allOf": [
               {
                 "$ref": "#/components/schemas/Vintages"
@@ -6899,7 +6984,7 @@
           },
           "equipment_type": {
             "description": "Text for the specific type of system equipment from the FCUEquipmentType enumeration.",
-            "default": "Fan coil chiller with boiler",
+            "default": "FCU_Chiller_Boiler",
             "allOf": [
               {
                 "$ref": "#/components/schemas/FCUEquipmentType"
@@ -6916,10 +7001,10 @@
         "title": "WSHPEquipmentType",
         "description": "An enumeration.",
         "enum": [
-          "Water source heat pumps fluid cooler with boiler",
-          "Water source heat pumps cooling tower with boiler",
-          "Water source heat pumps with ground source heat pump",
-          "Water source heat pumps district chilled water with district hot water"
+          "WSHP_FluidCooler_Boiler",
+          "WSHP_CoolingTower_Boiler",
+          "WSHP_GSHP",
+          "WSHP_DCW_DHW"
         ],
         "type": "string"
       },
@@ -6942,7 +7027,7 @@
           },
           "vintage": {
             "description": "Text for the vintage of the template system. This will be used to set efficiencies for various pieces of equipment within the system. Further information about these defaults can be found in the version of ASHRAE 90.1 corresponding to the selected vintage. Read-only versions of the standard can be found at: https://www.ashrae.org/technical-resources/standards-and-guidelines/read-only-versions-of-ashrae-standards",
-            "default": "90.1-2013",
+            "default": "ASHRAE_2013",
             "allOf": [
               {
                 "$ref": "#/components/schemas/Vintages"
@@ -6958,7 +7043,7 @@
           },
           "equipment_type": {
             "description": "Text for the specific type of system equipment from the WSHPEquipmentType enumeration.",
-            "default": "Water source heat pumps fluid cooler with boiler",
+            "default": "WSHP_FluidCooler_Boiler",
             "allOf": [
               {
                 "$ref": "#/components/schemas/WSHPEquipmentType"
@@ -6998,7 +7083,7 @@
           },
           "vintage": {
             "description": "Text for the vintage of the template system. This will be used to set efficiencies for various pieces of equipment within the system. Further information about these defaults can be found in the version of ASHRAE 90.1 corresponding to the selected vintage. Read-only versions of the standard can be found at: https://www.ashrae.org/technical-resources/standards-and-guidelines/read-only-versions-of-ashrae-standards",
-            "default": "90.1-2013",
+            "default": "ASHRAE_2013",
             "allOf": [
               {
                 "$ref": "#/components/schemas/Vintages"
@@ -7031,10 +7116,10 @@
         "title": "BaseboardEquipmentType",
         "description": "An enumeration.",
         "enum": [
-          "Baseboard electric",
-          "Baseboard gas boiler",
-          "Baseboard central air source heat pump",
-          "Baseboard district hot water"
+          "ElectricBaseboard",
+          "BoilerBaseboard",
+          "ASHPBaseboard",
+          "DHWBaseboard"
         ],
         "type": "string"
       },
@@ -7057,7 +7142,7 @@
           },
           "vintage": {
             "description": "Text for the vintage of the template system. This will be used to set efficiencies for various pieces of equipment within the system. Further information about these defaults can be found in the version of ASHRAE 90.1 corresponding to the selected vintage. Read-only versions of the standard can be found at: https://www.ashrae.org/technical-resources/standards-and-guidelines/read-only-versions-of-ashrae-standards",
-            "default": "90.1-2013",
+            "default": "ASHRAE_2013",
             "allOf": [
               {
                 "$ref": "#/components/schemas/Vintages"
@@ -7073,7 +7158,7 @@
           },
           "equipment_type": {
             "description": "Text for the specific type of system equipment from the BaseboardEquipmentType enumeration.",
-            "default": "Baseboard electric",
+            "default": "ElectricBaseboard",
             "allOf": [
               {
                 "$ref": "#/components/schemas/BaseboardEquipmentType"
@@ -7090,13 +7175,13 @@
         "title": "EvaporativeCoolerEquipmentType",
         "description": "An enumeration.",
         "enum": [
-          "Direct evap coolers with baseboard electric",
-          "Direct evap coolers with baseboard gas boiler",
-          "Direct evap coolers with baseboard central air source heat pump",
-          "Direct evap coolers with baseboard district hot water",
-          "Direct evap coolers with forced air furnace",
-          "Direct evap coolers with gas unit heaters",
-          "Direct evap coolers with no heat"
+          "EvapCoolers_ElectricBaseboard",
+          "EvapCoolers_BoilerBaseboard",
+          "EvapCoolers_ASHPBaseboard",
+          "EvapCoolers_DHWBaseboard",
+          "EvapCoolers_Furnace",
+          "EvapCoolers_UnitHeaters",
+          "EvapCoolers"
         ],
         "type": "string"
       },
@@ -7119,7 +7204,7 @@
           },
           "vintage": {
             "description": "Text for the vintage of the template system. This will be used to set efficiencies for various pieces of equipment within the system. Further information about these defaults can be found in the version of ASHRAE 90.1 corresponding to the selected vintage. Read-only versions of the standard can be found at: https://www.ashrae.org/technical-resources/standards-and-guidelines/read-only-versions-of-ashrae-standards",
-            "default": "90.1-2013",
+            "default": "ASHRAE_2013",
             "allOf": [
               {
                 "$ref": "#/components/schemas/Vintages"
@@ -7135,7 +7220,7 @@
           },
           "equipment_type": {
             "description": "Text for the specific type of system equipment from the EvaporativeCoolerEquipmentType enumeration.",
-            "default": "Direct evap coolers with baseboard electric",
+            "default": "EvapCoolers_ElectricBaseboard",
             "allOf": [
               {
                 "$ref": "#/components/schemas/EvaporativeCoolerEquipmentType"
@@ -7152,15 +7237,15 @@
         "title": "ResidentialEquipmentType",
         "description": "An enumeration.",
         "enum": [
-          "Residential AC with baseboard electric",
-          "Residential AC with baseboard gas boiler",
-          "Residential AC with baseboard central air source heat pump",
-          "Residential AC with baseboard district hot water",
-          "Residential AC with residential forced air furnace",
-          "Residential AC with no heat",
-          "Residential heat pump",
-          "Residential heat pump with no cooling",
-          "Residential forced air furnace"
+          "ResidentialAC_ElectricBaseboard",
+          "ResidentialAC_BoilerBaseboard",
+          "ResidentialAC_ASHPBaseboard",
+          "ResidentialAC_DHWBaseboard",
+          "ResidentialAC_ResidentialFurnace",
+          "ResidentialAC",
+          "ResidentialHP",
+          "ResidentialHPNoCool",
+          "ResidentialFurnace"
         ],
         "type": "string"
       },
@@ -7183,7 +7268,7 @@
           },
           "vintage": {
             "description": "Text for the vintage of the template system. This will be used to set efficiencies for various pieces of equipment within the system. Further information about these defaults can be found in the version of ASHRAE 90.1 corresponding to the selected vintage. Read-only versions of the standard can be found at: https://www.ashrae.org/technical-resources/standards-and-guidelines/read-only-versions-of-ashrae-standards",
-            "default": "90.1-2013",
+            "default": "ASHRAE_2013",
             "allOf": [
               {
                 "$ref": "#/components/schemas/Vintages"
@@ -7199,7 +7284,7 @@
           },
           "equipment_type": {
             "description": "Text for the specific type of system equipment from the ResidentialEquipmentType enumeration.",
-            "default": "Residential AC with baseboard electric",
+            "default": "ResidentialAC_ElectricBaseboard",
             "allOf": [
               {
                 "$ref": "#/components/schemas/ResidentialEquipmentType"
@@ -7216,13 +7301,13 @@
         "title": "WindowACEquipmentType",
         "description": "An enumeration.",
         "enum": [
-          "Window AC with baseboard electric",
-          "Window AC with baseboard gas boiler",
-          "Window AC with baseboard central air source heat pump",
-          "Window AC with baseboard district hot water",
-          "Window AC with forced air furnace",
-          "Window AC with unit heaters",
-          "Window AC with no heat"
+          "WindowAC_ElectricBaseboard",
+          "WindowAC_BoilerBaseboard",
+          "WindowAC_ASHPBaseboard",
+          "WindowAC_DHWBaseboard",
+          "WindowAC_Furnace",
+          "WindowAC_GasHeaters",
+          "WindowAC"
         ],
         "type": "string"
       },
@@ -7245,7 +7330,7 @@
           },
           "vintage": {
             "description": "Text for the vintage of the template system. This will be used to set efficiencies for various pieces of equipment within the system. Further information about these defaults can be found in the version of ASHRAE 90.1 corresponding to the selected vintage. Read-only versions of the standard can be found at: https://www.ashrae.org/technical-resources/standards-and-guidelines/read-only-versions-of-ashrae-standards",
-            "default": "90.1-2013",
+            "default": "ASHRAE_2013",
             "allOf": [
               {
                 "$ref": "#/components/schemas/Vintages"
@@ -7261,7 +7346,7 @@
           },
           "equipment_type": {
             "description": "Text for the specific type of system equipment from the WindowACEquipmentType enumeration.",
-            "default": "Window AC with baseboard electric",
+            "default": "WindowAC_ElectricBaseboard",
             "allOf": [
               {
                 "$ref": "#/components/schemas/WindowACEquipmentType"
@@ -7278,7 +7363,7 @@
         "title": "GasUnitHeaterEquipmentType",
         "description": "An enumeration.",
         "enum": [
-          "Gas unit heaters"
+          "GasHeaters"
         ],
         "type": "string"
       },
@@ -7301,7 +7386,7 @@
           },
           "vintage": {
             "description": "Text for the vintage of the template system. This will be used to set efficiencies for various pieces of equipment within the system. Further information about these defaults can be found in the version of ASHRAE 90.1 corresponding to the selected vintage. Read-only versions of the standard can be found at: https://www.ashrae.org/technical-resources/standards-and-guidelines/read-only-versions-of-ashrae-standards",
-            "default": "90.1-2013",
+            "default": "ASHRAE_2013",
             "allOf": [
               {
                 "$ref": "#/components/schemas/Vintages"
@@ -7317,7 +7402,7 @@
           },
           "equipment_type": {
             "description": "Text for the specific type of system equipment from the GasUnitHeaterEquipmentType enumeration.",
-            "default": "Gas unit heaters",
+            "default": "GasHeaters",
             "allOf": [
               {
                 "$ref": "#/components/schemas/GasUnitHeaterEquipmentType"
@@ -7489,7 +7574,7 @@
           },
           "radiant_fraction": {
             "title": "Radiant Fraction",
-            "description": "The radiant fraction of sensible heat released by people. The defaultvalue is 0.30.",
+            "description": "The radiant fraction of sensible heat released by people. (Default: 0.3).",
             "default": 0.3,
             "minimum": 0,
             "maximum": 1,
@@ -7568,7 +7653,7 @@
           },
           "visible_fraction": {
             "title": "Visible Fraction",
-            "description": "The fraction of heat from lights that goes into the zone as visible (short-wave) radiation. The default value is `0.25`.",
+            "description": "The fraction of heat from lights that goes into the zone as visible (short-wave) radiation. (Default: 0.25).",
             "default": 0.25,
             "minimum": 0,
             "maximum": 1,
@@ -7577,7 +7662,7 @@
           },
           "radiant_fraction": {
             "title": "Radiant Fraction",
-            "description": "The fraction of heat from lights that is long-wave radiation. Default value is `0.32`.",
+            "description": "The fraction of heat from lights that is long-wave radiation. (Default: 0.32).",
             "default": 0.32,
             "minimum": 0,
             "maximum": 1,
@@ -7586,7 +7671,7 @@
           },
           "return_air_fraction": {
             "title": "Return Air Fraction",
-            "description": "The fraction of the heat from lights that goes into the zone return air. Default value is `0`.",
+            "description": "The fraction of the heat from lights that goes into the zone return air. (Default: 0).",
             "default": 0.0,
             "minimum": 0,
             "maximum": 1,
@@ -11037,7 +11122,7 @@
           },
           "display_name": {
             "title": "Display Name",
-            "description": "Text string for a unique display name, used to set the default file name that the radiance asset is written to within a radiance folder. Must not contain spaces or special characters.",
+            "description": "Display name of the object with no character restrictions.",
             "type": "string"
           },
           "room_identifier": {
@@ -11074,6 +11159,19 @@
                 "$ref": "#/components/schemas/Mesh3D"
               }
             ]
+          },
+          "base_geometry": {
+            "title": "Base Geometry",
+            "description": "An optional array of Face3D used to represent the grid. There are no restrictions on how this property relates to the sensors and it is provided only to assist with the display of the grid when the number of sensors or the mesh is too large to be practically visualized.",
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/Face3D"
+            }
+          },
+          "group_identifier": {
+            "title": "Group Identifier",
+            "description": "An optional string to note the sensor grid group '             'to which the sensor is a part of. Grids sharing the same '             'group_identifier will be written to the same subfolder in Radiance '             'folder (default: None).",
+            "type": "string"
           }
         },
         "required": [
@@ -11140,7 +11238,7 @@
           },
           "display_name": {
             "title": "Display Name",
-            "description": "Text string for a unique display name, used to set the default file name that the radiance asset is written to within a radiance folder. Must not contain spaces or special characters.",
+            "description": "Display name of the object with no character restrictions.",
             "type": "string"
           },
           "room_identifier": {
@@ -11214,6 +11312,11 @@
             "description": "View aft clip (-va) at a distance from the view point.Like the view fore plane, it will be perpendicular to the view direction for perspective and parallel view types. For fisheye view types, the clipping plane is actually a clipping sphere, centered on the view point with radius val.",
             "type": "number",
             "format": "double"
+          },
+          "group_identifier": {
+            "title": "Group Identifier",
+            "description": "An optional string to note the view group '             'to which the sensor is a part of. Views sharing the same '             'group_identifier will be written to the same subfolder in Radiance '             'folder (default: None).",
+            "type": "string"
           }
         },
         "required": [
@@ -11367,7 +11470,7 @@
           "version": {
             "title": "Version",
             "description": "Text string for the current version of the schema.",
-            "default": "1.39.12",
+            "default": "1.42.2",
             "pattern": "([0-9]+)\\.([0-9]+)\\.([0-9]+)",
             "type": "string",
             "readOnly": true