honeybee-openstudio 2.0.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 316bc7465ea14eb23cdca97fe943459513d2a34d989d822fc821a6ff801e60e6
-  data.tar.gz: 497e27a4d694073541229191642f1f0caf6ccd6eff226ac8dee7e60b88c6fb4f
+  metadata.gz: 34e31476710190775c1b58a796578e2762b592c7521d571185431df3dd2c0bce
+  data.tar.gz: e261ac7d892e16badc00bfba752ab57a63c373147ce805bca8c9e2e9ca31405b
 SHA512:
-  metadata.gz: 331f16511e285305c2d0868be7f450067b1f3035d35d2cf905e9e66fdf553cec8812c7a81f9d322b98df33bbe8eff57105ef0bab29315c3bc8522f94a3499ec2
-  data.tar.gz: 48cafa3e21c745c03bbc56d15275a025c56f0a27f5647153a4126ec0c9b8cc449b71d63bc7ab19f3844e7bae6f92038059ec3277358895469f44b3105bd09e42
+  metadata.gz: a1b39d70eb49ad7fa6eaf138b4808cd8701c0a9f6bfc68ba9d9b05f7385d8b3762029d1ef98d56818c801837890e94c87e1cc20dd49e977aafcdf2327f88aa8d
+  data.tar.gz: b3bc7170822b01e4c88b0ee7db34a1620147f4ff170423e316528a75fff0389ff325749cacdd8996deb4d945543b937cc8803d7214e0af94c908f1135112d5de

data/Gemfile

@@ -11,8 +11,4 @@ else  # get it from rubygems.org
 end
 
 # coveralls gem is used to generate coverage reports through CI
-gem 'coveralls', require: false
-
-# uncomment the following to run tests locally using `bundle exec rake`.
-# simplecov has an unneccesary dependency on native json gem, use fork that does not require this
-#gem 'simplecov', github: 'NREL/simplecov'
+gem 'coveralls_reborn', require: false

data/README.md

@@ -61,7 +61,7 @@ Then, you must install the OpenStudio Extension Gem itself with:
 ```
 gem install openstudio-extension
 ```
-Then, the specific dependencies of this measure can be installed by running:
+Then, the specific dependencies of this repository can be installed by running:
 ```
 cd honeybee-openstudio-gem
 bundle update

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.0.0'
+  spec.version       = '2.2.0'
   spec.authors       = ['Tanushree Charan', 'Dan Macumber', 'Chris Mackey', 'Mostapha Sadeghipour Roudsari']
   spec.email         = ['tanushree.charan@nrel.gov', 'chris@ladybug.tools']
 

data/lib/files/urbanopt_Gemfile

@@ -1,17 +1,15 @@
 source 'http://rubygems.org'
 
-ruby '2.2.4'
+ruby '~> 2.5.0'
 
 allow_local = ENV['FAVOR_LOCAL_GEMS']
 
-gem 'urbanopt-reopt', '0.2.1'
-
 if allow_local && File.exist?('../urbanopt-scenario-gem')
   gem 'urbanopt-scenario', path: '../urbanopt-scenario-gem'
 elsif allow_local
   gem 'urbanopt-scenario', github: 'URBANopt/urbanopt-scenario-gem', branch: 'develop'
 else
-  gem 'urbanopt-scenario', '0.2.0'
+  gem 'urbanopt-scenario', '~> 0.3.0'
 end
 
 if allow_local && File.exist?('../urbanopt-geojson-gem')
@@ -19,14 +17,8 @@ if allow_local && File.exist?('../urbanopt-geojson-gem')
 elsif allow_local
   gem 'urbanopt-geojson', github: 'URBANopt/urbanopt-geojson-gem', branch: 'develop'
 else
-  gem 'urbanopt-geojson', '0.2.0'
+  gem 'urbanopt-geojson', '~> 0.3.0'
 end
 
 # include the honeybee-openstudio-gem
-gem 'honeybee-openstudio', '1.8.2'
-
-# simplecov has an unnecessary dependency on native json gem, use fork that does not require this
-gem 'simplecov', github: 'NREL/simplecov'
-
-# Specify exact rack version temporarily to work with Ruby 2.2.4
-gem 'rack', '2.1.2'
+gem 'honeybee-openstudio', '2.1.0'

data/lib/from_honeybee.rb

@@ -51,6 +51,7 @@ require 'from_honeybee/hvac/ideal_air'
 # import the construction objects
 require 'from_honeybee/construction/opaque'
 require 'from_honeybee/construction/window'
+require 'from_honeybee/construction/windowshade'
 require 'from_honeybee/construction/shade'
 require 'from_honeybee/construction/air'
 

data/lib/from_honeybee/_openapi/model.json

@@ -3,7 +3,7 @@
   "servers": [],
   "info": {
     "description": "This is the documentation for Honeybee model schema.",
-    "version": "1.27.1",
+    "version": "1.32.0",
     "title": "Honeybee Model Schema",
     "contact": {
       "name": "Ladybug Tools",
@@ -159,6 +159,11 @@
       "x-displayName": "EnergyMaterial",
       "description": "<SchemaDefinition schemaRef=\"#/components/schemas/EnergyMaterial\" />\n"
     },
+    {
+      "name": "roughness_model",
+      "x-displayName": "Roughness",
+      "description": "<SchemaDefinition schemaRef=\"#/components/schemas/Roughness\" />\n"
+    },
     {
       "name": "energymaterialnomass_model",
       "x-displayName": "EnergyMaterialNoMass",
@@ -169,11 +174,21 @@
       "x-displayName": "EnergyWindowMaterialBlind",
       "description": "<SchemaDefinition schemaRef=\"#/components/schemas/EnergyWindowMaterialBlind\" />\n"
     },
+    {
+      "name": "slatorientation_model",
+      "x-displayName": "SlatOrientation",
+      "description": "<SchemaDefinition schemaRef=\"#/components/schemas/SlatOrientation\" />\n"
+    },
     {
       "name": "energywindowmaterialgas_model",
       "x-displayName": "EnergyWindowMaterialGas",
       "description": "<SchemaDefinition schemaRef=\"#/components/schemas/EnergyWindowMaterialGas\" />\n"
     },
+    {
+      "name": "gastype_model",
+      "x-displayName": "GasType",
+      "description": "<SchemaDefinition schemaRef=\"#/components/schemas/GasType\" />\n"
+    },
     {
       "name": "energywindowmaterialgascustom_model",
       "x-displayName": "EnergyWindowMaterialGasCustom",
@@ -204,6 +219,11 @@
       "x-displayName": "Face",
       "description": "<SchemaDefinition schemaRef=\"#/components/schemas/Face\" />\n"
     },
+    {
+      "name": "facetype_model",
+      "x-displayName": "FaceType",
+      "description": "<SchemaDefinition schemaRef=\"#/components/schemas/FaceType\" />\n"
+    },
     {
       "name": "face3d_model",
       "x-displayName": "Face3D",
@@ -274,6 +294,11 @@
       "x-displayName": "IdealAirSystemAbridged",
       "description": "<SchemaDefinition schemaRef=\"#/components/schemas/IdealAirSystemAbridged\" />\n"
     },
+    {
+      "name": "economizertype_model",
+      "x-displayName": "EconomizerType",
+      "description": "<SchemaDefinition schemaRef=\"#/components/schemas/EconomizerType\" />\n"
+    },
     {
       "name": "infiltration_model",
       "x-displayName": "Infiltration",
@@ -299,6 +324,11 @@
       "x-displayName": "LightingAbridged",
       "description": "<SchemaDefinition schemaRef=\"#/components/schemas/LightingAbridged\" />\n"
     },
+    {
+      "name": "metal_model",
+      "x-displayName": "Metal",
+      "description": "<SchemaDefinition schemaRef=\"#/components/schemas/Metal\" />\n"
+    },
     {
       "name": "mirror_model",
       "x-displayName": "Mirror",
@@ -309,6 +339,11 @@
       "x-displayName": "Model",
       "description": "<SchemaDefinition schemaRef=\"#/components/schemas/Model\" />\n"
     },
+    {
+      "name": "units_model",
+      "x-displayName": "Units",
+      "description": "<SchemaDefinition schemaRef=\"#/components/schemas/Units\" />\n"
+    },
     {
       "name": "modelenergyproperties_model",
       "x-displayName": "ModelEnergyProperties",
@@ -384,6 +419,16 @@
       "x-displayName": "ProgramTypeAbridged",
       "description": "<SchemaDefinition schemaRef=\"#/components/schemas/ProgramTypeAbridged\" />\n"
     },
+    {
+      "name": "radianceshadestateabridged_model",
+      "x-displayName": "RadianceShadeStateAbridged",
+      "description": "<SchemaDefinition schemaRef=\"#/components/schemas/RadianceShadeStateAbridged\" />\n"
+    },
+    {
+      "name": "radiancesubfacestateabridged_model",
+      "x-displayName": "RadianceSubFaceStateAbridged",
+      "description": "<SchemaDefinition schemaRef=\"#/components/schemas/RadianceSubFaceStateAbridged\" />\n"
+    },
     {
       "name": "roofceilingconstructionset_model",
       "x-displayName": "RoofCeilingConstructionSet",
@@ -459,6 +504,16 @@
       "x-displayName": "ScheduleTypeLimit",
       "description": "<SchemaDefinition schemaRef=\"#/components/schemas/ScheduleTypeLimit\" />\n"
     },
+    {
+      "name": "schedulenumerictype_model",
+      "x-displayName": "ScheduleNumericType",
+      "description": "<SchemaDefinition schemaRef=\"#/components/schemas/ScheduleNumericType\" />\n"
+    },
+    {
+      "name": "scheduleunittype_model",
+      "x-displayName": "ScheduleUnitType",
+      "description": "<SchemaDefinition schemaRef=\"#/components/schemas/ScheduleUnitType\" />\n"
+    },
     {
       "name": "setpoint_model",
       "x-displayName": "Setpoint",
@@ -504,6 +559,11 @@
       "x-displayName": "ShadeRadiancePropertiesAbridged",
       "description": "<SchemaDefinition schemaRef=\"#/components/schemas/ShadeRadiancePropertiesAbridged\" />\n"
     },
+    {
+      "name": "stategeometryabridged_model",
+      "x-displayName": "StateGeometryAbridged",
+      "description": "<SchemaDefinition schemaRef=\"#/components/schemas/StateGeometryAbridged\" />\n"
+    },
     {
       "name": "surface_model",
       "x-displayName": "Surface",
@@ -558,6 +618,26 @@
       "name": "windowconstructionabridged_model",
       "x-displayName": "WindowConstructionAbridged",
       "description": "<SchemaDefinition schemaRef=\"#/components/schemas/WindowConstructionAbridged\" />\n"
+    },
+    {
+      "name": "windowconstructionshade_model",
+      "x-displayName": "WindowConstructionShade",
+      "description": "<SchemaDefinition schemaRef=\"#/components/schemas/WindowConstructionShade\" />\n"
+    },
+    {
+      "name": "shadelocation_model",
+      "x-displayName": "ShadeLocation",
+      "description": "<SchemaDefinition schemaRef=\"#/components/schemas/ShadeLocation\" />\n"
+    },
+    {
+      "name": "controltype_model",
+      "x-displayName": "ControlType",
+      "description": "<SchemaDefinition schemaRef=\"#/components/schemas/ControlType\" />\n"
+    },
+    {
+      "name": "windowconstructionshadeabridged_model",
+      "x-displayName": "WindowConstructionShadeAbridged",
+      "description": "<SchemaDefinition schemaRef=\"#/components/schemas/WindowConstructionShadeAbridged\" />\n"
     }
   ],
   "x-tagGroups": [
@@ -580,6 +660,7 @@
         "bsdf_model",
         "constructionset_model",
         "constructionsetabridged_model",
+        "controltype_model",
         "door_model",
         "doorconstructionset_model",
         "doorconstructionsetabridged_model",
@@ -588,6 +669,7 @@
         "doormodifiersetabridged_model",
         "doorpropertiesabridged_model",
         "doorradiancepropertiesabridged_model",
+        "economizertype_model",
         "electricequipment_model",
         "electricequipmentabridged_model",
         "energymaterial_model",
@@ -604,12 +686,14 @@
         "faceenergypropertiesabridged_model",
         "facepropertiesabridged_model",
         "faceradiancepropertiesabridged_model",
+        "facetype_model",
         "floorconstructionset_model",
         "floorconstructionsetabridged_model",
         "floormodifierset_model",
         "floormodifiersetabridged_model",
         "gasequipment_model",
         "gasequipmentabridged_model",
+        "gastype_model",
         "glass_model",
         "glow_model",
         "ground_model",
@@ -619,6 +703,7 @@
         "light_model",
         "lighting_model",
         "lightingabridged_model",
+        "metal_model",
         "mirror_model",
         "model_model",
         "modelenergyproperties_model",
@@ -636,6 +721,8 @@
         "plastic_model",
         "programtype_model",
         "programtypeabridged_model",
+        "radianceshadestateabridged_model",
+        "radiancesubfacestateabridged_model",
         "roofceilingconstructionset_model",
         "roofceilingconstructionsetabridged_model",
         "roofceilingmodifierset_model",
@@ -644,24 +731,31 @@
         "roomenergypropertiesabridged_model",
         "roompropertiesabridged_model",
         "roomradiancepropertiesabridged_model",
+        "roughness_model",
         "scheduleday_model",
         "schedulefixedinterval_model",
         "schedulefixedintervalabridged_model",
+        "schedulenumerictype_model",
         "scheduleruleabridged_model",
         "scheduleruleset_model",
         "schedulerulesetabridged_model",
         "scheduletypelimit_model",
+        "scheduleunittype_model",
         "setpoint_model",
         "setpointabridged_model",
         "shade_model",
         "shadeconstruction_model",
         "shadeenergypropertiesabridged_model",
+        "shadelocation_model",
         "shademodifierset_model",
         "shademodifiersetabridged_model",
         "shadepropertiesabridged_model",
         "shaderadiancepropertiesabridged_model",
+        "slatorientation_model",
+        "stategeometryabridged_model",
         "surface_model",
         "trans_model",
+        "units_model",
         "ventilation_model",
         "ventilationabridged_model",
         "void_model",
@@ -670,7 +764,9 @@
         "wallmodifierset_model",
         "wallmodifiersetabridged_model",
         "windowconstruction_model",
-        "windowconstructionabridged_model"
+        "windowconstructionabridged_model",
+        "windowconstructionshade_model",
+        "windowconstructionshadeabridged_model"
       ]
     }
   ],
@@ -888,12 +984,12 @@
         "properties": {
           "boundary_condition_objects": {
             "title": "Boundary Condition Objects",
-            "description": "A list of up to 3 object identifiers that are adjacent to this one. The first object is always the one that is immediately adjacet and is of the same object type (Face, Aperture, Door). When this boundary condition is applied to a Face, the second object in the tuple will be the parent Room of the adjacent object. When the boundary condition is applied to a sub-face (Door or Aperture), the second object will be the parent Face of the adjacent sub-face and the third object will be the parent Room of the adjacent sub-face.",
-            "min_tems": 2,
+            "description": "A list of up to 3 object identifiers that are adjacent to this one. The first object is always the one that is immediately adjacent and is of the same object type (Face, Aperture, Door). When this boundary condition is applied to a Face, the second object in the tuple will be the parent Room of the adjacent object. When the boundary condition is applied to a sub-face (Door or Aperture), the second object will be the parent Face of the adjacent sub-face and the third object will be the parent Room of the adjacent sub-face.",
             "type": "array",
             "items": {
               "type": "string"
             },
+            "minItems": 2,
             "maxItems": 3
           },
           "type": {
@@ -930,7 +1026,7 @@
           },
           "transmittance_schedule": {
             "title": "Transmittance Schedule",
-            "description": "Identifier of a schedule to set the transmittance of the shade, which can vary throughout the simulation. If None, the shade will be completely opauqe.",
+            "description": "Identifier of a schedule to set the transmittance of the shade, which can vary throughout the simulation. If None, the shade will be completely opaque.",
             "maxLength": 100,
             "minLength": 1,
             "type": "string"
@@ -938,6 +1034,87 @@
         },
         "additionalProperties": false
       },
+      "StateGeometryAbridged": {
+        "title": "StateGeometryAbridged",
+        "description": "A single planar geometry that can be assigned to Radiance states.",
+        "type": "object",
+        "properties": {
+          "identifier": {
+            "title": "Identifier",
+            "description": "Text string for a unique Radiance object. Must not contain spaces or special characters. This will be used to identify the object across a model and in the exported Radiance files.",
+            "type": "string"
+          },
+          "geometry": {
+            "title": "Geometry",
+            "description": "A ladybug_geometry Face3D.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/Face3D"
+              }
+            ]
+          },
+          "display_name": {
+            "title": "Display Name",
+            "description": "Display name of the object with no character restrictions.",
+            "type": "string"
+          },
+          "type": {
+            "title": "Type",
+            "default": "StateGeometryAbridged",
+            "pattern": "^StateGeometryAbridged$",
+            "type": "string",
+            "readOnly": true
+          },
+          "modifier": {
+            "title": "Modifier",
+            "description": "A string for a Honeybee Radiance Modifier identifier (default: None).",
+            "type": "string"
+          },
+          "modifier_direct": {
+            "title": "Modifier Direct",
+            "description": "A string for Honeybee Radiance Modifier identifiers to be used in direct solar simulations and in isolation studies (assessingthe contribution of individual objects) (default: None).",
+            "type": "string"
+          }
+        },
+        "required": [
+          "identifier",
+          "geometry"
+        ],
+        "additionalProperties": false
+      },
+      "RadianceShadeStateAbridged": {
+        "title": "RadianceShadeStateAbridged",
+        "description": "RadianceShadeStateAbridged represents a single state for a dynamic Shade.",
+        "type": "object",
+        "properties": {
+          "type": {
+            "title": "Type",
+            "default": "RadianceShadeStateAbridged",
+            "pattern": "^RadianceShadeStateAbridged$",
+            "type": "string",
+            "readOnly": true
+          },
+          "modifier": {
+            "title": "Modifier",
+            "description": "A Radiance Modifier identifier (default: None).",
+            "type": "string"
+          },
+          "modifier_direct": {
+            "title": "Modifier Direct",
+            "description": "A Radiance Modifier identifier (default: None).",
+            "type": "string"
+          },
+          "shades": {
+            "title": "Shades",
+            "description": "A list of StateGeometryAbridged objects (default: None).",
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/StateGeometryAbridged"
+            }
+          }
+        },
+        "additionalProperties": false
+      },
       "ShadeRadiancePropertiesAbridged": {
         "title": "ShadeRadiancePropertiesAbridged",
         "description": "Radiance Properties for Honeybee Shade Abridged.",
@@ -945,12 +1122,12 @@
         "properties": {
           "modifier": {
             "title": "Modifier",
-            "description": "A string for a Honeybee Radiance Modifier.",
+            "description": "A string for a Honeybee Radiance Modifier (default: None).",
             "type": "string"
           },
           "modifier_blk": {
             "title": "Modifier Blk",
-            "description": "A string for a Honeybee Radiance Modifier to be used in direct solar simulations and in isolation studies (assessingthe contribution of individual objects).",
+            "description": "A string for a Honeybee Radiance Modifier to be used in direct solar simulations and in isolation studies (assessingthe contribution of individual objects) (default: None).",
             "type": "string"
           },
           "type": {
@@ -959,6 +1136,19 @@
             "pattern": "^ShadeRadiancePropertiesAbridged$",
             "type": "string",
             "readOnly": true
+          },
+          "dynamic_group_identifier": {
+            "title": "Dynamic Group Identifier",
+            "description": "An optional string to note the dynamic group '             'to which the Shade is a part of. Shades sharing the same '             'dynamic_group_identifier will have their states change in unison. '             'If None, the Shade is assumed to be static. (default: None).",
+            "type": "string"
+          },
+          "states": {
+            "title": "States",
+            "description": "An optional list of abridged states (default: None).",
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/RadianceShadeStateAbridged"
+            }
           }
         },
         "additionalProperties": false
@@ -1060,6 +1250,57 @@
         },
         "additionalProperties": false
       },
+      "RadianceSubFaceStateAbridged": {
+        "title": "RadianceSubFaceStateAbridged",
+        "description": "RadianceSubFaceStateAbridged is an abridged state for a dynamic Aperture or Door.\n    ",
+        "type": "object",
+        "properties": {
+          "type": {
+            "title": "Type",
+            "default": "RadianceSubFaceStateAbridged",
+            "pattern": "^RadianceSubFaceStateAbridged$",
+            "type": "string",
+            "readOnly": true
+          },
+          "modifier": {
+            "title": "Modifier",
+            "description": "A Radiance Modifier identifier (default: None).",
+            "type": "string"
+          },
+          "modifier_direct": {
+            "title": "Modifier Direct",
+            "description": "A Radiance Modifier identifier (default: None).",
+            "type": "string"
+          },
+          "shades": {
+            "title": "Shades",
+            "description": "A list of StateGeometryAbridged objects (default: None).",
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/StateGeometryAbridged"
+            }
+          },
+          "vmtx_geometry": {
+            "title": "Vmtx Geometry",
+            "description": "A Face3D for the view matrix geometry (default: None).",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/Face3D"
+              }
+            ]
+          },
+          "dmtx_geometry": {
+            "title": "Dmtx Geometry",
+            "description": "A Face3D for the daylight matrix geometry (default: None).",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/Face3D"
+              }
+            ]
+          }
+        },
+        "additionalProperties": false
+      },
       "ApertureRadiancePropertiesAbridged": {
         "title": "ApertureRadiancePropertiesAbridged",
         "description": "Radiance Properties for Honeybee Aperture Abridged.",
@@ -1067,12 +1308,12 @@
         "properties": {
           "modifier": {
             "title": "Modifier",
-            "description": "A string for a Honeybee Radiance Modifier.",
+            "description": "A string for a Honeybee Radiance Modifier (default: None).",
             "type": "string"
           },
           "modifier_blk": {
             "title": "Modifier Blk",
-            "description": "A string for a Honeybee Radiance Modifier to be used in direct solar simulations and in isolation studies (assessingthe contribution of individual objects).",
+            "description": "A string for a Honeybee Radiance Modifier to be used in direct solar simulations and in isolation studies (assessingthe contribution of individual objects) (default: None).",
             "type": "string"
           },
           "type": {
@@ -1081,6 +1322,19 @@
             "pattern": "^ApertureRadiancePropertiesAbridged$",
             "type": "string",
             "readOnly": true
+          },
+          "dynamic_group_identifier": {
+            "title": "Dynamic Group Identifier",
+            "description": "An optional string to note the dynamic group '             'to which the Aperture is a part of. Apertures sharing the same '             'dynamic_group_identifier will have their states change in unison. '             'If None, the Aperture is assumed to be static. (default: None).",
+            "type": "string"
+          },
+          "states": {
+            "title": "States",
+            "description": "An optional list of abridged states (default: None).",
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/RadianceSubFaceStateAbridged"
+            }
           }
         },
         "additionalProperties": false
@@ -1223,12 +1477,12 @@
         "properties": {
           "modifier": {
             "title": "Modifier",
-            "description": "A string for a Honeybee Radiance Modifier.",
+            "description": "A string for a Honeybee Radiance Modifier (default: None).",
             "type": "string"
           },
           "modifier_blk": {
             "title": "Modifier Blk",
-            "description": "A string for a Honeybee Radiance Modifier to be used in direct solar simulations and in isolation studies (assessingthe contribution of individual objects).",
+            "description": "A string for a Honeybee Radiance Modifier to be used in direct solar simulations and in isolation studies (assessingthe contribution of individual objects) (default: None).",
             "type": "string"
           },
           "type": {
@@ -1237,6 +1491,19 @@
             "pattern": "^DoorRadiancePropertiesAbridged$",
             "type": "string",
             "readOnly": true
+          },
+          "dynamic_group_identifier": {
+            "title": "Dynamic Group Identifier",
+            "description": "An optional string to note the dynamic group '             'to which the Door is a part of. Doors sharing the same '             'dynamic_group_identifier will have their states change in unison. '             'If None, the Door is assumed to be static. (default: None).",
+            "type": "string"
+          },
+          "states": {
+            "title": "States",
+            "description": "An optional list of abridged states (default: None).",
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/RadianceSubFaceStateAbridged"
+            }
           }
         },
         "additionalProperties": false
@@ -1379,12 +1646,12 @@
         "properties": {
           "modifier": {
             "title": "Modifier",
-            "description": "A string for a Honeybee Radiance Modifier.",
+            "description": "A string for a Honeybee Radiance Modifier (default: None).",
             "type": "string"
           },
           "modifier_blk": {
             "title": "Modifier Blk",
-            "description": "A string for a Honeybee Radiance Modifier to be used in direct solar simulations and in isolation studies (assessingthe contribution of individual objects).",
+            "description": "A string for a Honeybee Radiance Modifier to be used in direct solar simulations and in isolation studies (assessingthe contribution of individual objects) (default: None).",
             "type": "string"
           },
           "type": {
@@ -1439,13 +1706,12 @@
             ]
           },
           "face_type": {
-            "title": "Face Type",
-            "enum": [
-              "Wall",
-              "Floor",
-              "RoofCeiling",
-              "AirBoundary"
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/FaceType"
+              }
             ],
+            "title": "Face Type",
             "type": "string"
           },
           "boundary_condition": {
@@ -2238,6 +2504,14 @@
             "minimum": 1,
             "type": "integer",
             "format": "int32"
+          },
+          "story": {
+            "title": "Story",
+            "description": "Text string for the story identifier to which this Room belongs. Rooms sharing the same story identifier are considered part of the same story in a Model.",
+            "maxLength": 100,
+            "minLength": 1,
+            "pattern": "[A-Za-z0-9_-]",
+            "type": "string"
           }
         },
         "required": [
@@ -2390,7 +2664,7 @@
           },
           "operable_construction": {
             "title": "Operable Construction",
-            "description": "Identifier for a WindowConstruction for all apertures with an Outdoors boundary condition and True is_operable property..",
+            "description": "Identifier for a WindowConstruction for all apertures with an Outdoors boundary condition and True is_operable property.",
             "maxLength": 100,
             "minLength": 1,
             "type": "string"
@@ -2591,16 +2865,13 @@
             "readOnly": true
           },
           "roughness": {
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/Roughness"
+              }
+            ],
             "title": "Roughness",
             "default": "MediumRough",
-            "enum": [
-              "VeryRough",
-              "Rough",
-              "MediumRough",
-              "MediumSmooth",
-              "Smooth",
-              "VerySmooth"
-            ],
             "type": "string"
           },
           "thermal_absorptance": {
@@ -2672,16 +2943,13 @@
             "readOnly": true
           },
           "roughness": {
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/Roughness"
+              }
+            ],
             "title": "Roughness",
             "default": "MediumRough",
-            "enum": [
-              "VeryRough",
-              "Rough",
-              "MediumRough",
-              "MediumSmooth",
-              "Smooth",
-              "VerySmooth"
-            ],
             "type": "string"
           },
           "thermal_absorptance": {
@@ -2732,7 +3000,7 @@
           },
           "layers": {
             "title": "Layers",
-            "description": "List of strings for material identifiers. The order of the materials is from exterior to interior.",
+            "description": "List of strings for opaque material identifiers. The order of the materials is from exterior to interior.",
             "minLength": 1,
             "maxLength": 100,
             "type": "array",
@@ -2746,7 +3014,7 @@
           },
           "materials": {
             "title": "Materials",
-            "description": "List of materials. The order of the materials is from outside to inside.",
+            "description": "List of opaque materials. The order of the materials is from outside to inside.",
             "type": "array",
             "items": {
               "anyOf": [
@@ -2907,9 +3175,9 @@
         },
         "additionalProperties": false
       },
-      "EnergyWindowMaterialGas": {
-        "title": "EnergyWindowMaterialGas",
-        "description": "Create single layer of gas in a window construction.\n\nCan be combined with EnergyWindowMaterialGlazing to make multi-pane windows.",
+      "EnergyWindowMaterialSimpleGlazSys": {
+        "title": "EnergyWindowMaterialSimpleGlazSys",
+        "description": "Describe an entire glazing system rather than individual layers.\n\nUsed when only very limited information is available on the glazing layers or when\nspecific performance levels are being targeted.",
         "type": "object",
         "properties": {
           "identifier": {
@@ -2919,6 +3187,22 @@
             "minLength": 1,
             "type": "string"
           },
+          "u_factor": {
+            "title": "U Factor",
+            "description": "Used to describe the value for window system U-Factor, or overall heat transfer coefficient in W/(m2-K).",
+            "exclusiveMinimum": 0,
+            "maximum": 5.8,
+            "type": "number",
+            "format": "double"
+          },
+          "shgc": {
+            "title": "Shgc",
+            "description": "Unitless  quantity describing Solar Heat Gain Coefficient for normal incidence and vertical orientation.",
+            "exclusiveMinimum": 0,
+            "exclusiveMaximum": 1,
+            "type": "number",
+            "format": "double"
+          },
           "display_name": {
             "title": "Display Name",
             "description": "Display name of the object with no character restrictions.",
@@ -2926,39 +3210,31 @@
           },
           "type": {
             "title": "Type",
-            "default": "EnergyWindowMaterialGas",
-            "pattern": "^EnergyWindowMaterialGas$",
+            "default": "EnergyWindowMaterialSimpleGlazSys",
+            "pattern": "^EnergyWindowMaterialSimpleGlazSys$",
             "type": "string",
             "readOnly": true
           },
-          "thickness": {
-            "title": "Thickness",
-            "description": "Thickness of the gas layer in meters. Default value is 0.0125.",
-            "default": 0.0125,
+          "vt": {
+            "title": "Vt",
+            "description": "The fraction of visible light falling on the window that makes it through the glass at normal incidence.",
+            "default": 0.54,
             "exclusiveMinimum": 0,
+            "exclusiveMaximum": 1,
             "type": "number",
             "format": "double"
-          },
-          "gas_type": {
-            "title": "Gas Type",
-            "default": "Air",
-            "enum": [
-              "Air",
-              "Argon",
-              "Krypton",
-              "Xenon"
-            ],
-            "type": "string"
           }
         },
         "required": [
-          "identifier"
+          "identifier",
+          "u_factor",
+          "shgc"
         ],
         "additionalProperties": false
       },
-      "EnergyWindowMaterialGasCustom": {
-        "title": "EnergyWindowMaterialGasCustom",
-        "description": "Create single layer of custom gas.",
+      "EnergyWindowMaterialGlazing": {
+        "title": "EnergyWindowMaterialGlazing",
+        "description": "Describe a single glass pane corresponding to a layer in a window construction.",
         "type": "object",
         "properties": {
           "identifier": {
@@ -2968,41 +3244,6 @@
             "minLength": 1,
             "type": "string"
           },
-          "conductivity_coeff_a": {
-            "title": "Conductivity Coeff A",
-            "description": "The A coefficient for gas conductivity in W/(m-K).",
-            "type": "number",
-            "format": "double"
-          },
-          "viscosity_coeff_a": {
-            "title": "Viscosity Coeff A",
-            "description": "The A coefficient for gas viscosity in kg/(m-s).",
-            "exclusiveMinimum": 0,
-            "type": "number",
-            "format": "double"
-          },
-          "specific_heat_coeff_a": {
-            "title": "Specific Heat Coeff A",
-            "description": "The A coefficient for gas specific heat in J/(kg-K).",
-            "exclusiveMinimum": 0,
-            "type": "number",
-            "format": "double"
-          },
-          "specific_heat_ratio": {
-            "title": "Specific Heat Ratio",
-            "description": "The specific heat ratio for gas.",
-            "exclusiveMinimum": 1,
-            "type": "number",
-            "format": "double"
-          },
-          "molecular_weight": {
-            "title": "Molecular Weight",
-            "description": "The molecular weight for gas in g/mol.",
-            "minimum": 20,
-            "maximum": 200,
-            "type": "number",
-            "format": "double"
-          },
           "display_name": {
             "title": "Display Name",
             "description": "Display name of the object with no character restrictions.",
@@ -3010,21 +3251,240 @@
           },
           "type": {
             "title": "Type",
-            "default": "EnergyWindowMaterialGasCustom",
-            "pattern": "^EnergyWindowMaterialGasCustom$",
+            "default": "EnergyWindowMaterialGlazing",
+            "pattern": "^EnergyWindowMaterialGlazing$",
             "type": "string",
             "readOnly": true
           },
           "thickness": {
             "title": "Thickness",
-            "description": "Thickness of the gas layer in meters. Default value is 0.0125.",
-            "default": 0.0125,
+            "description": "The surface-to-surface of the glass in meters. Default value is 0.003.",
+            "default": 0.003,
             "exclusiveMinimum": 0,
             "type": "number",
             "format": "double"
           },
-          "conductivity_coeff_b": {
-            "title": "Conductivity Coeff B",
+          "solar_transmittance": {
+            "title": "Solar Transmittance",
+            "description": "Transmittance of solar radiation through the glass at normal incidence. Default value is 0.85 for clear glass.",
+            "default": 0.85,
+            "minimum": 0,
+            "maximum": 1,
+            "type": "number",
+            "format": "double"
+          },
+          "solar_reflectance": {
+            "title": "Solar Reflectance",
+            "description": "Reflectance of solar radiation off of the front side of the glass at normal incidence, averaged over the solar spectrum. Default value is 0.075 for clear glass.",
+            "default": 0.075,
+            "minimum": 0,
+            "maximum": 1,
+            "type": "number",
+            "format": "double"
+          },
+          "solar_reflectance_back": {
+            "title": "Solar Reflectance Back",
+            "description": "Reflectance of solar radiation off of the back side of the glass at normal incidence, averaged over the solar spectrum.",
+            "type": "number",
+            "format": "double"
+          },
+          "visible_transmittance": {
+            "title": "Visible Transmittance",
+            "description": "Transmittance of visible light through the glass at normal incidence. Default value is 0.9 for clear glass.",
+            "default": 0.9,
+            "minimum": 0,
+            "maximum": 1,
+            "type": "number",
+            "format": "double"
+          },
+          "visible_reflectance": {
+            "title": "Visible Reflectance",
+            "description": "Reflectance of visible light off of the front side of the glass at normal incidence. Default value is 0.075 for clear glass.",
+            "default": 0.075,
+            "minimum": 0,
+            "maximum": 1,
+            "type": "number",
+            "format": "double"
+          },
+          "visible_reflectance_back": {
+            "title": "Visible Reflectance Back",
+            "description": "Reflectance of visible light off of the back side of the glass at normal incidence averaged over the solar spectrum and weighted by the response of the human eye.",
+            "minimum": 0,
+            "maximum": 1,
+            "type": "number",
+            "format": "double"
+          },
+          "infrared_transmittance": {
+            "title": "Infrared Transmittance",
+            "description": "Long-wave transmittance at normal incidence.",
+            "default": 0,
+            "minimum": 0,
+            "maximum": 1,
+            "type": "number",
+            "format": "double"
+          },
+          "emissivity": {
+            "title": "Emissivity",
+            "description": "Infrared hemispherical emissivity of the front (outward facing) side of the glass.  Default value is 0.84, which is typical for clear glass without a low-e coating.",
+            "default": 0.84,
+            "minimum": 0,
+            "maximum": 1,
+            "type": "number",
+            "format": "double"
+          },
+          "emissivity_back": {
+            "title": "Emissivity Back",
+            "description": "Infrared hemispherical emissivity of the back (inward facing) side of the glass.  Default value is 0.84, which is typical for clear glass without a low-e coating.",
+            "default": 0.84,
+            "minimum": 0,
+            "maximum": 1,
+            "type": "number",
+            "format": "double"
+          },
+          "conductivity": {
+            "title": "Conductivity",
+            "description": "Thermal conductivity of the glass in W/(m-K). Default value is 0.9, which is  typical for clear glass without a low-e coating.",
+            "default": 0.9,
+            "exclusiveMinimum": 0,
+            "type": "number",
+            "format": "double"
+          },
+          "dirt_correction": {
+            "title": "Dirt Correction",
+            "description": "Factor that corrects for the presence of dirt on the glass. A default value of 1 indicates the glass is clean.",
+            "default": 1,
+            "type": "number",
+            "format": "double"
+          },
+          "solar_diffusing": {
+            "title": "Solar Diffusing",
+            "description": "Takes values True and False. If False (default), the beam solar radiation incident on the glass is transmitted as beam radiation with no diffuse component.If True, the beam  solar radiation incident on the glass is transmitted as hemispherical diffuse radiation with no beam component.",
+            "default": false,
+            "type": "boolean"
+          }
+        },
+        "required": [
+          "identifier"
+        ],
+        "additionalProperties": false
+      },
+      "EnergyWindowMaterialGas": {
+        "title": "EnergyWindowMaterialGas",
+        "description": "Create single layer of gas in a window construction.\n\nCan be combined with EnergyWindowMaterialGlazing to make multi-pane windows.",
+        "type": "object",
+        "properties": {
+          "identifier": {
+            "title": "Identifier",
+            "description": "Text string for a unique object ID. This identifier remains constant as the object is mutated, copied, and serialized to different formats (eg. dict, idf, osm). This identifier is also used to reference the object across a Model. It must be < 100 characters, use only ASCII characters and exclude (, ; ! \\n \\t).",
+            "maxLength": 100,
+            "minLength": 1,
+            "type": "string"
+          },
+          "display_name": {
+            "title": "Display Name",
+            "description": "Display name of the object with no character restrictions.",
+            "type": "string"
+          },
+          "type": {
+            "title": "Type",
+            "default": "EnergyWindowMaterialGas",
+            "pattern": "^EnergyWindowMaterialGas$",
+            "type": "string",
+            "readOnly": true
+          },
+          "thickness": {
+            "title": "Thickness",
+            "description": "Thickness of the gas layer in meters. Default value is 0.0125.",
+            "default": 0.0125,
+            "exclusiveMinimum": 0,
+            "type": "number",
+            "format": "double"
+          },
+          "gas_type": {
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/GasType"
+              }
+            ],
+            "title": "Gas Type",
+            "default": "Air",
+            "type": "string"
+          }
+        },
+        "required": [
+          "identifier"
+        ],
+        "additionalProperties": false
+      },
+      "EnergyWindowMaterialGasCustom": {
+        "title": "EnergyWindowMaterialGasCustom",
+        "description": "Create single layer of custom gas.",
+        "type": "object",
+        "properties": {
+          "identifier": {
+            "title": "Identifier",
+            "description": "Text string for a unique object ID. This identifier remains constant as the object is mutated, copied, and serialized to different formats (eg. dict, idf, osm). This identifier is also used to reference the object across a Model. It must be < 100 characters, use only ASCII characters and exclude (, ; ! \\n \\t).",
+            "maxLength": 100,
+            "minLength": 1,
+            "type": "string"
+          },
+          "conductivity_coeff_a": {
+            "title": "Conductivity Coeff A",
+            "description": "The A coefficient for gas conductivity in W/(m-K).",
+            "type": "number",
+            "format": "double"
+          },
+          "viscosity_coeff_a": {
+            "title": "Viscosity Coeff A",
+            "description": "The A coefficient for gas viscosity in kg/(m-s).",
+            "exclusiveMinimum": 0,
+            "type": "number",
+            "format": "double"
+          },
+          "specific_heat_coeff_a": {
+            "title": "Specific Heat Coeff A",
+            "description": "The A coefficient for gas specific heat in J/(kg-K).",
+            "exclusiveMinimum": 0,
+            "type": "number",
+            "format": "double"
+          },
+          "specific_heat_ratio": {
+            "title": "Specific Heat Ratio",
+            "description": "The specific heat ratio for gas.",
+            "exclusiveMinimum": 1,
+            "type": "number",
+            "format": "double"
+          },
+          "molecular_weight": {
+            "title": "Molecular Weight",
+            "description": "The molecular weight for gas in g/mol.",
+            "minimum": 20,
+            "maximum": 200,
+            "type": "number",
+            "format": "double"
+          },
+          "display_name": {
+            "title": "Display Name",
+            "description": "Display name of the object with no character restrictions.",
+            "type": "string"
+          },
+          "type": {
+            "title": "Type",
+            "default": "EnergyWindowMaterialGasCustom",
+            "pattern": "^EnergyWindowMaterialGasCustom$",
+            "type": "string",
+            "readOnly": true
+          },
+          "thickness": {
+            "title": "Thickness",
+            "description": "Thickness of the gas layer in meters. Default value is 0.0125.",
+            "default": 0.0125,
+            "exclusiveMinimum": 0,
+            "type": "number",
+            "format": "double"
+          },
+          "conductivity_coeff_b": {
+            "title": "Conductivity Coeff B",
             "description": "The B coefficient for gas conductivity in W/(m-K2).",
             "default": 0,
             "type": "number",
@@ -3093,11 +3553,10 @@
             "description": "List of gases in the gas mixture.",
             "type": "array",
             "items": {
-              "enum": [
-                "Air",
-                "Argon",
-                "Krypton",
-                "Xenon"
+              "allOf": [
+                {
+                  "$ref": "#/components/schemas/GasType"
+                }
               ],
               "type": "string"
             },
@@ -3143,9 +3602,9 @@
         ],
         "additionalProperties": false
       },
-      "EnergyWindowMaterialSimpleGlazSys": {
-        "title": "EnergyWindowMaterialSimpleGlazSys",
-        "description": "Describe an entire glazing system rather than individual layers.\n\nUsed when only very limited information is available on the glazing layers or when\nspecific performance levels are being targeted.",
+      "WindowConstruction": {
+        "title": "WindowConstruction",
+        "description": "Construction for window objects (Aperture, Door).",
         "type": "object",
         "properties": {
           "identifier": {
@@ -3155,54 +3614,180 @@
             "minLength": 1,
             "type": "string"
           },
-          "u_factor": {
-            "title": "U Factor",
-            "description": "Used to describe the value for window system U-Factor, or overall heat transfer coefficient in W/(m2-K).",
-            "exclusiveMinimum": 0,
-            "maximum": 5.8,
-            "type": "number",
-            "format": "double"
-          },
-          "shgc": {
-            "title": "Shgc",
-            "description": "Unitless  quantity describing Solar Heat Gain Coefficient for normal incidence and vertical orientation.",
-            "exclusiveMinimum": 0,
-            "exclusiveMaximum": 1,
-            "type": "number",
-            "format": "double"
+          "layers": {
+            "title": "Layers",
+            "description": "List of strings for glazing or gas material identifiers. The order of the materials is from exterior to interior. 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.",
+            "minLength": 1,
+            "maxLength": 100,
+            "type": "array",
+            "items": {
+              "type": "string",
+              "minLength": 1,
+              "maxLength": 100
+            },
+            "minItems": 1,
+            "maxItems": 8
           },
-          "display_name": {
+          "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.",
+            "type": "array",
+            "items": {
+              "anyOf": [
+                {
+                  "$ref": "#/components/schemas/EnergyWindowMaterialSimpleGlazSys"
+                },
+                {
+                  "$ref": "#/components/schemas/EnergyWindowMaterialGlazing"
+                },
+                {
+                  "$ref": "#/components/schemas/EnergyWindowMaterialGas"
+                },
+                {
+                  "$ref": "#/components/schemas/EnergyWindowMaterialGasCustom"
+                },
+                {
+                  "$ref": "#/components/schemas/EnergyWindowMaterialGasMixture"
+                }
+              ]
+            },
+            "minItems": 1,
+            "maxItems": 8
+          },
+          "display_name": {
             "title": "Display Name",
             "description": "Display name of the object with no character restrictions.",
             "type": "string"
           },
           "type": {
             "title": "Type",
-            "default": "EnergyWindowMaterialSimpleGlazSys",
-            "pattern": "^EnergyWindowMaterialSimpleGlazSys$",
+            "default": "WindowConstruction",
+            "pattern": "^WindowConstruction$",
             "type": "string",
             "readOnly": true
-          },
-          "vt": {
-            "title": "Vt",
-            "description": "The fraction of visible light falling on the window that makes it through the glass at normal incidence.",
-            "default": 0.54,
-            "exclusiveMinimum": 0,
-            "exclusiveMaximum": 1,
-            "type": "number",
-            "format": "double"
           }
         },
         "required": [
           "identifier",
-          "u_factor",
-          "shgc"
+          "layers",
+          "materials"
         ],
         "additionalProperties": false
       },
-      "EnergyWindowMaterialBlind": {
-        "title": "EnergyWindowMaterialBlind",
-        "description": "Window blind material consisting of flat, equally-spaced slats.",
+      "ApertureConstructionSet": {
+        "title": "ApertureConstructionSet",
+        "description": "A set of constructions for aperture assemblies.",
+        "type": "object",
+        "properties": {
+          "type": {
+            "title": "Type",
+            "default": "ApertureConstructionSet",
+            "pattern": "^ApertureConstructionSet$",
+            "type": "string",
+            "readOnly": true
+          },
+          "interior_construction": {
+            "title": "Interior Construction",
+            "description": "A WindowConstruction for apertures with an Outdoors boundary condition, False is_operable property, and a Wall face type for their parent face.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/WindowConstruction"
+              }
+            ]
+          },
+          "window_construction": {
+            "title": "Window Construction",
+            "description": "A WindowConstruction for all apertures with a Surface boundary condition.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/WindowConstruction"
+              }
+            ]
+          },
+          "skylight_construction": {
+            "title": "Skylight Construction",
+            "description": "A WindowConstruction for apertures with a Outdoors boundary condition, False is_operable property, and a RoofCeiling or Floor face type for their parent face.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/WindowConstruction"
+              }
+            ]
+          },
+          "operable_construction": {
+            "title": "Operable Construction",
+            "description": "A WindowConstruction for all apertures with an Outdoors boundary condition and True is_operable property.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/WindowConstruction"
+              }
+            ]
+          }
+        },
+        "additionalProperties": false
+      },
+      "DoorConstructionSet": {
+        "title": "DoorConstructionSet",
+        "description": "A set of constructions for door assemblies.",
+        "type": "object",
+        "properties": {
+          "type": {
+            "title": "Type",
+            "default": "DoorConstructionSet",
+            "pattern": "^DoorConstructionSet$",
+            "type": "string",
+            "readOnly": true
+          },
+          "interior_construction": {
+            "title": "Interior Construction",
+            "description": "An OpaqueConstruction for all opaque doors with a Surface boundary condition.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/OpaqueConstruction"
+              }
+            ]
+          },
+          "exterior_construction": {
+            "title": "Exterior Construction",
+            "description": "An OpaqueConstruction for opaque doors with an Outdoors boundary condition and a Wall face type for their parent face.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/OpaqueConstruction"
+              }
+            ]
+          },
+          "overhead_construction": {
+            "title": "Overhead Construction",
+            "description": "An OpaqueConstruction for opaque doors with an Outdoors boundary condition and a RoofCeiling or Floor type for their parent face.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/OpaqueConstruction"
+              }
+            ]
+          },
+          "exterior_glass_construction": {
+            "title": "Exterior Glass Construction",
+            "description": "A WindowConstruction for all glass doors with an Outdoors boundary condition.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/WindowConstruction"
+              }
+            ]
+          },
+          "interior_glass_construction": {
+            "title": "Interior Glass Construction",
+            "description": "A WindowConstruction for all glass doors with a Surface boundary condition.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/WindowConstruction"
+              }
+            ]
+          }
+        },
+        "additionalProperties": false
+      },
+      "ShadeConstruction": {
+        "title": "ShadeConstruction",
+        "description": "Construction for Shade objects.",
         "type": "object",
         "properties": {
           "identifier": {
@@ -3219,379 +3804,294 @@
           },
           "type": {
             "title": "Type",
-            "default": "EnergyWindowMaterialBlind",
-            "pattern": "^EnergyWindowMaterialBlind$",
+            "default": "ShadeConstruction",
+            "pattern": "^ShadeConstruction$",
             "type": "string",
             "readOnly": true
           },
-          "slat_orientation": {
-            "title": "Slat Orientation",
-            "default": "Horizontal",
-            "enum": [
-              "Horizontal",
-              "Vertical"
-            ],
-            "type": "string"
-          },
-          "slat_width": {
-            "title": "Slat Width",
-            "description": "The width of slat measured from edge to edge in meters.",
-            "default": 0.025,
-            "exclusiveMinimum": 0,
+          "solar_reflectance": {
+            "title": "Solar Reflectance",
+            "description": "A number for the solar reflectance of the construction.",
+            "default": 0.2,
+            "minimum": 0,
             "maximum": 1,
             "type": "number",
             "format": "double"
           },
-          "slat_separation": {
-            "title": "Slat Separation",
-            "description": "The distance between the front of a slat and the back of the adjacent slat in meters.",
-            "default": 0.01875,
-            "exclusiveMinimum": 0,
+          "visible_reflectance": {
+            "title": "Visible Reflectance",
+            "description": "A number for the visible reflectance of the construction.",
+            "default": 0.2,
+            "minimum": 0,
             "maximum": 1,
             "type": "number",
             "format": "double"
           },
-          "slat_thickness": {
-            "title": "Slat Thickness",
-            "description": "The distance between the faces of a slat in meters. The default value is 0.001.",
-            "default": 0.001,
-            "exclusiveMinimum": 0,
-            "maximum": 0.1,
-            "type": "number",
-            "format": "double"
-          },
-          "slat_angle": {
-            "title": "Slat Angle",
-            "description": "The angle (degrees) between the glazing outward normal and the slat outward normal where the outward normal points away from the front face of the slat (degrees). The default value is 45.",
-            "default": 45,
-            "minimum": 0,
-            "maximum": 180,
-            "type": "number",
-            "format": "double"
+          "is_specular": {
+            "title": "Is Specular",
+            "description": "Boolean to note whether the reflection off the shade is diffuse (False) or specular (True). Set to True if the construction is representing a glass facade or a mirror material.",
+            "default": false,
+            "type": "boolean"
+          }
+        },
+        "required": [
+          "identifier"
+        ],
+        "additionalProperties": false
+      },
+      "ScheduleDay": {
+        "title": "ScheduleDay",
+        "description": "Used to describe the daily schedule for a single simulation day.",
+        "type": "object",
+        "properties": {
+          "identifier": {
+            "title": "Identifier",
+            "description": "Text string for a unique object ID. This identifier remains constant as the object is mutated, copied, and serialized to different formats (eg. dict, idf, osm). This identifier is also used to reference the object across a Model. It must be < 100 characters, use only ASCII characters and exclude (, ; ! \\n \\t).",
+            "maxLength": 100,
+            "minLength": 1,
+            "type": "string"
           },
-          "slat_conductivity": {
-            "title": "Slat Conductivity",
-            "description": "The thermal conductivity of the slat in W/(m-K). Default value is 221.",
-            "default": 221,
-            "exclusiveMinimum": 0,
-            "type": "number",
-            "format": "double"
+          "values": {
+            "title": "Values",
+            "description": "A list of floats or integers for the values of the schedule. The length of this list must match the length of the times list.",
+            "type": "array",
+            "items": {
+              "type": "number",
+              "format": "double"
+            }
           },
-          "beam_solar_transmittance": {
-            "title": "Beam Solar Transmittance",
-            "description": "The beam solar transmittance of the slat, assumed to be independent of angle of incidence on the slat. Any transmitted beam radiation is assumed to be 100% diffuse (i.e., slats are translucent). The default value is 0.",
-            "default": 0,
-            "exclusiveMaximum": 1,
-            "minimum": 0,
-            "type": "number",
-            "format": "double"
+          "display_name": {
+            "title": "Display Name",
+            "description": "Display name of the object with no character restrictions.",
+            "type": "string"
           },
-          "beam_solar_reflectance": {
-            "title": "Beam Solar Reflectance",
-            "description": "The beam solar reflectance of the front side of the slat, it is assumed to be independent of the angle of incidence. Default value is 0.5.",
-            "default": 0.5,
-            "exclusiveMaximum": 1,
-            "minimum": 0,
-            "type": "number",
-            "format": "double"
-          },
-          "beam_solar_reflectance_back": {
-            "title": "Beam Solar Reflectance Back",
-            "description": "The beam solar reflectance of the back side of the slat, it is assumed to be independent of the angle of incidence. Default value is 0.5.",
-            "default": 0.5,
-            "exclusiveMaximum": 1,
-            "minimum": 0,
-            "type": "number",
-            "format": "double"
-          },
-          "diffuse_solar_transmittance": {
-            "title": "Diffuse Solar Transmittance",
-            "description": "The slat transmittance for hemisperically diffuse solar radiation. Default value is 0.",
-            "default": 0,
-            "exclusiveMaximum": 1,
-            "minimum": 0,
-            "type": "number",
-            "format": "double"
-          },
-          "diffuse_solar_reflectance": {
-            "title": "Diffuse Solar Reflectance",
-            "description": "The front-side slat reflectance for hemispherically diffuse solar radiation. Default value is 0.5.",
-            "default": 0.5,
-            "exclusiveMaximum": 1,
-            "minimum": 0,
-            "type": "number",
-            "format": "double"
-          },
-          "diffuse_solar_reflectance_back": {
-            "title": "Diffuse Solar Reflectance Back",
-            "description": "The back-side slat reflectance for hemispherically diffuse solar radiation. Default value is 0.5.",
-            "default": 0.5,
-            "exclusiveMaximum": 1,
-            "minimum": 0,
-            "type": "number",
-            "format": "double"
-          },
-          "beam_visible_transmittance": {
-            "title": "Beam Visible Transmittance",
-            "description": "The beam visible transmittance of the slat, it is assumed to be independent of the angle of incidence. Default value is 0.",
-            "default": 0,
-            "exclusiveMaximum": 1,
-            "minimum": 0,
-            "type": "number",
-            "format": "double"
-          },
-          "beam_visible_reflectance": {
-            "title": "Beam Visible Reflectance",
-            "description": "The beam visible reflectance on the front side of the slat, it is assumed to be independent of the angle of incidence. Default value is 0.5.",
-            "default": 0.5,
-            "exclusiveMaximum": 1,
-            "minimum": 0,
-            "type": "number",
-            "format": "double"
-          },
-          "beam_visible_reflectance_back": {
-            "title": "Beam Visible Reflectance Back",
-            "description": "The beam visible reflectance on the back side of the slat, it is assumed to be independent of the angle of incidence. Default value is 0.5.",
-            "default": 0.5,
-            "exclusiveMaximum": 1,
-            "minimum": 0,
-            "type": "number",
-            "format": "double"
-          },
-          "diffuse_visible_transmittance": {
-            "title": "Diffuse Visible Transmittance",
-            "description": "The slat transmittance for hemispherically diffuse visible radiation. This value should equal \u201cSlat Beam Visible Transmittance.\u201d",
-            "default": 0,
-            "exclusiveMaximum": 1,
-            "minimum": 0,
-            "type": "number",
-            "format": "double"
-          },
-          "diffuse_visible_reflectance": {
-            "title": "Diffuse Visible Reflectance",
-            "description": "The front-side slat reflectance for hemispherically diffuse visible radiation. This value should equal \u201cFront Side Slat Beam Visible Reflectance.\u201d Default value is 0.5.",
-            "default": 0.5,
-            "exclusiveMaximum": 1,
-            "minimum": 0,
-            "type": "number",
-            "format": "double"
-          },
-          "diffuse_visible_reflectance_back": {
-            "title": "Diffuse Visible Reflectance Back",
-            "description": "The back-side slat reflectance for hemispherically diffuse visible radiation. This value should equal \u201cBack Side Slat Beam Visible Reflectance. Default value is 0.5.\u201d",
-            "default": 0.5,
-            "exclusiveMaximum": 1,
-            "minimum": 0,
-            "type": "number",
-            "format": "double"
-          },
-          "infrared_transmittance": {
-            "title": "Infrared Transmittance",
-            "description": "The slat infrared hemispherical transmittance. It is zero for solid metallic, wooden or glass slats, but may be non-zero in some cases such as for thin plastic slats. The default value is 0.",
-            "default": 0,
-            "exclusiveMaximum": 1,
-            "minimum": 0,
-            "type": "number",
-            "format": "double"
-          },
-          "emissivity": {
-            "title": "Emissivity",
-            "description": "Front side hemispherical emissivity of the slat. Default is 0.9 for most materials. The default value is 0.9.",
-            "default": 0.9,
-            "exclusiveMaximum": 1,
-            "minimum": 0,
-            "type": "number",
-            "format": "double"
-          },
-          "emissivity_back": {
-            "title": "Emissivity Back",
-            "description": "Back side hemispherical emissivity of the slat. Default is 0.9 for most materials. The default value is 0.9.",
-            "default": 0.9,
-            "exclusiveMaximum": 1,
-            "minimum": 0,
-            "type": "number",
-            "format": "double"
-          },
-          "distance_to_glass": {
-            "title": "Distance To Glass",
-            "description": "The distance from the mid-plane of the blind to the adjacent glass in meters. The default value is 0.05.",
-            "default": 0.05,
-            "minimum": 0.01,
-            "maximum": 1,
-            "type": "number",
-            "format": "double"
-          },
-          "top_opening_multiplier": {
-            "title": "Top Opening Multiplier",
-            "description": "The effective area for air flow at the top of the shade, divided by the horizontal area between glass and shade. The default value is 0.5",
-            "default": 0.5,
-            "minimum": 0,
-            "maximum": 1,
-            "type": "number",
-            "format": "double"
-          },
-          "bottom_opening_multiplier": {
-            "title": "Bottom Opening Multiplier",
-            "description": "The effective area for air flow at the bottom of the shade, divided by the horizontal area between glass and shade. The default value is 0.",
-            "default": 0.5,
-            "minimum": 0,
-            "maximum": 1,
-            "type": "number",
-            "format": "double"
+          "type": {
+            "title": "Type",
+            "default": "ScheduleDay",
+            "pattern": "^ScheduleDay$",
+            "type": "string",
+            "readOnly": true
           },
-          "left_opening_multiplier": {
-            "title": "Left Opening Multiplier",
-            "description": "The effective area for air flow at the left side of the shade, divided by the vertical area between glass and shade. The default value is 0.5.",
-            "default": 0.5,
-            "minimum": 0,
-            "maximum": 1,
-            "type": "number",
-            "format": "double"
+          "times": {
+            "title": "Times",
+            "description": "A list of lists with each sub-list possesing 2 values for [hour, minute]. The length of the master list must match the length of the values list. Each time in the master list represents the time of day that the corresponding value begins to take effect. For example [(0,0), (9,0), (17,0)] in combination with the values [0, 1, 0] denotes a schedule value of 0 from 0:00 to 9:00, a value of 1 from 9:00 to 17:00 and 0 from 17:00 to the end of the day. Note that this representation of times as the \"time of beginning\" is a different convention than EnergyPlus, which uses \"time until\".",
+            "default": [
+              0,
+              0
+            ],
+            "minItems": 2,
+            "maxItems": 2,
+            "type": "array",
+            "items": {
+              "type": "array",
+              "items": {
+                "type": "integer",
+                "format": "int32"
+              },
+              "minItems": 2,
+              "maxItems": 2
+            }
           },
-          "right_opening_multiplier": {
-            "title": "Right Opening Multiplier",
-            "description": "The effective area for air flow at the right side of the shade, divided by the vertical area between glass and shade. The default value is 0.5.",
-            "default": 0.5,
-            "minimum": 0,
-            "maximum": 1,
-            "type": "number",
-            "format": "double"
+          "interpolate": {
+            "title": "Interpolate",
+            "description": "Boolean to note whether values in between times should be linearly interpolated or whether successive values should take effect immediately upon the beginning time corresponding to them.",
+            "default": false,
+            "type": "boolean"
           }
         },
         "required": [
-          "identifier"
+          "identifier",
+          "values"
         ],
         "additionalProperties": false
       },
-      "EnergyWindowMaterialGlazing": {
-        "title": "EnergyWindowMaterialGlazing",
-        "description": "Describe a single glass pane corresponding to a layer in a window construction.",
+      "ScheduleRuleAbridged": {
+        "title": "ScheduleRuleAbridged",
+        "description": "Schedule rule including a ScheduleDay and when it should be applied..",
         "type": "object",
         "properties": {
-          "identifier": {
-            "title": "Identifier",
-            "description": "Text string for a unique object ID. This identifier remains constant as the object is mutated, copied, and serialized to different formats (eg. dict, idf, osm). This identifier is also used to reference the object across a Model. It must be < 100 characters, use only ASCII characters and exclude (, ; ! \\n \\t).",
+          "schedule_day": {
+            "title": "Schedule Day",
+            "description": "The identifier of a ScheduleDay object associated with this rule.",
             "maxLength": 100,
             "minLength": 1,
             "type": "string"
           },
-          "display_name": {
-            "title": "Display Name",
-            "description": "Display name of the object with no character restrictions.",
-            "type": "string"
-          },
           "type": {
             "title": "Type",
-            "default": "EnergyWindowMaterialGlazing",
-            "pattern": "^EnergyWindowMaterialGlazing$",
+            "default": "ScheduleRuleAbridged",
+            "pattern": "^ScheduleRuleAbridged$",
             "type": "string",
             "readOnly": true
           },
-          "thickness": {
-            "title": "Thickness",
-            "description": "The surface-to-surface of the glass in meters. Default value is 0.003.",
-            "default": 0.003,
-            "exclusiveMinimum": 0,
-            "type": "number",
-            "format": "double"
+          "apply_sunday": {
+            "title": "Apply Sunday",
+            "description": "Boolean noting whether to apply schedule_day on Sundays.",
+            "default": false,
+            "type": "boolean"
           },
-          "solar_transmittance": {
-            "title": "Solar Transmittance",
-            "description": "Transmittance of solar radiation through the glass at normal incidence. Default value is 0.85 for clear glass.",
-            "default": 0.85,
-            "minimum": 0,
-            "maximum": 1,
-            "type": "number",
-            "format": "double"
+          "apply_monday": {
+            "title": "Apply Monday",
+            "description": "Boolean noting whether to apply schedule_day on Mondays.",
+            "default": false,
+            "type": "boolean"
           },
-          "solar_reflectance": {
-            "title": "Solar Reflectance",
-            "description": "Reflectance of solar radiation off of the front side of the glass at normal incidence, averaged over the solar spectrum. Default value is 0.075 for clear glass.",
-            "default": 0.075,
-            "minimum": 0,
-            "maximum": 1,
-            "type": "number",
-            "format": "double"
+          "apply_tuesday": {
+            "title": "Apply Tuesday",
+            "description": "Boolean noting whether to apply schedule_day on Tuesdays.",
+            "default": false,
+            "type": "boolean"
           },
-          "solar_reflectance_back": {
-            "title": "Solar Reflectance Back",
-            "description": "Reflectance of solar radiation off of the back side of the glass at normal incidence, averaged over the solar spectrum.",
-            "type": "number",
-            "format": "double"
+          "apply_wednesday": {
+            "title": "Apply Wednesday",
+            "description": "Boolean noting whether to apply schedule_day on Wednesdays.",
+            "default": false,
+            "type": "boolean"
           },
-          "visible_transmittance": {
-            "title": "Visible Transmittance",
-            "description": "Transmittance of visible light through the glass at normal incidence. Default value is 0.9 for clear glass.",
-            "default": 0.9,
-            "minimum": 0,
-            "maximum": 1,
-            "type": "number",
-            "format": "double"
+          "apply_thursday": {
+            "title": "Apply Thursday",
+            "description": "Boolean noting whether to apply schedule_day on Thursdays.",
+            "default": false,
+            "type": "boolean"
           },
-          "visible_reflectance": {
-            "title": "Visible Reflectance",
-            "description": "Reflectance of visible light off of the front side of the glass at normal incidence. Default value is 0.075 for clear glass.",
-            "default": 0.075,
-            "minimum": 0,
-            "maximum": 1,
-            "type": "number",
-            "format": "double"
+          "apply_friday": {
+            "title": "Apply Friday",
+            "description": "Boolean noting whether to apply schedule_day on Fridays.",
+            "default": false,
+            "type": "boolean"
           },
-          "visible_reflectance_back": {
-            "title": "Visible Reflectance Back",
-            "description": "Reflectance of visible light off of the back side of the glass at normal incidence averaged over the solar spectrum and weighted by the response of the human eye.",
-            "minimum": 0,
-            "maximum": 1,
-            "type": "number",
-            "format": "double"
+          "apply_saturday": {
+            "title": "Apply Saturday",
+            "description": "Boolean noting whether to apply schedule_day on Saturdays.",
+            "default": false,
+            "type": "boolean"
           },
-          "infrared_transmittance": {
-            "title": "Infrared Transmittance",
-            "description": "Long-wave transmittance at normal incidence.",
-            "default": 0,
-            "minimum": 0,
-            "maximum": 1,
-            "type": "number",
-            "format": "double"
+          "start_date": {
+            "title": "Start Date",
+            "description": "A list of two integers for [month, day], representing the start date of the period over which the schedule_day will be applied.A third integer may be added to denote whether the date should be re-serialized for a leap year (it should be a 1 in this case).",
+            "default": [
+              1,
+              1
+            ],
+            "type": "array",
+            "items": {
+              "type": "integer",
+              "format": "int32"
+            },
+            "minItems": 2,
+            "maxItems": 3
+          },
+          "end_date": {
+            "title": "End Date",
+            "description": "A list of two integers for [month, day], representing the end date of the period over which the schedule_day will be applied.A third integer may be added to denote whether the date should be re-serialized for a leap year (it should be a 1 in this case).",
+            "default": [
+              12,
+              31
+            ],
+            "type": "array",
+            "items": {
+              "type": "integer",
+              "format": "int32"
+            },
+            "minItems": 2,
+            "maxItems": 3
+          }
+        },
+        "required": [
+          "schedule_day"
+        ],
+        "additionalProperties": false
+      },
+      "NoLimit": {
+        "title": "NoLimit",
+        "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": {
+          "type": {
+            "title": "Type",
+            "default": "NoLimit",
+            "pattern": "^NoLimit$",
+            "type": "string",
+            "readOnly": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "ScheduleTypeLimit": {
+        "title": "ScheduleTypeLimit",
+        "description": "Specifies the data types and limits for values contained in schedules.",
+        "type": "object",
+        "properties": {
+          "identifier": {
+            "title": "Identifier",
+            "description": "Text string for a unique object ID. This identifier remains constant as the object is mutated, copied, and serialized to different formats (eg. dict, idf, osm). This identifier is also used to reference the object across a Model. It must be < 100 characters, use only ASCII characters and exclude (, ; ! \\n \\t).",
+            "maxLength": 100,
+            "minLength": 1,
+            "type": "string"
           },
-          "emissivity": {
-            "title": "Emissivity",
-            "description": "Infrared hemispherical emissivity of the front (outward facing) side of the glass.  Default value is 0.84, which is typical for clear glass without a low-e coating.",
-            "default": 0.84,
-            "minimum": 0,
-            "maximum": 1,
-            "type": "number",
-            "format": "double"
+          "display_name": {
+            "title": "Display Name",
+            "description": "Display name of the object with no character restrictions.",
+            "type": "string"
           },
-          "emissivity_back": {
-            "title": "Emissivity Back",
-            "description": "Infrared hemispherical emissivity of the back (inward facing) side of the glass.  Default value is 0.84, which is typical for clear glass without a low-e coating.",
-            "default": 0.84,
-            "minimum": 0,
-            "maximum": 1,
-            "type": "number",
-            "format": "double"
+          "type": {
+            "title": "Type",
+            "default": "ScheduleTypeLimit",
+            "pattern": "^ScheduleTypeLimit$",
+            "type": "string",
+            "readOnly": true
           },
-          "conductivity": {
-            "title": "Conductivity",
-            "description": "Thermal conductivity of the glass in W/(m-K). Default value is 0.9, which is  typical for clear glass without a low-e coating.",
-            "default": 0.9,
-            "exclusiveMinimum": 0,
-            "type": "number",
-            "format": "double"
+          "lower_limit": {
+            "title": "Lower Limit",
+            "description": "Lower limit for the schedule type or NoLimit.",
+            "default": {
+              "type": "NoLimit"
+            },
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/NoLimit"
+              },
+              {
+                "type": "number",
+                "format": "double"
+              }
+            ]
           },
-          "dirt_correction": {
-            "title": "Dirt Correction",
-            "description": "Factor that corrects for the presence of dirt on the glass. A default value of 1 indicates the glass is clean.",
-            "default": 1,
-            "type": "number",
-            "format": "double"
+          "upper_limit": {
+            "title": "Upper Limit",
+            "description": "Upper limit for the schedule type or NoLimit.",
+            "default": {
+              "type": "NoLimit"
+            },
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/NoLimit"
+              },
+              {
+                "type": "number",
+                "format": "double"
+              }
+            ]
           },
-          "solar_diffusing": {
-            "title": "Solar Diffusing",
-            "description": "Takes values True and False. If False (default), the beam solar radiation incident on the glass is transmitted as beam radiation with no diffuse component.If True, the beam  solar radiation incident on the glass is transmitted as hemispherical diffuse radiation with no beam component.",
-            "default": false,
-            "type": "boolean"
+          "numeric_type": {
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/ScheduleNumericType"
+              }
+            ],
+            "title": "Numeric Type",
+            "default": "Continuous",
+            "type": "string"
+          },
+          "unit_type": {
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/ScheduleUnitType"
+              }
+            ],
+            "title": "Unit Type",
+            "default": "Dimensionless",
+            "type": "string"
           }
         },
         "required": [
@@ -3599,9 +4099,9 @@
         ],
         "additionalProperties": false
       },
-      "EnergyWindowMaterialShade": {
-        "title": "EnergyWindowMaterialShade",
-        "description": "This object specifies the properties of window shade materials.",
+      "ScheduleRuleset": {
+        "title": "ScheduleRuleset",
+        "description": "Used to define a schedule for a default day, further described by ScheduleRule.",
         "type": "object",
         "properties": {
           "identifier": {
@@ -3611,6 +4111,21 @@
             "minLength": 1,
             "type": "string"
           },
+          "day_schedules": {
+            "title": "Day Schedules",
+            "description": "A list of ScheduleDays that are referenced in the other keys of this ScheduleRulesetAbridged.",
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/ScheduleDay"
+            }
+          },
+          "default_day_schedule": {
+            "title": "Default Day Schedule",
+            "description": "An identifier for the ScheduleDay that will be used for all days when no ScheduleRule is applied. This ScheduleDay must be in the day_schedules.",
+            "maxLength": 100,
+            "minLength": 1,
+            "type": "string"
+          },
           "display_name": {
             "title": "Display Name",
             "description": "Display name of the object with no character restrictions.",
@@ -3618,144 +4133,146 @@
           },
           "type": {
             "title": "Type",
-            "default": "EnergyWindowMaterialShade",
-            "pattern": "^EnergyWindowMaterialShade$",
+            "default": "ScheduleRuleset",
+            "pattern": "^ScheduleRuleset$",
             "type": "string",
             "readOnly": true
           },
-          "solar_transmittance": {
-            "title": "Solar Transmittance",
-            "description": "The transmittance averaged over the solar spectrum. It is assumed independent of incidence angle. Default value is 0.4.",
-            "default": 0.4,
-            "exclusiveMaximum": 1,
-            "minimum": 0,
-            "type": "number",
-            "format": "double"
-          },
-          "solar_reflectance": {
-            "title": "Solar Reflectance",
-            "description": "The reflectance averaged over the solar spectrum. It us assumed same on both sides of shade and independent of incidence angle. Default value is 0.5",
-            "default": 0.5,
-            "exclusiveMaximum": 1,
-            "minimum": 0,
-            "type": "number",
-            "format": "double"
-          },
-          "visible_transmittance": {
-            "title": "Visible Transmittance",
-            "description": "The transmittance averaged over the solar spectrum and weighted by the response of the human eye. It is assumed independent of incidence angle. Default value is 0.4.",
-            "default": 0.4,
-            "exclusiveMaximum": 1,
-            "minimum": 0,
-            "type": "number",
-            "format": "double"
+          "schedule_rules": {
+            "title": "Schedule Rules",
+            "description": "A list of ScheduleRuleAbridged that note exceptions to the default_day_schedule. These rules should be ordered from highest to lowest priority.",
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/ScheduleRuleAbridged"
+            }
           },
-          "visible_reflectance": {
-            "title": "Visible Reflectance",
-            "description": "The transmittance averaged over the solar spectrum and weighted by the response of the human eye. It is assumed independent of incidence angle. Default value is 0.4",
-            "default": 0.4,
-            "exclusiveMaximum": 1,
-            "minimum": 0,
-            "type": "number",
-            "format": "double"
+          "holiday_schedule": {
+            "title": "Holiday Schedule",
+            "description": "An identifier for the ScheduleDay that will be used for holidays. This ScheduleDay must be in the day_schedules.",
+            "maxLength": 100,
+            "minLength": 1,
+            "type": "string"
           },
-          "emissivity": {
-            "title": "Emissivity",
-            "description": "The effective long-wave infrared hemispherical emissivity. It is assumed same on both sides of shade. Default value is 0.9.",
-            "default": 0.9,
-            "exclusiveMinimum": 0,
-            "exclusiveMaximum": 1,
-            "type": "number",
-            "format": "double"
+          "summer_designday_schedule": {
+            "title": "Summer Designday Schedule",
+            "description": "An identifier for the ScheduleDay that will be used for the summer design day. This ScheduleDay must be in the day_schedules.",
+            "maxLength": 100,
+            "minLength": 1,
+            "type": "string"
           },
-          "infrared_transmittance": {
-            "title": "Infrared Transmittance",
-            "description": "The effective long-wave transmittance. It is assumed independent of incidence angle. Default value is 0.",
-            "default": 0,
-            "exclusiveMaximum": 1,
-            "minimum": 0,
-            "type": "number",
-            "format": "double"
+          "winter_designday_schedule": {
+            "title": "Winter Designday Schedule",
+            "description": "An identifier for the ScheduleDay that will be used for the winter design day. This ScheduleDay must be in the day_schedules.",
+            "maxLength": 100,
+            "minLength": 1,
+            "type": "string"
           },
-          "thickness": {
-            "title": "Thickness",
-            "description": "The thickness of the shade material in meters. Default value is 0.005.",
-            "default": 0.005,
-            "exclusiveMinimum": 0,
-            "type": "number",
-            "format": "double"
+          "schedule_type_limit": {
+            "title": "Schedule Type Limit",
+            "description": "ScheduleTypeLimit object that will be used to validate schedule values against upper/lower limits and assign units to the schedule values. If None, no validation will occur.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/ScheduleTypeLimit"
+              }
+            ]
+          }
+        },
+        "required": [
+          "identifier",
+          "day_schedules",
+          "default_day_schedule"
+        ],
+        "additionalProperties": false
+      },
+      "ScheduleFixedInterval": {
+        "title": "ScheduleFixedInterval",
+        "description": "Used to specify a start date and a list of values for a period of analysis.",
+        "type": "object",
+        "properties": {
+          "identifier": {
+            "title": "Identifier",
+            "description": "Text string for a unique object ID. This identifier remains constant as the object is mutated, copied, and serialized to different formats (eg. dict, idf, osm). This identifier is also used to reference the object across a Model. It must be < 100 characters, use only ASCII characters and exclude (, ; ! \\n \\t).",
+            "maxLength": 100,
+            "minLength": 1,
+            "type": "string"
           },
-          "conductivity": {
-            "title": "Conductivity",
-            "description": "The conductivity of the shade material in W/(m-K). Default value is 0.1.",
-            "default": 0.1,
-            "exclusiveMinimum": 0,
-            "type": "number",
-            "format": "double"
+          "values": {
+            "title": "Values",
+            "description": "A list of timeseries values occuring at each timestep over the course of the simulation.",
+            "type": "array",
+            "items": {
+              "type": "number",
+              "format": "double"
+            },
+            "minItems": 24,
+            "maxItems": 527040
           },
-          "distance_to_glass": {
-            "title": "Distance To Glass",
-            "description": "The distance from shade to adjacent glass in meters. Default value is 0.05",
-            "default": 0.05,
-            "minimum": 0.001,
-            "maximum": 1,
-            "type": "number",
-            "format": "double"
+          "display_name": {
+            "title": "Display Name",
+            "description": "Display name of the object with no character restrictions.",
+            "type": "string"
           },
-          "top_opening_multiplier": {
-            "title": "Top Opening Multiplier",
-            "description": "The effective area for air flow at the top of the shade, divided by the horizontal area between glass and shade. Default value is 0.5.",
-            "default": 0.5,
-            "minimum": 0,
-            "maximum": 1,
-            "type": "number",
-            "format": "double"
+          "type": {
+            "title": "Type",
+            "default": "ScheduleFixedInterval",
+            "pattern": "^ScheduleFixedInterval$",
+            "type": "string",
+            "readOnly": true
           },
-          "bottom_opening_multiplier": {
-            "title": "Bottom Opening Multiplier",
-            "description": "The effective area for air flow at the bottom of the shade, divided by the horizontal area between glass and shade. Default value is 0.5.",
-            "default": 0.5,
-            "minimum": 0,
-            "maximum": 1,
-            "type": "number",
-            "format": "double"
+          "schedule_type_limit": {
+            "title": "Schedule Type Limit",
+            "description": "ScheduleTypeLimit object that will be used to validate schedule values against upper/lower limits and assign units to the schedule values. If None, no validation will occur.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/ScheduleTypeLimit"
+              }
+            ]
           },
-          "left_opening_multiplier": {
-            "title": "Left Opening Multiplier",
-            "description": "The effective area for air flow at the left side of the shade, divided by the vertical area between glass and shade. Default value is 0.5.",
-            "default": 0.5,
-            "minimum": 0,
-            "maximum": 1,
-            "type": "number",
-            "format": "double"
+          "timestep": {
+            "title": "Timestep",
+            "description": "An integer for the number of steps per hour that the input values correspond to.  For example, if each value represents 30 minutes, the timestep is 2. For 15 minutes, it is 4.",
+            "default": 1,
+            "type": "integer",
+            "format": "int32"
           },
-          "right_opening_multiplier": {
-            "title": "Right Opening Multiplier",
-            "description": "The effective area for air flow at the right side of the shade, divided by the vertical area between glass and shade. Default value is 0.5.",
-            "default": 0.5,
-            "minimum": 0,
-            "maximum": 1,
-            "type": "number",
-            "format": "double"
+          "start_date": {
+            "title": "Start Date",
+            "description": "A list of two integers for [month, day], representing the start date when the schedule values begin to take effect.A third integer may be added to denote whether the date should be re-serialized for a leap year (it should be a 1 in this case).",
+            "default": [
+              1,
+              1
+            ],
+            "type": "array",
+            "items": {
+              "type": "integer",
+              "format": "int32"
+            },
+            "minItems": 2,
+            "maxItems": 3
           },
-          "airflow_permeability": {
-            "title": "Airflow Permeability",
-            "description": "The fraction of the shade surface that is open to air flow. If air cannot pass through the shade material, airflow_permeability = 0. Default value is 0.",
+          "placeholder_value": {
+            "title": "Placeholder Value",
+            "description": " A value that will be used for all times not covered by the input values. Typically, your simulation should not need to use this value if the input values completely cover the simulation period.",
             "default": 0,
-            "minimum": 0,
-            "maximum": 0.8,
             "type": "number",
             "format": "double"
+          },
+          "interpolate": {
+            "title": "Interpolate",
+            "description": "Boolean to note whether values in between intervals should be linearly interpolated or whether successive values should take effect immediately upon the beginning time corresponding to them.",
+            "default": false,
+            "type": "boolean"
           }
         },
         "required": [
-          "identifier"
+          "identifier",
+          "values"
         ],
         "additionalProperties": false
       },
-      "WindowConstruction": {
-        "title": "WindowConstruction",
-        "description": "Construction for window objects (Aperture, Door).",
+      "AirBoundaryConstruction": {
+        "title": "AirBoundaryConstruction",
+        "description": "Construction for Air Boundary objects.",
         "type": "object",
         "properties": {
           "identifier": {
@@ -3765,51 +4282,17 @@
             "minLength": 1,
             "type": "string"
           },
-          "layers": {
-            "title": "Layers",
-            "description": "List of strings for material identifiers. The order of the materials is from exterior to interior.",
-            "minLength": 1,
-            "maxLength": 100,
-            "type": "array",
-            "items": {
-              "type": "string",
-              "minLength": 1,
-              "maxLength": 100
-            },
-            "minItems": 1,
-            "maxItems": 8
-          },
-          "materials": {
-            "title": "Materials",
-            "description": "List of materials. The order of the materials is from outside to inside.",
-            "type": "array",
-            "items": {
-              "anyOf": [
-                {
-                  "$ref": "#/components/schemas/EnergyWindowMaterialGas"
-                },
-                {
-                  "$ref": "#/components/schemas/EnergyWindowMaterialGasCustom"
-                },
-                {
-                  "$ref": "#/components/schemas/EnergyWindowMaterialGasMixture"
-                },
-                {
-                  "$ref": "#/components/schemas/EnergyWindowMaterialSimpleGlazSys"
-                },
-                {
-                  "$ref": "#/components/schemas/EnergyWindowMaterialBlind"
-                },
-                {
-                  "$ref": "#/components/schemas/EnergyWindowMaterialGlazing"
-                },
-                {
-                  "$ref": "#/components/schemas/EnergyWindowMaterialShade"
-                }
-              ]
-            },
-            "minItems": 1,
-            "maxItems": 8
+          "air_mixing_schedule": {
+            "title": "Air Mixing Schedule",
+            "description": "A fractional schedule as a ScheduleRuleset or ScheduleFixedInterval for the air mixing schedule across the construction.",
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/ScheduleRuleset"
+              },
+              {
+                "$ref": "#/components/schemas/ScheduleFixedInterval"
+              }
+            ]
           },
           "display_name": {
             "title": "Display Name",
@@ -3818,133 +4301,122 @@
           },
           "type": {
             "title": "Type",
-            "default": "WindowConstruction",
-            "pattern": "^WindowConstruction$",
+            "default": "AirBoundaryConstruction",
+            "pattern": "^AirBoundaryConstruction$",
             "type": "string",
             "readOnly": true
+          },
+          "air_mixing_per_area": {
+            "title": "Air Mixing Per Area",
+            "description": "A positive number for the amount of air mixing between Rooms across the air boundary surface [m3/s-m2]. Default: 0.1 corresponds to average indoor air speeds of 0.1 m/s (roughly 20 fpm), which is typical of what would be induced by a HVAC system.",
+            "default": 0.1,
+            "minimum": 0,
+            "type": "number",
+            "format": "double"
           }
         },
         "required": [
           "identifier",
-          "layers",
-          "materials"
+          "air_mixing_schedule"
         ],
         "additionalProperties": false
       },
-      "ApertureConstructionSet": {
-        "title": "ApertureConstructionSet",
-        "description": "A set of constructions for aperture assemblies.",
+      "ConstructionSet": {
+        "title": "ConstructionSet",
+        "description": "A set of constructions for different surface types and boundary conditions.",
         "type": "object",
         "properties": {
+          "identifier": {
+            "title": "Identifier",
+            "description": "Text string for a unique object ID. This identifier remains constant as the object is mutated, copied, and serialized to different formats (eg. dict, idf, osm). This identifier is also used to reference the object across a Model. It must be < 100 characters, use only ASCII characters and exclude (, ; ! \\n \\t).",
+            "maxLength": 100,
+            "minLength": 1,
+            "type": "string"
+          },
+          "display_name": {
+            "title": "Display Name",
+            "description": "Display name of the object with no character restrictions.",
+            "type": "string"
+          },
           "type": {
             "title": "Type",
-            "default": "ApertureConstructionSet",
-            "pattern": "^ApertureConstructionSet$",
+            "default": "ConstructionSet",
+            "pattern": "^ConstructionSet$",
             "type": "string",
             "readOnly": true
           },
-          "interior_construction": {
-            "title": "Interior Construction",
-            "description": "A WindowConstruction for apertures with an Outdoors boundary condition, False is_operable property, and a Wall face type for their parent face.",
-            "allOf": [
-              {
-                "$ref": "#/components/schemas/WindowConstruction"
-              }
-            ]
-          },
-          "window_construction": {
-            "title": "Window Construction",
-            "description": "A WindowConstruction for all apertures with a Surface boundary condition.",
-            "allOf": [
-              {
-                "$ref": "#/components/schemas/WindowConstruction"
-              }
-            ]
-          },
-          "skylight_construction": {
-            "title": "Skylight Construction",
-            "description": "A WindowConstruction for apertures with a Outdoors boundary condition, False is_operable property, and a RoofCeiling or Floor face type for their parent face.",
+          "wall_set": {
+            "title": "Wall Set",
+            "description": "A WallConstructionSet object for this ConstructionSet.",
             "allOf": [
               {
-                "$ref": "#/components/schemas/WindowConstruction"
+                "$ref": "#/components/schemas/WallConstructionSet"
               }
             ]
           },
-          "operable_construction": {
-            "title": "Operable Construction",
-            "description": "A WindowConstruction for all apertures with an Outdoors boundary condition and True is_operable property..",
+          "floor_set": {
+            "title": "Floor Set",
+            "description": "A FloorConstructionSet object for this ConstructionSet.",
             "allOf": [
               {
-                "$ref": "#/components/schemas/WindowConstruction"
+                "$ref": "#/components/schemas/FloorConstructionSet"
               }
             ]
-          }
-        },
-        "additionalProperties": false
-      },
-      "DoorConstructionSet": {
-        "title": "DoorConstructionSet",
-        "description": "A set of constructions for door assemblies.",
-        "type": "object",
-        "properties": {
-          "type": {
-            "title": "Type",
-            "default": "DoorConstructionSet",
-            "pattern": "^DoorConstructionSet$",
-            "type": "string",
-            "readOnly": true
           },
-          "interior_construction": {
-            "title": "Interior Construction",
-            "description": "An OpaqueConstruction for all opaque doors with a Surface boundary condition.",
+          "roof_ceiling_set": {
+            "title": "Roof Ceiling Set",
+            "description": "A RoofCeilingConstructionSet object for this ConstructionSet.",
             "allOf": [
               {
-                "$ref": "#/components/schemas/OpaqueConstruction"
+                "$ref": "#/components/schemas/RoofCeilingConstructionSet"
               }
             ]
           },
-          "exterior_construction": {
-            "title": "Exterior Construction",
-            "description": "An OpaqueConstruction for opaque doors with an Outdoors boundary condition and a Wall face type for their parent face.",
+          "aperture_set": {
+            "title": "Aperture Set",
+            "description": "A ApertureConstructionSet object for this ConstructionSet.",
             "allOf": [
               {
-                "$ref": "#/components/schemas/OpaqueConstruction"
+                "$ref": "#/components/schemas/ApertureConstructionSet"
               }
             ]
           },
-          "overhead_construction": {
-            "title": "Overhead Construction",
-            "description": "An OpaqueConstruction for opaque doors with an Outdoors boundary condition and a RoofCeiling or Floor type for their parent face.",
+          "door_set": {
+            "title": "Door Set",
+            "description": "A DoorConstructionSet object for this ConstructionSet.",
             "allOf": [
               {
-                "$ref": "#/components/schemas/OpaqueConstruction"
+                "$ref": "#/components/schemas/DoorConstructionSet"
               }
             ]
           },
-          "exterior_glass_construction": {
-            "title": "Exterior Glass Construction",
-            "description": "A WindowConstruction for all glass doors with an Outdoors boundary condition.",
+          "shade_construction": {
+            "title": "Shade Construction",
+            "description": "A ShadeConstruction to set the reflectance properties of all outdoor shades of all objects to which this ConstructionSet is assigned.",
             "allOf": [
               {
-                "$ref": "#/components/schemas/WindowConstruction"
+                "$ref": "#/components/schemas/ShadeConstruction"
               }
             ]
           },
-          "interior_glass_construction": {
-            "title": "Interior Glass Construction",
-            "description": "A WindowConstruction for all glass doors with a Surface boundary condition.",
+          "air_boundary_construction": {
+            "title": "Air Boundary Construction",
+            "description": "An AirBoundaryConstruction to set the properties of Faces with an AirBoundary type.",
             "allOf": [
               {
-                "$ref": "#/components/schemas/WindowConstruction"
+                "$ref": "#/components/schemas/AirBoundaryConstruction"
               }
             ]
           }
         },
+        "required": [
+          "identifier"
+        ],
         "additionalProperties": false
       },
-      "ShadeConstruction": {
-        "title": "ShadeConstruction",
-        "description": "Construction for Shade objects.",
+      "OpaqueConstructionAbridged": {
+        "title": "OpaqueConstructionAbridged",
+        "description": "Construction for opaque objects (Face, Shade, Door).",
         "type": "object",
         "properties": {
           "identifier": {
@@ -3954,6 +4426,20 @@
             "minLength": 1,
             "type": "string"
           },
+          "layers": {
+            "title": "Layers",
+            "description": "List of strings for opaque material identifiers. The order of the materials is from exterior to interior.",
+            "minLength": 1,
+            "maxLength": 100,
+            "type": "array",
+            "items": {
+              "type": "string",
+              "minLength": 1,
+              "maxLength": 100
+            },
+            "minItems": 1,
+            "maxItems": 10
+          },
           "display_name": {
             "title": "Display Name",
             "description": "Display name of the object with no character restrictions.",
@@ -3961,44 +4447,21 @@
           },
           "type": {
             "title": "Type",
-            "default": "ShadeConstruction",
-            "pattern": "^ShadeConstruction$",
+            "default": "OpaqueConstructionAbridged",
+            "pattern": "^OpaqueConstructionAbridged$",
             "type": "string",
             "readOnly": true
-          },
-          "solar_reflectance": {
-            "title": "Solar Reflectance",
-            "description": " A number for the solar reflectance of the construction.",
-            "default": 0.2,
-            "minimum": 0,
-            "maximum": 1,
-            "type": "number",
-            "format": "double"
-          },
-          "visible_reflectance": {
-            "title": "Visible Reflectance",
-            "description": " A number for the visible reflectance of the construction.",
-            "default": 0.2,
-            "minimum": 0,
-            "maximum": 1,
-            "type": "number",
-            "format": "double"
-          },
-          "is_specular": {
-            "title": "Is Specular",
-            "description": "Boolean to note whether the reflection off the shade is diffuse (False) or specular (True). Set to True if the construction is representing a glass facade or a mirror material.",
-            "default": false,
-            "type": "boolean"
           }
         },
         "required": [
-          "identifier"
+          "identifier",
+          "layers"
         ],
         "additionalProperties": false
       },
-      "ScheduleDay": {
-        "title": "ScheduleDay",
-        "description": "Used to describe the daily schedule for a single simulation day.",
+      "WindowConstructionAbridged": {
+        "title": "WindowConstructionAbridged",
+        "description": "Construction for window objects (Aperture, Door).",
         "type": "object",
         "properties": {
           "identifier": {
@@ -4008,14 +4471,19 @@
             "minLength": 1,
             "type": "string"
           },
-          "values": {
-            "title": "Values",
-            "description": "A list of floats or integers for the values of the schedule. The length of this list must match the length of the times list.",
+          "layers": {
+            "title": "Layers",
+            "description": "List of strings for glazing or gas material identifiers. The order of the materials is from exterior to interior. 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.",
+            "minLength": 1,
+            "maxLength": 100,
             "type": "array",
             "items": {
-              "type": "number",
-              "format": "double"
-            }
+              "type": "string",
+              "minLength": 1,
+              "maxLength": 100
+            },
+            "minItems": 1,
+            "maxItems": 8
           },
           "display_name": {
             "title": "Display Name",
@@ -4024,159 +4492,112 @@
           },
           "type": {
             "title": "Type",
-            "default": "ScheduleDay",
-            "pattern": "^ScheduleDay$",
+            "default": "WindowConstructionAbridged",
+            "pattern": "^WindowConstructionAbridged$",
             "type": "string",
             "readOnly": true
-          },
-          "times": {
-            "title": "Times",
-            "description": "A list of lists with each sub-list possesing 2 values for [hour, minute]. The length of the master list must match the length of the values list. Each time in the master list represents the time of day that the corresponding value begins to take effect. For example [(0,0), (9,0), (17,0)] in combination with the values [0, 1, 0] denotes a schedule value of 0 from 0:00 to 9:00, a value of 1 from 9:00 to 17:00 and 0 from 17:00 to the end of the day. Note that this representation of times as the \"time of beginning\" is a different convention than EnergyPlus, which uses \"time until\".",
-            "default": [
-              0,
-              0
-            ],
-            "minItems": 2,
-            "maxItems": 2,
-            "type": "array",
-            "items": {
-              "type": "array",
-              "items": {
-                "type": "integer",
-                "format": "int32"
-              },
-              "minItems": 2,
-              "maxItems": 2
-            }
-          },
-          "interpolate": {
-            "title": "Interpolate",
-            "description": "Boolean to note whether values in between times should be linearly interpolated or whether successive values should take effect immediately upon the beginning time corrsponding to them.",
-            "default": false,
-            "type": "boolean"
           }
         },
         "required": [
           "identifier",
-          "values"
+          "layers"
         ],
         "additionalProperties": false
       },
-      "ScheduleRuleAbridged": {
-        "title": "ScheduleRuleAbridged",
-        "description": "Schedule rule including a ScheduleDay and when it should be applied..",
+      "WindowConstructionShadeAbridged": {
+        "title": "WindowConstructionShadeAbridged",
+        "description": "Construction for window objects with an included shade layer.",
         "type": "object",
         "properties": {
-          "schedule_day": {
-            "title": "Schedule Day",
-            "description": "The identifier of a ScheduleDay object associated with this rule.",
+          "identifier": {
+            "title": "Identifier",
+            "description": "Text string for a unique object ID. This identifier remains constant as the object is mutated, copied, and serialized to different formats (eg. dict, idf, osm). This identifier is also used to reference the object across a Model. It must be < 100 characters, use only ASCII characters and exclude (, ; ! \\n \\t).",
+            "maxLength": 100,
+            "minLength": 1,
+            "type": "string"
+          },
+          "window_construction": {
+            "title": "Window Construction",
+            "description": "A WindowConstructionAbridged object that serves as the \"switched off\" version of the construction (aka. the \"bare construction\"). The shade_material and shade_location will be used to modify this starting construction.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/WindowConstructionAbridged"
+              }
+            ]
+          },
+          "shade_material": {
+            "title": "Shade Material",
+            "description": "Identifier of a An EnergyWindowMaterialShade or an EnergyWindowMaterialBlind that serves as the shading layer for this construction. This can also be an EnergyWindowMaterialGlazing, which will indicate that the WindowConstruction has a dynamically-controlled glass pane like an electrochromic window assembly.",
             "maxLength": 100,
             "minLength": 1,
             "type": "string"
           },
+          "display_name": {
+            "title": "Display Name",
+            "description": "Display name of the object with no character restrictions.",
+            "type": "string"
+          },
           "type": {
             "title": "Type",
-            "default": "ScheduleRuleAbridged",
-            "pattern": "^ScheduleRuleAbridged$",
+            "default": "WindowConstructionShadeAbridged",
+            "pattern": "^WindowConstructionShadeAbridged$",
             "type": "string",
             "readOnly": true
           },
-          "apply_sunday": {
-            "title": "Apply Sunday",
-            "description": "Boolean noting whether to apply schedule_day on Sundays.",
-            "default": false,
-            "type": "boolean"
-          },
-          "apply_monday": {
-            "title": "Apply Monday",
-            "description": "Boolean noting whether to apply schedule_day on Mondays.",
-            "default": false,
-            "type": "boolean"
-          },
-          "apply_tuesday": {
-            "title": "Apply Tuesday",
-            "description": "Boolean noting whether to apply schedule_day on Tuesdays.",
-            "default": false,
-            "type": "boolean"
-          },
-          "apply_wednesday": {
-            "title": "Apply Wednesday",
-            "description": "Boolean noting whether to apply schedule_day on Wednesdays.",
-            "default": false,
-            "type": "boolean"
-          },
-          "apply_thursday": {
-            "title": "Apply Thursday",
-            "description": "Boolean noting whether to apply schedule_day on Thursdays.",
-            "default": false,
-            "type": "boolean"
-          },
-          "apply_friday": {
-            "title": "Apply Friday",
-            "description": "Boolean noting whether to apply schedule_day on Fridays.",
-            "default": false,
-            "type": "boolean"
-          },
-          "apply_saturday": {
-            "title": "Apply Saturday",
-            "description": "Boolean noting whether to apply schedule_day on Saturdays.",
-            "default": false,
-            "type": "boolean"
-          },
-          "start_date": {
-            "title": "Start Date",
-            "description": "A list of two integers for [month, day], representing the start date of the period over which the schedule_day will be applied.A third integer may be added to denote whether the date should be re-serialized for a leap year (it should be a 1 in this case).",
-            "default": [
-              1,
-              1
+          "shade_location": {
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/ShadeLocation"
+              }
             ],
-            "type": "array",
-            "items": {
-              "type": "integer",
-              "format": "int32"
-            },
-            "minItems": 2,
-            "maxItems": 3
+            "title": "Shade Location",
+            "description": "Text to indicate where in the window assembly the shade_material is located.  Note that the WindowConstruction must have at least one gas gap to use the \"Between\" option. Also note that, for a WindowConstruction with more than one gas gap, the \"Between\" option defalts to using the inner gap as this is the only option that EnergyPlus supports.",
+            "default": "Interior",
+            "type": "string"
           },
-          "end_date": {
-            "title": "End Date",
-            "description": "A list of two integers for [month, day], representing the end date of the period over which the schedule_day will be applied.A third integer may be added to denote whether the date should be re-serialized for a leap year (it should be a 1 in this case).",
-            "default": [
-              12,
-              31
+          "control_type": {
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/ControlType"
+              }
             ],
-            "type": "array",
-            "items": {
-              "type": "integer",
-              "format": "int32"
-            },
-            "minItems": 2,
-            "maxItems": 3
+            "title": "Control Type",
+            "description": "Text to indicate how the shading device is controlled, which determines when the shading is \u201con\u201d or \u201coff.\u201d",
+            "default": "AlwaysOn",
+            "type": "string"
+          },
+          "setpoint": {
+            "title": "Setpoint",
+            "description": "A number that corresponds to the specified control_type. This can be a value in (W/m2), (C) or (W) depending upon the control type.Note that this value cannot be None for any control type except \"AlwaysOn.\"",
+            "type": "number",
+            "format": "double"
+          },
+          "schedule": {
+            "title": "Schedule",
+            "description": "An optional schedule identifier to be applied on top of the control_type. If None, the control_type will govern all behavior of the construction.",
+            "maxLength": 100,
+            "minLength": 1,
+            "type": "string",
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/ScheduleRuleset"
+              },
+              {
+                "$ref": "#/components/schemas/ScheduleFixedInterval"
+              }
+            ]
           }
         },
         "required": [
-          "schedule_day"
+          "identifier",
+          "window_construction",
+          "shade_material"
         ],
         "additionalProperties": false
       },
-      "NoLimit": {
-        "title": "NoLimit",
-        "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": {
-          "type": {
-            "title": "Type",
-            "default": "NoLimit",
-            "pattern": "^NoLimit$",
-            "type": "string",
-            "readOnly": true
-          }
-        },
-        "additionalProperties": false
-      },
-      "ScheduleTypeLimit": {
-        "title": "ScheduleTypeLimit",
-        "description": "Specifies the data types and limits for values contained in schedules.",
+      "AirBoundaryConstructionAbridged": {
+        "title": "AirBoundaryConstructionAbridged",
+        "description": "Construction for Air Boundary objects.",
         "type": "object",
         "properties": {
           "identifier": {
@@ -4186,6 +4607,13 @@
             "minLength": 1,
             "type": "string"
           },
+          "air_mixing_schedule": {
+            "title": "Air Mixing Schedule",
+            "description": "Identifier of a fractional schedule for the air mixing schedule across the construction.",
+            "maxLength": 100,
+            "minLength": 1,
+            "type": "string"
+          },
           "display_name": {
             "title": "Display Name",
             "description": "Display name of the object with no character restrictions.",
@@ -4193,82 +4621,29 @@
           },
           "type": {
             "title": "Type",
-            "default": "ScheduleTypeLimit",
-            "pattern": "^ScheduleTypeLimit$",
+            "default": "AirBoundaryConstructionAbridged",
+            "pattern": "^AirBoundaryConstructionAbridged$",
             "type": "string",
             "readOnly": true
           },
-          "lower_limit": {
-            "title": "Lower Limit",
-            "description": "Lower limit for the schedule type or NoLimit.",
-            "default": {
-              "type": "NoLimit"
-            },
-            "anyOf": [
-              {
-                "$ref": "#/components/schemas/NoLimit"
-              },
-              {
-                "type": "number",
-                "format": "double"
-              }
-            ]
-          },
-          "upper_limit": {
-            "title": "Upper Limit",
-            "description": "Upper limit for the schedule type or NoLimit.",
-            "default": {
-              "type": "NoLimit"
-            },
-            "anyOf": [
-              {
-                "$ref": "#/components/schemas/NoLimit"
-              },
-              {
-                "type": "number",
-                "format": "double"
-              }
-            ]
-          },
-          "numeric_type": {
-            "title": "Numeric Type",
-            "default": "Continuous",
-            "enum": [
-              "Continuous",
-              "Discrete"
-            ],
-            "type": "string"
-          },
-          "unit_type": {
-            "title": "Unit Type",
-            "default": "Dimensionless",
-            "enum": [
-              "Dimensionless",
-              "Temperature",
-              "DeltaTemperature",
-              "PrecipitationRate",
-              "Angle",
-              "ConvectionCoefficient",
-              "ActivityLevel",
-              "Velocity",
-              "Capacity",
-              "Power",
-              "Availability",
-              "Percent",
-              "Control",
-              "Mode"
-            ],
-            "type": "string"
+          "air_mixing_per_area": {
+            "title": "Air Mixing Per Area",
+            "description": "A positive number for the amount of air mixing between Rooms across the air boundary surface [m3/s-m2]. Default: 0.1 corresponds to average indoor air speeds of 0.1 m/s (roughly 20 fpm), which is typical of what would be induced by a HVAC system.",
+            "default": 0.1,
+            "minimum": 0,
+            "type": "number",
+            "format": "double"
           }
         },
         "required": [
-          "identifier"
+          "identifier",
+          "air_mixing_schedule"
         ],
         "additionalProperties": false
       },
-      "ScheduleRuleset": {
-        "title": "ScheduleRuleset",
-        "description": "Used to define a schedule for a default day, further described by ScheduleRule.",
+      "EnergyWindowMaterialShade": {
+        "title": "EnergyWindowMaterialShade",
+        "description": "This object specifies the properties of window shade materials.",
         "type": "object",
         "properties": {
           "identifier": {
@@ -4278,21 +4653,6 @@
             "minLength": 1,
             "type": "string"
           },
-          "day_schedules": {
-            "title": "Day Schedules",
-            "description": "A list of ScheduleDays that are referenced in the other keys of this ScheduleRulesetAbridged.",
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/ScheduleDay"
-            }
-          },
-          "default_day_schedule": {
-            "title": "Default Day Schedule",
-            "description": "An identifier for the ScheduleDay that will be used for all days when no ScheduleRule is applied. This ScheduleDay must be in the day_schedules.",
-            "maxLength": 100,
-            "minLength": 1,
-            "type": "string"
-          },
           "display_name": {
             "title": "Display Name",
             "description": "Display name of the object with no character restrictions.",
@@ -4300,60 +4660,144 @@
           },
           "type": {
             "title": "Type",
-            "default": "ScheduleRuleset",
-            "pattern": "^ScheduleRuleset$",
+            "default": "EnergyWindowMaterialShade",
+            "pattern": "^EnergyWindowMaterialShade$",
             "type": "string",
             "readOnly": true
           },
-          "schedule_rules": {
-            "title": "Schedule Rules",
-            "description": "A list of ScheduleRuleAbridged that note exceptions to the default_day_schedule. These rules should be ordered from highest to lowest priority.",
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/ScheduleRuleAbridged"
-            }
+          "solar_transmittance": {
+            "title": "Solar Transmittance",
+            "description": "The transmittance averaged over the solar spectrum. It is assumed independent of incidence angle. Default value is 0.4.",
+            "default": 0.4,
+            "exclusiveMaximum": 1,
+            "minimum": 0,
+            "type": "number",
+            "format": "double"
           },
-          "holiday_schedule": {
-            "title": "Holiday Schedule",
-            "description": "An identifier for the ScheduleDay that will be used for holidays. This ScheduleDay must be in the day_schedules.",
-            "maxLength": 100,
-            "minLength": 1,
-            "type": "string"
+          "solar_reflectance": {
+            "title": "Solar Reflectance",
+            "description": "The reflectance averaged over the solar spectrum. It us assumed same on both sides of shade and independent of incidence angle. Default value is 0.5",
+            "default": 0.5,
+            "exclusiveMaximum": 1,
+            "minimum": 0,
+            "type": "number",
+            "format": "double"
           },
-          "summer_designday_schedule": {
-            "title": "Summer Designday Schedule",
-            "description": "An identifier for the ScheduleDay that will be used for the summer design day. This ScheduleDay must be in the day_schedules.",
-            "maxLength": 100,
-            "minLength": 1,
-            "type": "string"
+          "visible_transmittance": {
+            "title": "Visible Transmittance",
+            "description": "The transmittance averaged over the solar spectrum and weighted by the response of the human eye. It is assumed independent of incidence angle. Default value is 0.4.",
+            "default": 0.4,
+            "exclusiveMaximum": 1,
+            "minimum": 0,
+            "type": "number",
+            "format": "double"
           },
-          "winter_designday_schedule": {
-            "title": "Winter Designday Schedule",
-            "description": "An identifier for the ScheduleDay that will be used for the winter design day. This ScheduleDay must be in the day_schedules.",
-            "maxLength": 100,
-            "minLength": 1,
-            "type": "string"
+          "visible_reflectance": {
+            "title": "Visible Reflectance",
+            "description": "The transmittance averaged over the solar spectrum and weighted by the response of the human eye. It is assumed independent of incidence angle. Default value is 0.4",
+            "default": 0.4,
+            "exclusiveMaximum": 1,
+            "minimum": 0,
+            "type": "number",
+            "format": "double"
           },
-          "schedule_type_limit": {
-            "title": "Schedule Type Limit",
-            "description": "ScheduleTypeLimit object that will be used to validate schedule values against upper/lower limits and assign units to the schedule values. If None, no validation will occur.",
-            "allOf": [
-              {
-                "$ref": "#/components/schemas/ScheduleTypeLimit"
-              }
-            ]
+          "emissivity": {
+            "title": "Emissivity",
+            "description": "The effective long-wave infrared hemispherical emissivity. It is assumed same on both sides of shade. Default value is 0.9.",
+            "default": 0.9,
+            "exclusiveMinimum": 0,
+            "exclusiveMaximum": 1,
+            "type": "number",
+            "format": "double"
+          },
+          "infrared_transmittance": {
+            "title": "Infrared Transmittance",
+            "description": "The effective long-wave transmittance. It is assumed independent of incidence angle. Default value is 0.",
+            "default": 0,
+            "exclusiveMaximum": 1,
+            "minimum": 0,
+            "type": "number",
+            "format": "double"
+          },
+          "thickness": {
+            "title": "Thickness",
+            "description": "The thickness of the shade material in meters. Default value is 0.005.",
+            "default": 0.005,
+            "exclusiveMinimum": 0,
+            "type": "number",
+            "format": "double"
+          },
+          "conductivity": {
+            "title": "Conductivity",
+            "description": "The conductivity of the shade material in W/(m-K). Default value is 0.1.",
+            "default": 0.1,
+            "exclusiveMinimum": 0,
+            "type": "number",
+            "format": "double"
+          },
+          "distance_to_glass": {
+            "title": "Distance To Glass",
+            "description": "The distance from shade to adjacent glass in meters. Default value is 0.05",
+            "default": 0.05,
+            "minimum": 0.001,
+            "maximum": 1,
+            "type": "number",
+            "format": "double"
+          },
+          "top_opening_multiplier": {
+            "title": "Top Opening Multiplier",
+            "description": "The effective area for air flow at the top of the shade, divided by the horizontal area between glass and shade. Default value is 0.5.",
+            "default": 0.5,
+            "minimum": 0,
+            "maximum": 1,
+            "type": "number",
+            "format": "double"
+          },
+          "bottom_opening_multiplier": {
+            "title": "Bottom Opening Multiplier",
+            "description": "The effective area for air flow at the bottom of the shade, divided by the horizontal area between glass and shade. Default value is 0.5.",
+            "default": 0.5,
+            "minimum": 0,
+            "maximum": 1,
+            "type": "number",
+            "format": "double"
+          },
+          "left_opening_multiplier": {
+            "title": "Left Opening Multiplier",
+            "description": "The effective area for air flow at the left side of the shade, divided by the vertical area between glass and shade. Default value is 0.5.",
+            "default": 0.5,
+            "minimum": 0,
+            "maximum": 1,
+            "type": "number",
+            "format": "double"
+          },
+          "right_opening_multiplier": {
+            "title": "Right Opening Multiplier",
+            "description": "The effective area for air flow at the right side of the shade, divided by the vertical area between glass and shade. Default value is 0.5.",
+            "default": 0.5,
+            "minimum": 0,
+            "maximum": 1,
+            "type": "number",
+            "format": "double"
+          },
+          "airflow_permeability": {
+            "title": "Airflow Permeability",
+            "description": "The fraction of the shade surface that is open to air flow. If air cannot pass through the shade material, airflow_permeability = 0. Default value is 0.",
+            "default": 0,
+            "minimum": 0,
+            "maximum": 0.8,
+            "type": "number",
+            "format": "double"
           }
         },
         "required": [
-          "identifier",
-          "day_schedules",
-          "default_day_schedule"
+          "identifier"
         ],
         "additionalProperties": false
       },
-      "ScheduleFixedInterval": {
-        "title": "ScheduleFixedInterval",
-        "description": "Used to specify a start date and a list of values for a period of analysis.",
+      "EnergyWindowMaterialBlind": {
+        "title": "EnergyWindowMaterialBlind",
+        "description": "Window blind material consisting of flat, equally-spaced slats.",
         "type": "object",
         "properties": {
           "identifier": {
@@ -4363,17 +4807,6 @@
             "minLength": 1,
             "type": "string"
           },
-          "values": {
-            "title": "Values",
-            "description": "A list of timeseries values occuring at each timestep over the course of the simulation.",
-            "type": "array",
-            "items": {
-              "type": "number",
-              "format": "double"
-            },
-            "minItems": 24,
-            "maxItems": 527040
-          },
           "display_name": {
             "title": "Display Name",
             "description": "Display name of the object with no character restrictions.",
@@ -4381,116 +4814,254 @@
           },
           "type": {
             "title": "Type",
-            "default": "ScheduleFixedInterval",
-            "pattern": "^ScheduleFixedInterval$",
+            "default": "EnergyWindowMaterialBlind",
+            "pattern": "^EnergyWindowMaterialBlind$",
             "type": "string",
             "readOnly": true
           },
-          "schedule_type_limit": {
-            "title": "Schedule Type Limit",
-            "description": "ScheduleTypeLimit object that will be used to validate schedule values against upper/lower limits and assign units to the schedule values. If None, no validation will occur.",
+          "slat_orientation": {
             "allOf": [
               {
-                "$ref": "#/components/schemas/ScheduleTypeLimit"
+                "$ref": "#/components/schemas/SlatOrientation"
               }
-            ]
+            ],
+            "title": "Slat Orientation",
+            "default": "Horizontal",
+            "type": "string"
           },
-          "timestep": {
-            "title": "Timestep",
-            "description": "An integer for the number of steps per hour that the input values correspond to.  For example, if each value represents 30 minutes, the timestep is 2. For 15 minutes, it is 4.",
-            "default": 1,
-            "type": "integer",
-            "format": "int32"
+          "slat_width": {
+            "title": "Slat Width",
+            "description": "The width of slat measured from edge to edge in meters.",
+            "default": 0.025,
+            "exclusiveMinimum": 0,
+            "maximum": 1,
+            "type": "number",
+            "format": "double"
           },
-          "start_date": {
-            "title": "Start Date",
-            "description": "A list of two integers for [month, day], representing the start date when the schedule values begin to take effect.A third integer may be added to denote whether the date should be re-serialized for a leap year (it should be a 1 in this case).",
-            "default": [
-              1,
-              1
-            ],
-            "type": "array",
-            "items": {
-              "type": "integer",
-              "format": "int32"
-            },
-            "minItems": 2,
-            "maxItems": 3
+          "slat_separation": {
+            "title": "Slat Separation",
+            "description": "The distance between the front of a slat and the back of the adjacent slat in meters.",
+            "default": 0.01875,
+            "exclusiveMinimum": 0,
+            "maximum": 1,
+            "type": "number",
+            "format": "double"
           },
-          "placeholder_value": {
-            "title": "Placeholder Value",
-            "description": " A value that will be used for all times not covered by the input values. Typically, your simulation should not need to use this value if the input values completely cover the simulation period.",
+          "slat_thickness": {
+            "title": "Slat Thickness",
+            "description": "The distance between the faces of a slat in meters. The default value is 0.001.",
+            "default": 0.001,
+            "exclusiveMinimum": 0,
+            "maximum": 0.1,
+            "type": "number",
+            "format": "double"
+          },
+          "slat_angle": {
+            "title": "Slat Angle",
+            "description": "The angle (degrees) between the glazing outward normal and the slat outward normal where the outward normal points away from the front face of the slat (degrees). The default value is 45.",
+            "default": 45,
+            "minimum": 0,
+            "maximum": 180,
+            "type": "number",
+            "format": "double"
+          },
+          "slat_conductivity": {
+            "title": "Slat Conductivity",
+            "description": "The thermal conductivity of the slat in W/(m-K). Default value is 221.",
+            "default": 221,
+            "exclusiveMinimum": 0,
+            "type": "number",
+            "format": "double"
+          },
+          "beam_solar_transmittance": {
+            "title": "Beam Solar Transmittance",
+            "description": "The beam solar transmittance of the slat, assumed to be independent of angle of incidence on the slat. Any transmitted beam radiation is assumed to be 100% diffuse (i.e., slats are translucent). The default value is 0.",
             "default": 0,
+            "exclusiveMaximum": 1,
+            "minimum": 0,
             "type": "number",
             "format": "double"
           },
-          "interpolate": {
-            "title": "Interpolate",
-            "description": "Boolean to note whether values in between intervals should be linearly interpolated or whether successive values should take effect immediately upon the beginning time corrsponding to them.",
-            "default": false,
-            "type": "boolean"
-          }
-        },
-        "required": [
-          "identifier",
-          "values"
-        ],
-        "additionalProperties": false
-      },
-      "AirBoundaryConstruction": {
-        "title": "AirBoundaryConstruction",
-        "description": "Construction for Air Boundary objects.",
-        "type": "object",
-        "properties": {
-          "identifier": {
-            "title": "Identifier",
-            "description": "Text string for a unique object ID. This identifier remains constant as the object is mutated, copied, and serialized to different formats (eg. dict, idf, osm). This identifier is also used to reference the object across a Model. It must be < 100 characters, use only ASCII characters and exclude (, ; ! \\n \\t).",
-            "maxLength": 100,
-            "minLength": 1,
-            "type": "string"
+          "beam_solar_reflectance": {
+            "title": "Beam Solar Reflectance",
+            "description": "The beam solar reflectance of the front side of the slat, it is assumed to be independent of the angle of incidence. Default value is 0.5.",
+            "default": 0.5,
+            "exclusiveMaximum": 1,
+            "minimum": 0,
+            "type": "number",
+            "format": "double"
           },
-          "air_mixing_schedule": {
-            "title": "Air Mixing Schedule",
-            "description": "A fractional schedule as a ScheduleRuleset or ScheduleFixedInterval for the air mixing schedule across the construction.",
-            "anyOf": [
-              {
-                "$ref": "#/components/schemas/ScheduleRuleset"
-              },
-              {
-                "$ref": "#/components/schemas/ScheduleFixedInterval"
-              }
-            ]
+          "beam_solar_reflectance_back": {
+            "title": "Beam Solar Reflectance Back",
+            "description": "The beam solar reflectance of the back side of the slat, it is assumed to be independent of the angle of incidence. Default value is 0.5.",
+            "default": 0.5,
+            "exclusiveMaximum": 1,
+            "minimum": 0,
+            "type": "number",
+            "format": "double"
+          },
+          "diffuse_solar_transmittance": {
+            "title": "Diffuse Solar Transmittance",
+            "description": "The slat transmittance for hemisperically diffuse solar radiation. Default value is 0.",
+            "default": 0,
+            "exclusiveMaximum": 1,
+            "minimum": 0,
+            "type": "number",
+            "format": "double"
+          },
+          "diffuse_solar_reflectance": {
+            "title": "Diffuse Solar Reflectance",
+            "description": "The front-side slat reflectance for hemispherically diffuse solar radiation. Default value is 0.5.",
+            "default": 0.5,
+            "exclusiveMaximum": 1,
+            "minimum": 0,
+            "type": "number",
+            "format": "double"
+          },
+          "diffuse_solar_reflectance_back": {
+            "title": "Diffuse Solar Reflectance Back",
+            "description": "The back-side slat reflectance for hemispherically diffuse solar radiation. Default value is 0.5.",
+            "default": 0.5,
+            "exclusiveMaximum": 1,
+            "minimum": 0,
+            "type": "number",
+            "format": "double"
+          },
+          "beam_visible_transmittance": {
+            "title": "Beam Visible Transmittance",
+            "description": "The beam visible transmittance of the slat, it is assumed to be independent of the angle of incidence. Default value is 0.",
+            "default": 0,
+            "exclusiveMaximum": 1,
+            "minimum": 0,
+            "type": "number",
+            "format": "double"
+          },
+          "beam_visible_reflectance": {
+            "title": "Beam Visible Reflectance",
+            "description": "The beam visible reflectance on the front side of the slat, it is assumed to be independent of the angle of incidence. Default value is 0.5.",
+            "default": 0.5,
+            "exclusiveMaximum": 1,
+            "minimum": 0,
+            "type": "number",
+            "format": "double"
+          },
+          "beam_visible_reflectance_back": {
+            "title": "Beam Visible Reflectance Back",
+            "description": "The beam visible reflectance on the back side of the slat, it is assumed to be independent of the angle of incidence. Default value is 0.5.",
+            "default": 0.5,
+            "exclusiveMaximum": 1,
+            "minimum": 0,
+            "type": "number",
+            "format": "double"
+          },
+          "diffuse_visible_transmittance": {
+            "title": "Diffuse Visible Transmittance",
+            "description": "The slat transmittance for hemispherically diffuse visible radiation. This value should equal \u201cSlat Beam Visible Transmittance.\u201d",
+            "default": 0,
+            "exclusiveMaximum": 1,
+            "minimum": 0,
+            "type": "number",
+            "format": "double"
+          },
+          "diffuse_visible_reflectance": {
+            "title": "Diffuse Visible Reflectance",
+            "description": "The front-side slat reflectance for hemispherically diffuse visible radiation. This value should equal \u201cFront Side Slat Beam Visible Reflectance.\u201d Default value is 0.5.",
+            "default": 0.5,
+            "exclusiveMaximum": 1,
+            "minimum": 0,
+            "type": "number",
+            "format": "double"
+          },
+          "diffuse_visible_reflectance_back": {
+            "title": "Diffuse Visible Reflectance Back",
+            "description": "The back-side slat reflectance for hemispherically diffuse visible radiation. This value should equal \u201cBack Side Slat Beam Visible Reflectance. Default value is 0.5.\u201d",
+            "default": 0.5,
+            "exclusiveMaximum": 1,
+            "minimum": 0,
+            "type": "number",
+            "format": "double"
+          },
+          "infrared_transmittance": {
+            "title": "Infrared Transmittance",
+            "description": "The slat infrared hemispherical transmittance. It is zero for solid metallic, wooden or glass slats, but may be non-zero in some cases such as for thin plastic slats. The default value is 0.",
+            "default": 0,
+            "exclusiveMaximum": 1,
+            "minimum": 0,
+            "type": "number",
+            "format": "double"
+          },
+          "emissivity": {
+            "title": "Emissivity",
+            "description": "Front side hemispherical emissivity of the slat. Default is 0.9 for most materials. The default value is 0.9.",
+            "default": 0.9,
+            "exclusiveMaximum": 1,
+            "minimum": 0,
+            "type": "number",
+            "format": "double"
+          },
+          "emissivity_back": {
+            "title": "Emissivity Back",
+            "description": "Back side hemispherical emissivity of the slat. Default is 0.9 for most materials. The default value is 0.9.",
+            "default": 0.9,
+            "exclusiveMaximum": 1,
+            "minimum": 0,
+            "type": "number",
+            "format": "double"
+          },
+          "distance_to_glass": {
+            "title": "Distance To Glass",
+            "description": "The distance from the mid-plane of the blind to the adjacent glass in meters. The default value is 0.05.",
+            "default": 0.05,
+            "minimum": 0.01,
+            "maximum": 1,
+            "type": "number",
+            "format": "double"
           },
-          "display_name": {
-            "title": "Display Name",
-            "description": "Display name of the object with no character restrictions.",
-            "type": "string"
+          "top_opening_multiplier": {
+            "title": "Top Opening Multiplier",
+            "description": "The effective area for air flow at the top of the shade, divided by the horizontal area between glass and shade. The default value is 0.5",
+            "default": 0.5,
+            "minimum": 0,
+            "maximum": 1,
+            "type": "number",
+            "format": "double"
           },
-          "type": {
-            "title": "Type",
-            "default": "AirBoundaryConstruction",
-            "pattern": "^AirBoundaryConstruction$",
-            "type": "string",
-            "readOnly": true
+          "bottom_opening_multiplier": {
+            "title": "Bottom Opening Multiplier",
+            "description": "The effective area for air flow at the bottom of the shade, divided by the horizontal area between glass and shade. The default value is 0.",
+            "default": 0.5,
+            "minimum": 0,
+            "maximum": 1,
+            "type": "number",
+            "format": "double"
           },
-          "air_mixing_per_area": {
-            "title": "Air Mixing Per Area",
-            "description": "A positive number for the amount of air mixing between Rooms across the air boundary surface [m3/s-m2]. Default: 0.1 corresponds to average indoor air speeds of 0.1 m/s (roughly 20 fpm), which is typical of what would be induced by a HVAC system.",
-            "default": 0.1,
+          "left_opening_multiplier": {
+            "title": "Left Opening Multiplier",
+            "description": "The effective area for air flow at the left side of the shade, divided by the vertical area between glass and shade. The default value is 0.5.",
+            "default": 0.5,
+            "minimum": 0,
+            "maximum": 1,
+            "type": "number",
+            "format": "double"
+          },
+          "right_opening_multiplier": {
+            "title": "Right Opening Multiplier",
+            "description": "The effective area for air flow at the right side of the shade, divided by the vertical area between glass and shade. The default value is 0.5.",
+            "default": 0.5,
             "minimum": 0,
+            "maximum": 1,
             "type": "number",
             "format": "double"
           }
         },
         "required": [
-          "identifier",
-          "air_mixing_schedule"
+          "identifier"
         ],
         "additionalProperties": false
       },
-      "ConstructionSet": {
-        "title": "ConstructionSet",
-        "description": "A set of constructions for different surface types and boundary conditions.",
+      "WindowConstructionShade": {
+        "title": "WindowConstructionShade",
+        "description": "Construction for window objects (Aperture, Door).",
         "type": "object",
         "properties": {
           "identifier": {
@@ -4500,157 +5071,29 @@
             "minLength": 1,
             "type": "string"
           },
-          "display_name": {
-            "title": "Display Name",
-            "description": "Display name of the object with no character restrictions.",
-            "type": "string"
-          },
-          "type": {
-            "title": "Type",
-            "default": "ConstructionSet",
-            "pattern": "^ConstructionSet$",
-            "type": "string",
-            "readOnly": true
-          },
-          "wall_set": {
-            "title": "Wall Set",
-            "description": "A WallConstructionSet object for this ConstructionSet.",
-            "allOf": [
-              {
-                "$ref": "#/components/schemas/WallConstructionSet"
-              }
-            ]
-          },
-          "floor_set": {
-            "title": "Floor Set",
-            "description": "A FloorConstructionSet object for this ConstructionSet.",
-            "allOf": [
-              {
-                "$ref": "#/components/schemas/FloorConstructionSet"
-              }
-            ]
-          },
-          "roof_ceiling_set": {
-            "title": "Roof Ceiling Set",
-            "description": "A RoofCeilingConstructionSet object for this ConstructionSet.",
-            "allOf": [
-              {
-                "$ref": "#/components/schemas/RoofCeilingConstructionSet"
-              }
-            ]
-          },
-          "aperture_set": {
-            "title": "Aperture Set",
-            "description": "A ApertureConstructionSet object for this ConstructionSet.",
+          "window_construction": {
+            "title": "Window Construction",
+            "description": "A WindowConstruction object that serves as the \"switched off\" version of the construction (aka. the \"bare construction\"). The shade_material and shade_location will be used to modify this starting construction.",
             "allOf": [
               {
-                "$ref": "#/components/schemas/ApertureConstructionSet"
+                "$ref": "#/components/schemas/WindowConstruction"
               }
             ]
           },
-          "door_set": {
-            "title": "Door Set",
-            "description": "A DoorConstructionSet object for this ConstructionSet.",
-            "allOf": [
+          "shade_material": {
+            "title": "Shade Material",
+            "description": "Identifier of a An EnergyWindowMaterialShade or an EnergyWindowMaterialBlind that serves as the shading layer for this construction. This can also be an EnergyWindowMaterialGlazing, which will indicate that the WindowConstruction has a dynamically-controlled glass pane like an electrochromic window assembly.",
+            "anyOf": [
               {
-                "$ref": "#/components/schemas/DoorConstructionSet"
-              }
-            ]
-          },
-          "shade_construction": {
-            "title": "Shade Construction",
-            "description": "A ShadeConstruction to set the reflectance properties of all outdoor shades of all objects to which this ConstructionSet is assigned.",
-            "allOf": [
+                "$ref": "#/components/schemas/EnergyWindowMaterialShade"
+              },
               {
-                "$ref": "#/components/schemas/ShadeConstruction"
-              }
-            ]
-          },
-          "air_boundary_construction": {
-            "title": "Air Boundary Construction",
-            "description": "An AirBoundaryConstruction to set the properties of Faces with an AirBoundary type.",
-            "allOf": [
+                "$ref": "#/components/schemas/EnergyWindowMaterialBlind"
+              },
               {
-                "$ref": "#/components/schemas/AirBoundaryConstruction"
+                "$ref": "#/components/schemas/EnergyWindowMaterialGlazing"
               }
             ]
-          }
-        },
-        "required": [
-          "identifier"
-        ],
-        "additionalProperties": false
-      },
-      "OpaqueConstructionAbridged": {
-        "title": "OpaqueConstructionAbridged",
-        "description": "Construction for opaque objects (Face, Shade, Door).",
-        "type": "object",
-        "properties": {
-          "identifier": {
-            "title": "Identifier",
-            "description": "Text string for a unique object ID. This identifier remains constant as the object is mutated, copied, and serialized to different formats (eg. dict, idf, osm). This identifier is also used to reference the object across a Model. It must be < 100 characters, use only ASCII characters and exclude (, ; ! \\n \\t).",
-            "maxLength": 100,
-            "minLength": 1,
-            "type": "string"
-          },
-          "layers": {
-            "title": "Layers",
-            "description": "List of strings for material identifiers. The order of the materials is from exterior to interior.",
-            "minLength": 1,
-            "maxLength": 100,
-            "type": "array",
-            "items": {
-              "type": "string",
-              "minLength": 1,
-              "maxLength": 100
-            },
-            "minItems": 1,
-            "maxItems": 10
-          },
-          "display_name": {
-            "title": "Display Name",
-            "description": "Display name of the object with no character restrictions.",
-            "type": "string"
-          },
-          "type": {
-            "title": "Type",
-            "default": "OpaqueConstructionAbridged",
-            "pattern": "^OpaqueConstructionAbridged$",
-            "type": "string",
-            "readOnly": true
-          }
-        },
-        "required": [
-          "identifier",
-          "layers"
-        ],
-        "additionalProperties": false
-      },
-      "WindowConstructionAbridged": {
-        "title": "WindowConstructionAbridged",
-        "description": "Construction for window objects (Aperture, Door).",
-        "type": "object",
-        "properties": {
-          "identifier": {
-            "title": "Identifier",
-            "description": "Text string for a unique object ID. This identifier remains constant as the object is mutated, copied, and serialized to different formats (eg. dict, idf, osm). This identifier is also used to reference the object across a Model. It must be < 100 characters, use only ASCII characters and exclude (, ; ! \\n \\t).",
-            "maxLength": 100,
-            "minLength": 1,
-            "type": "string"
-          },
-          "layers": {
-            "title": "Layers",
-            "description": "List of strings for material identifiers. The order of the materials is from exterior to interior.",
-            "minLength": 1,
-            "maxLength": 100,
-            "type": "array",
-            "items": {
-              "type": "string",
-              "minLength": 1,
-              "maxLength": 100
-            },
-            "minItems": 1,
-            "maxItems": 8
           },
           "display_name": {
             "title": "Display Name",
@@ -4659,61 +5102,56 @@
           },
           "type": {
             "title": "Type",
-            "default": "WindowConstructionAbridged",
-            "pattern": "^WindowConstructionAbridged$",
+            "default": "WindowConstructionShade",
+            "pattern": "^WindowConstructionShade$",
             "type": "string",
             "readOnly": true
-          }
-        },
-        "required": [
-          "identifier",
-          "layers"
-        ],
-        "additionalProperties": false
-      },
-      "AirBoundaryConstructionAbridged": {
-        "title": "AirBoundaryConstructionAbridged",
-        "description": "Construction for Air Boundary objects.",
-        "type": "object",
-        "properties": {
-          "identifier": {
-            "title": "Identifier",
-            "description": "Text string for a unique object ID. This identifier remains constant as the object is mutated, copied, and serialized to different formats (eg. dict, idf, osm). This identifier is also used to reference the object across a Model. It must be < 100 characters, use only ASCII characters and exclude (, ; ! \\n \\t).",
-            "maxLength": 100,
-            "minLength": 1,
-            "type": "string"
           },
-          "air_mixing_schedule": {
-            "title": "Air Mixing Schedule",
-            "description": "Identifier of a fractional schedule for the air mixing schedule across the construction.",
-            "maxLength": 100,
-            "minLength": 1,
+          "shade_location": {
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/ShadeLocation"
+              }
+            ],
+            "title": "Shade Location",
+            "description": "Text to indicate where in the window assembly the shade_material is located.  Note that the WindowConstruction must have at least one gas gap to use the \"Between\" option. Also note that, for a WindowConstruction with more than one gas gap, the \"Between\" option defalts to using the inner gap as this is the only option that EnergyPlus supports.",
+            "default": "Interior",
             "type": "string"
           },
-          "display_name": {
-            "title": "Display Name",
-            "description": "Display name of the object with no character restrictions.",
+          "control_type": {
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/ControlType"
+              }
+            ],
+            "title": "Control Type",
+            "description": "Text to indicate how the shading device is controlled, which determines when the shading is \u201con\u201d or \u201coff.\u201d",
+            "default": "AlwaysOn",
             "type": "string"
           },
-          "type": {
-            "title": "Type",
-            "default": "AirBoundaryConstructionAbridged",
-            "pattern": "^AirBoundaryConstructionAbridged$",
-            "type": "string",
-            "readOnly": true
-          },
-          "air_mixing_per_area": {
-            "title": "Air Mixing Per Area",
-            "description": "A positive number for the amount of air mixing between Rooms across the air boundary surface [m3/s-m2]. Default: 0.1 corresponds to average indoor air speeds of 0.1 m/s (roughly 20 fpm), which is typical of what would be induced by a HVAC system.",
-            "default": 0.1,
-            "minimum": 0,
+          "setpoint": {
+            "title": "Setpoint",
+            "description": "A number that corresponds to the specified control_type. This can be a value in (W/m2), (C) or (W) depending upon the control type.Note that this value cannot be None for any control type except \"AlwaysOn.\"",
             "type": "number",
             "format": "double"
+          },
+          "schedule": {
+            "title": "Schedule",
+            "description": "An optional ScheduleRuleset or ScheduleFixedInterval to be applied on top of the control_type. If None, the control_type will govern all behavior of the construction.",
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/ScheduleRuleset"
+              },
+              {
+                "$ref": "#/components/schemas/ScheduleFixedInterval"
+              }
+            ]
           }
         },
         "required": [
           "identifier",
-          "air_mixing_schedule"
+          "window_construction",
+          "shade_material"
         ],
         "additionalProperties": false
       },
@@ -4757,14 +5195,14 @@
             "readOnly": true
           },
           "economizer_type": {
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/EconomizerType"
+              }
+            ],
             "title": "Economizer Type",
             "description": "Text to indicate the type of air-side economizer used on the ideal air system. Economizers will mix in a greater amount of outdoor air to cool the zone (rather than running the cooling system) when the zone needs cooling and the outdoor air is cooler than the zone.",
             "default": "DifferentialDryBulb",
-            "enum": [
-              "NoEconomizer",
-              "DifferentialDryBulb",
-              "DifferentialEnthalpy"
-            ],
             "type": "string"
           },
           "demand_controlled_ventilation": {
@@ -4811,7 +5249,7 @@
           },
           "heating_limit": {
             "title": "Heating Limit",
-            "description": "A number for the maximum heating capacity in Watts. This can also be an Autosize object to indicate that the capacity should be determined during the EnergyPlus sizing calculation. This can also be a NoLimit boject to indicate no upper limit to the heating capacity.",
+            "description": "A number for the maximum heating capacity in Watts. This can also be an Autosize object to indicate that the capacity should be determined during the EnergyPlus sizing calculation. This can also be a NoLimit object to indicate no upper limit to the heating capacity.",
             "default": {
               "type": "Autosize"
             },
@@ -4831,7 +5269,7 @@
           },
           "cooling_limit": {
             "title": "Cooling Limit",
-            "description": "A number for the maximum cooling capacity in Watts. This can also be an Autosize object to indicate that the capacity should be determined during the EnergyPlus sizing calculation. This can also be a NoLimit boject to indicate no upper limit to the cooling capacity.",
+            "description": "A number for the maximum cooling capacity in Watts. This can also be an Autosize object to indicate that the capacity should be determined during the EnergyPlus sizing calculation. This can also be a NoLimit object to indicate no upper limit to the cooling capacity.",
             "default": {
               "type": "Autosize"
             },
@@ -5762,7 +6200,7 @@
           },
           "interpolate": {
             "title": "Interpolate",
-            "description": "Boolean to note whether values in between intervals should be linearly interpolated or whether successive values should take effect immediately upon the beginning time corrsponding to them.",
+            "description": "Boolean to note whether values in between intervals should be linearly interpolated or whether successive values should take effect immediately upon the beginning time corresponding to them.",
             "default": false,
             "type": "boolean"
           }
@@ -5820,7 +6258,7 @@
                   "$ref": "#/components/schemas/WindowConstructionAbridged"
                 },
                 {
-                  "$ref": "#/components/schemas/ShadeConstruction"
+                  "$ref": "#/components/schemas/WindowConstructionShadeAbridged"
                 },
                 {
                   "$ref": "#/components/schemas/AirBoundaryConstructionAbridged"
@@ -5831,8 +6269,14 @@
                 {
                   "$ref": "#/components/schemas/WindowConstruction"
                 },
+                {
+                  "$ref": "#/components/schemas/WindowConstructionShade"
+                },
                 {
                   "$ref": "#/components/schemas/AirBoundaryConstruction"
+                },
+                {
+                  "$ref": "#/components/schemas/ShadeConstruction"
                 }
               ]
             }
@@ -5989,6 +6433,9 @@
               {
                 "$ref": "#/components/schemas/Trans"
               },
+              {
+                "$ref": "#/components/schemas/Metal"
+              },
               {
                 "$ref": "#/components/schemas/Void"
               },
@@ -5999,8 +6446,7 @@
           },
           "dependencies": {
             "title": "Dependencies",
-            "description": "List of modifiers that this modifier depends on. This argument is only useful for defining advanced modifiers where the modifier is defined based on other modifiers (default: []).",
-            "default": [],
+            "description": "List of modifiers that this modifier depends on. This argument is only useful for defining advanced modifiers where the modifier is defined based on other modifiers (default: None).",
             "type": "array",
             "items": {
               "anyOf": [
@@ -6022,6 +6468,9 @@
                 {
                   "$ref": "#/components/schemas/Trans"
                 },
+                {
+                  "$ref": "#/components/schemas/Metal"
+                },
                 {
                   "$ref": "#/components/schemas/Void"
                 },
@@ -6080,6 +6529,73 @@
               {
                 "$ref": "#/components/schemas/Trans"
               },
+              {
+                "$ref": "#/components/schemas/Metal"
+              },
+              {
+                "$ref": "#/components/schemas/Void"
+              },
+              {
+                "$ref": "#/components/schemas/Mirror"
+              }
+            ]
+          }
+        },
+        "required": [
+          "identifier"
+        ],
+        "additionalProperties": false
+      },
+      "Metal": {
+        "title": "Metal",
+        "description": "Radiance metal material.",
+        "type": "object",
+        "properties": {
+          "identifier": {
+            "title": "Identifier",
+            "description": "Text string for a unique Radiance object. Must not contain spaces or special characters. This will be used to identify the object across a model and in the exported Radiance files.",
+            "type": "string"
+          },
+          "display_name": {
+            "title": "Display Name",
+            "description": "Display name of the object with no character restrictions.",
+            "type": "string"
+          },
+          "type": {
+            "title": "Type",
+            "default": "metal",
+            "pattern": "^metal$",
+            "type": "string",
+            "readOnly": true
+          },
+          "modifier": {
+            "title": "Modifier",
+            "description": "Material modifier (default: Void).",
+            "default": {
+              "type": "void"
+            },
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/Plastic"
+              },
+              {
+                "$ref": "#/components/schemas/Glass"
+              },
+              {
+                "$ref": "#/components/schemas/BSDF"
+              },
+              {
+                "$ref": "#/components/schemas/Glow"
+              },
+              {
+                "$ref": "#/components/schemas/Light"
+              },
+              {
+                "$ref": "#/components/schemas/Trans"
+              },
+              {
+                "$ref": "#/components/schemas/Metal"
+              },
               {
                 "$ref": "#/components/schemas/Void"
               },
@@ -6087,6 +6603,87 @@
                 "$ref": "#/components/schemas/Mirror"
               }
             ]
+          },
+          "dependencies": {
+            "title": "Dependencies",
+            "description": "List of modifiers that this modifier depends on. This argument is only useful for defining advanced modifiers where the modifier is defined based on other modifiers (default: None).",
+            "type": "array",
+            "items": {
+              "anyOf": [
+                {
+                  "$ref": "#/components/schemas/Plastic"
+                },
+                {
+                  "$ref": "#/components/schemas/Glass"
+                },
+                {
+                  "$ref": "#/components/schemas/BSDF"
+                },
+                {
+                  "$ref": "#/components/schemas/Glow"
+                },
+                {
+                  "$ref": "#/components/schemas/Light"
+                },
+                {
+                  "$ref": "#/components/schemas/Trans"
+                },
+                {
+                  "$ref": "#/components/schemas/Metal"
+                },
+                {
+                  "$ref": "#/components/schemas/Void"
+                },
+                {
+                  "$ref": "#/components/schemas/Mirror"
+                }
+              ]
+            }
+          },
+          "r_reflectance": {
+            "title": "R Reflectance",
+            "description": "A value between 0 and 1 for the red channel reflectance (default: 0).",
+            "default": 0.0,
+            "minimum": 0,
+            "maximum": 1,
+            "type": "number",
+            "format": "double"
+          },
+          "g_reflectance": {
+            "title": "G Reflectance",
+            "description": "A value between 0 and 1 for the green channel reflectance (default: 0).",
+            "default": 0.0,
+            "minimum": 0,
+            "maximum": 1,
+            "type": "number",
+            "format": "double"
+          },
+          "b_reflectance": {
+            "title": "B Reflectance",
+            "description": "A value between 0 and 1 for the blue channel reflectance (default: 0).",
+            "default": 0.0,
+            "minimum": 0,
+            "maximum": 1,
+            "type": "number",
+            "format": "double"
+          },
+          "specularity": {
+            "title": "Specularity",
+            "description": "A value between 0 and 1 for the fraction of specularity. Specularity fractions lower than 0.9 are not realistic for metallic materials. (default: 0.9).",
+            "default": 0.9,
+            "minimum": 0,
+            "maximum": 1,
+            "type": "number",
+            "format": "double"
+          },
+          "roughness": {
+            "title": "Roughness",
+            "description": "A value between 0 and 1 for the roughness, specified as the rms slope of surface facets. Roughness greater than 0.2 are not realistic (default: 0).",
+            "default": 0,
+            "minimum": 0,
+            "maximum": 1,
+            "type": "number",
+            "format": "double"
           }
         },
         "required": [
@@ -6141,6 +6738,9 @@
               {
                 "$ref": "#/components/schemas/Trans"
               },
+              {
+                "$ref": "#/components/schemas/Metal"
+              },
               {
                 "$ref": "#/components/schemas/Void"
               },
@@ -6151,8 +6751,7 @@
           },
           "dependencies": {
             "title": "Dependencies",
-            "description": "List of modifiers that this modifier depends on. This argument is only useful for defining advanced modifiers where the modifier is defined based on other modifiers (default: []).",
-            "default": [],
+            "description": "List of modifiers that this modifier depends on. This argument is only useful for defining advanced modifiers where the modifier is defined based on other modifiers (default: None).",
             "type": "array",
             "items": {
               "anyOf": [
@@ -6174,6 +6773,9 @@
                 {
                   "$ref": "#/components/schemas/Trans"
                 },
+                {
+                  "$ref": "#/components/schemas/Metal"
+                },
                 {
                   "$ref": "#/components/schemas/Void"
                 },
@@ -6212,7 +6814,7 @@
           },
           "specularity": {
             "title": "Specularity",
-            "description": "A value between 0 and 1 for the fraction of specularity. Specularity fractions greater than 0.1 are not realistic. (default: 0).",
+            "description": "A value between 0 and 1 for the fraction of specularity. Specularity fractions greater than 0.1 are not realistic for non-metallic materials. (default: 0).",
             "default": 0,
             "minimum": 0,
             "maximum": 1,
@@ -6299,6 +6901,9 @@
               {
                 "$ref": "#/components/schemas/Trans"
               },
+              {
+                "$ref": "#/components/schemas/Metal"
+              },
               {
                 "$ref": "#/components/schemas/Void"
               },
@@ -6309,8 +6914,7 @@
           },
           "dependencies": {
             "title": "Dependencies",
-            "description": "List of modifiers that this modifier depends on. This argument is only useful for defining advanced modifiers where the modifier is defined based on other modifiers (default: []).",
-            "default": [],
+            "description": "List of modifiers that this modifier depends on. This argument is only useful for defining advanced modifiers where the modifier is defined based on other modifiers (default: None).",
             "type": "array",
             "items": {
               "anyOf": [
@@ -6332,6 +6936,9 @@
                 {
                   "$ref": "#/components/schemas/Trans"
                 },
+                {
+                  "$ref": "#/components/schemas/Metal"
+                },
                 {
                   "$ref": "#/components/schemas/Void"
                 },
@@ -6421,6 +7028,9 @@
               {
                 "$ref": "#/components/schemas/Trans"
               },
+              {
+                "$ref": "#/components/schemas/Metal"
+              },
               {
                 "$ref": "#/components/schemas/Void"
               },
@@ -6431,8 +7041,7 @@
           },
           "dependencies": {
             "title": "Dependencies",
-            "description": "List of modifiers that this modifier depends on. This argument is only useful for defining advanced modifiers where the modifier is defined based on other modifiers (default: []).",
-            "default": [],
+            "description": "List of modifiers that this modifier depends on. This argument is only useful for defining advanced modifiers where the modifier is defined based on other modifiers (default: None).",
             "type": "array",
             "items": {
               "anyOf": [
@@ -6454,6 +7063,9 @@
                 {
                   "$ref": "#/components/schemas/Trans"
                 },
+                {
+                  "$ref": "#/components/schemas/Metal"
+                },
                 {
                   "$ref": "#/components/schemas/Void"
                 },
@@ -6515,9 +7127,8 @@
           },
           "bsdf_data": {
             "title": "Bsdf Data",
-            "description": "BSDF xml file data as bytes.",
-            "type": "string",
-            "format": "binary"
+            "description": "A string with the contents of the BSDF XML file.",
+            "type": "string"
           },
           "display_name": {
             "title": "Display Name",
@@ -6556,6 +7167,9 @@
               {
                 "$ref": "#/components/schemas/Trans"
               },
+              {
+                "$ref": "#/components/schemas/Metal"
+              },
               {
                 "$ref": "#/components/schemas/Void"
               },
@@ -6566,8 +7180,7 @@
           },
           "dependencies": {
             "title": "Dependencies",
-            "description": "List of modifiers that this modifier depends on. This argument is only useful for defining advanced modifiers where the modifier is defined based on other modifiers (default: []).",
-            "default": [],
+            "description": "List of modifiers that this modifier depends on. This argument is only useful for defining advanced modifiers where the modifier is defined based on other modifiers (default: None).",
             "type": "array",
             "items": {
               "anyOf": [
@@ -6589,6 +7202,9 @@
                 {
                   "$ref": "#/components/schemas/Trans"
                 },
+                {
+                  "$ref": "#/components/schemas/Metal"
+                },
                 {
                   "$ref": "#/components/schemas/Void"
                 },
@@ -6723,6 +7339,9 @@
               {
                 "$ref": "#/components/schemas/Trans"
               },
+              {
+                "$ref": "#/components/schemas/Metal"
+              },
               {
                 "$ref": "#/components/schemas/Void"
               },
@@ -6733,8 +7352,7 @@
           },
           "dependencies": {
             "title": "Dependencies",
-            "description": "List of modifiers that this modifier depends on. This argument is only useful for defining advanced modifiers where the modifier is defined based on other modifiers (default: []).",
-            "default": [],
+            "description": "List of modifiers that this modifier depends on. This argument is only useful for defining advanced modifiers where the modifier is defined based on other modifiers (default: None).",
             "type": "array",
             "items": {
               "anyOf": [
@@ -6756,6 +7374,9 @@
                 {
                   "$ref": "#/components/schemas/Trans"
                 },
+                {
+                  "$ref": "#/components/schemas/Metal"
+                },
                 {
                   "$ref": "#/components/schemas/Void"
                 },
@@ -6853,6 +7474,9 @@
               {
                 "$ref": "#/components/schemas/Trans"
               },
+              {
+                "$ref": "#/components/schemas/Metal"
+              },
               {
                 "$ref": "#/components/schemas/Void"
               },
@@ -6863,8 +7487,7 @@
           },
           "dependencies": {
             "title": "Dependencies",
-            "description": "List of modifiers that this modifier depends on. This argument is only useful for defining advanced modifiers where the modifier is defined based on other modifiers (default: []).",
-            "default": [],
+            "description": "List of modifiers that this modifier depends on. This argument is only useful for defining advanced modifiers where the modifier is defined based on other modifiers (default: None).",
             "type": "array",
             "items": {
               "anyOf": [
@@ -6886,6 +7509,9 @@
                 {
                   "$ref": "#/components/schemas/Trans"
                 },
+                {
+                  "$ref": "#/components/schemas/Metal"
+                },
                 {
                   "$ref": "#/components/schemas/Void"
                 },
@@ -6924,7 +7550,7 @@
           },
           "specularity": {
             "title": "Specularity",
-            "description": "A value between 0 and 1 for the fraction of specularity. Specularity fractions greater than 0.1 are not realistic. (default: 0).",
+            "description": "A value between 0 and 1 for the fraction of specularity. Specularity fractions greater than 0.1 are not realistic for non-metallic materials. (default: 0).",
             "default": 0,
             "minimum": 0,
             "maximum": 1,
@@ -6973,6 +7599,9 @@
               {
                 "$ref": "#/components/schemas/Trans"
               },
+              {
+                "$ref": "#/components/schemas/Metal"
+              },
               {
                 "$ref": "#/components/schemas/Void"
               },
@@ -7003,6 +7632,9 @@
               {
                 "$ref": "#/components/schemas/Trans"
               },
+              {
+                "$ref": "#/components/schemas/Metal"
+              },
               {
                 "$ref": "#/components/schemas/Void"
               },
@@ -7048,6 +7680,9 @@
               {
                 "$ref": "#/components/schemas/Trans"
               },
+              {
+                "$ref": "#/components/schemas/Metal"
+              },
               {
                 "$ref": "#/components/schemas/Void"
               },
@@ -7078,6 +7713,9 @@
               {
                 "$ref": "#/components/schemas/Trans"
               },
+              {
+                "$ref": "#/components/schemas/Metal"
+              },
               {
                 "$ref": "#/components/schemas/Void"
               },
@@ -7123,6 +7761,9 @@
               {
                 "$ref": "#/components/schemas/Trans"
               },
+              {
+                "$ref": "#/components/schemas/Metal"
+              },
               {
                 "$ref": "#/components/schemas/Void"
               },
@@ -7153,6 +7794,9 @@
               {
                 "$ref": "#/components/schemas/Trans"
               },
+              {
+                "$ref": "#/components/schemas/Metal"
+              },
               {
                 "$ref": "#/components/schemas/Void"
               },
@@ -7205,6 +7849,9 @@
               {
                 "$ref": "#/components/schemas/Trans"
               },
+              {
+                "$ref": "#/components/schemas/Metal"
+              },
               {
                 "$ref": "#/components/schemas/Void"
               },
@@ -7235,6 +7882,9 @@
               {
                 "$ref": "#/components/schemas/Trans"
               },
+              {
+                "$ref": "#/components/schemas/Metal"
+              },
               {
                 "$ref": "#/components/schemas/Void"
               },
@@ -7265,6 +7915,9 @@
               {
                 "$ref": "#/components/schemas/Trans"
               },
+              {
+                "$ref": "#/components/schemas/Metal"
+              },
               {
                 "$ref": "#/components/schemas/Void"
               },
@@ -7295,6 +7948,9 @@
               {
                 "$ref": "#/components/schemas/Trans"
               },
+              {
+                "$ref": "#/components/schemas/Metal"
+              },
               {
                 "$ref": "#/components/schemas/Void"
               },
@@ -7333,6 +7989,9 @@
               {
                 "$ref": "#/components/schemas/Trans"
               },
+              {
+                "$ref": "#/components/schemas/Metal"
+              },
               {
                 "$ref": "#/components/schemas/Void"
               },
@@ -7363,6 +8022,9 @@
               {
                 "$ref": "#/components/schemas/Trans"
               },
+              {
+                "$ref": "#/components/schemas/Metal"
+              },
               {
                 "$ref": "#/components/schemas/Void"
               },
@@ -7400,6 +8062,9 @@
               {
                 "$ref": "#/components/schemas/Trans"
               },
+              {
+                "$ref": "#/components/schemas/Metal"
+              },
               {
                 "$ref": "#/components/schemas/Void"
               },
@@ -7430,6 +8095,9 @@
               {
                 "$ref": "#/components/schemas/Trans"
               },
+              {
+                "$ref": "#/components/schemas/Metal"
+              },
               {
                 "$ref": "#/components/schemas/Void"
               },
@@ -7460,6 +8128,9 @@
               {
                 "$ref": "#/components/schemas/Trans"
               },
+              {
+                "$ref": "#/components/schemas/Metal"
+              },
               {
                 "$ref": "#/components/schemas/Void"
               },
@@ -7498,6 +8169,9 @@
               {
                 "$ref": "#/components/schemas/Trans"
               },
+              {
+                "$ref": "#/components/schemas/Metal"
+              },
               {
                 "$ref": "#/components/schemas/Void"
               },
@@ -7528,6 +8202,9 @@
               {
                 "$ref": "#/components/schemas/Trans"
               },
+              {
+                "$ref": "#/components/schemas/Metal"
+              },
               {
                 "$ref": "#/components/schemas/Void"
               },
@@ -7624,7 +8301,7 @@
           },
           "air_boundary_modifier": {
             "title": "Air Boundary Modifier",
-            "description": "An optional Modifier to be used for all Faces with an AirBoundary face type. If None, it will be the honyebee generic air wall modifier.",
+            "description": "An optional Modifier to be used for all Faces with an AirBoundary face type. If None, it will be the honeybee generic air wall modifier.",
             "anyOf": [
               {
                 "$ref": "#/components/schemas/Plastic"
@@ -7644,6 +8321,9 @@
               {
                 "$ref": "#/components/schemas/Trans"
               },
+              {
+                "$ref": "#/components/schemas/Metal"
+              },
               {
                 "$ref": "#/components/schemas/Void"
               },
@@ -7911,7 +8591,7 @@
           },
           "air_boundary_modifier": {
             "title": "Air Boundary Modifier",
-            "description": "Optional Modifier to be used for all Faces with an AirBoundary face type. If None, it will be the honyebee generic air wall modifier.",
+            "description": "Optional Modifier to be used for all Faces with an AirBoundary face type. If None, it will be the honeybee generic air wall modifier.",
             "type": "string"
           }
         },
@@ -7934,8 +8614,7 @@
           },
           "modifiers": {
             "title": "Modifiers",
-            "description": "A list of all unique modifiers in the model. This includes modifiers across all Faces, Apertures, Doors, Shades, Room ModifierSets, and the global_modifier_set. (default: []).",
-            "default": [],
+            "description": "A list of all unique modifiers in the model. This includes modifiers across all Faces, Apertures, Doors, Shades, Room ModifierSets, and the global_modifier_set (default: None).",
             "type": "array",
             "items": {
               "anyOf": [
@@ -7957,6 +8636,9 @@
                 {
                   "$ref": "#/components/schemas/Trans"
                 },
+                {
+                  "$ref": "#/components/schemas/Metal"
+                },
                 {
                   "$ref": "#/components/schemas/Void"
                 },
@@ -7968,8 +8650,7 @@
           },
           "modifier_sets": {
             "title": "Modifier Sets",
-            "description": "A list of all unique Room-Assigned ModifierSets in the Model (default: []).",
-            "default": [],
+            "description": "A list of all unique Room-Assigned ModifierSets in the Model (default: None).",
             "type": "array",
             "items": {
               "anyOf": [
@@ -8089,29 +8770,29 @@
             }
           },
           "units": {
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/Units"
+              }
+            ],
             "title": "Units",
             "description": "Text indicating the units in which the model geometry exists. This is used to scale the geometry to the correct units for simulation engines like EnergyPlus, which requires all geometry be in meters.",
             "default": "Meters",
-            "enum": [
-              "Meters",
-              "Millimeters",
-              "Feet",
-              "Inches",
-              "Centimeters"
-            ],
             "type": "string"
           },
           "tolerance": {
             "title": "Tolerance",
-            "description": "The maximum difference between x, y, and z values at which vertices are considered equivalent. This value should be in the Model units and it is used in a variety of checks, including checks for whether Room faces form a closed volume and subsequently correcting all face normals point outward from the Room. A value of 0 will result in no attempt to evaluate whether Room volumes are closed or check face direction. So it is recommended that this always be a positive number when such checks have not been performed on a Model. Typical tolerances for building geometry range from 0.1 to 0.0001 depending on the units of the geometry.",
-            "default": 0,
+            "description": "The maximum difference between x, y, and z values at which vertices are considered equivalent. This value should be in the Model units and it is used in a variety of checks, including checks for whether Room faces form a closed volume and subsequently correcting all face normals point outward from the Room. A value of 0 will result in bypassing all checks so it is recommended that this always be a positive number when such checks have not already been performed on a Model. The default of 0.01 is suitable for models in meters.",
+            "default": 0.01,
+            "minimum": 0,
             "type": "number",
             "format": "double"
           },
           "angle_tolerance": {
             "title": "Angle Tolerance",
-            "description": "The max angle difference in degrees that vertices are allowed to differ from one another in order to consider them colinear. This value is used in a variety of checks, including checks for whether Room faces form a closed volume and subsequently correcting all face normals point outward from the Room. A value of 0 will result in no attempt to evaluate whether the Room volumes is closed or check face direction. So it is recommended that this always be a positive number when such checks have not been performed on a given Model. Typical tolerances for building geometry are often around 1 degree.",
-            "default": 0,
+            "description": "The max angle difference in degrees that vertices are allowed to differ from one another in order to consider them colinear. This value is used in a variety of checks, including checks for whether Room faces form a closed volume and subsequently correcting all face normals point outward from the Room. A value of 0 will result in bypassing all checks so it is recommended that this always be a positive number when such checks have not already been performed on a given Model.",
+            "default": 1.0,
+            "minimum": 0,
             "type": "number",
             "format": "double"
           }
@@ -8121,6 +8802,131 @@
           "properties"
         ],
         "additionalProperties": false
+      },
+      "Roughness": {
+        "title": "Roughness",
+        "default": "MediumRough",
+        "enum": [
+          "VeryRough",
+          "Rough",
+          "MediumRough",
+          "MediumSmooth",
+          "Smooth",
+          "VerySmooth"
+        ],
+        "type": "string"
+      },
+      "SlatOrientation": {
+        "title": "Slat Orientation",
+        "default": "Horizontal",
+        "enum": [
+          "Horizontal",
+          "Vertical"
+        ],
+        "type": "string"
+      },
+      "GasType": {
+        "title": "Gas Type",
+        "default": "Air",
+        "enum": [
+          "Air",
+          "Argon",
+          "Krypton",
+          "Xenon"
+        ],
+        "type": "string"
+      },
+      "FaceType": {
+        "title": "Face Type",
+        "enum": [
+          "Wall",
+          "Floor",
+          "RoofCeiling",
+          "AirBoundary"
+        ],
+        "type": "string"
+      },
+      "EconomizerType": {
+        "title": "Economizer Type",
+        "description": "Text to indicate the type of air-side economizer used on the ideal air system. Economizers will mix in a greater amount of outdoor air to cool the zone (rather than running the cooling system) when the zone needs cooling and the outdoor air is cooler than the zone.",
+        "default": "DifferentialDryBulb",
+        "enum": [
+          "NoEconomizer",
+          "DifferentialDryBulb",
+          "DifferentialEnthalpy"
+        ],
+        "type": "string"
+      },
+      "Units": {
+        "title": "Units",
+        "description": "Text indicating the units in which the model geometry exists. This is used to scale the geometry to the correct units for simulation engines like EnergyPlus, which requires all geometry be in meters.",
+        "default": "Meters",
+        "enum": [
+          "Meters",
+          "Millimeters",
+          "Feet",
+          "Inches",
+          "Centimeters"
+        ],
+        "type": "string"
+      },
+      "ScheduleNumericType": {
+        "title": "Numeric Type",
+        "default": "Continuous",
+        "enum": [
+          "Continuous",
+          "Discrete"
+        ],
+        "type": "string"
+      },
+      "ScheduleUnitType": {
+        "title": "Unit Type",
+        "default": "Dimensionless",
+        "enum": [
+          "Dimensionless",
+          "Temperature",
+          "DeltaTemperature",
+          "PrecipitationRate",
+          "Angle",
+          "ConvectionCoefficient",
+          "ActivityLevel",
+          "Velocity",
+          "Capacity",
+          "Power",
+          "Availability",
+          "Percent",
+          "Control",
+          "Mode"
+        ],
+        "type": "string"
+      },
+      "ShadeLocation": {
+        "title": "Shade Location",
+        "description": "Text to indicate where in the window assembly the shade_material is located.  Note that the WindowConstruction must have at least one gas gap to use the \"Between\" option. Also note that, for a WindowConstruction with more than one gas gap, the \"Between\" option defalts to using the inner gap as this is the only option that EnergyPlus supports.",
+        "default": "Interior",
+        "enum": [
+          "Interior",
+          "Between",
+          "Exterior"
+        ],
+        "type": "string"
+      },
+      "ControlType": {
+        "title": "Control Type",
+        "description": "Text to indicate how the shading device is controlled, which determines when the shading is \u201con\u201d or \u201coff.\u201d",
+        "default": "AlwaysOn",
+        "enum": [
+          "AlwaysOn",
+          "OnIfHighSolarOnWindow",
+          "OnIfHighHorizontalSolar",
+          "OnIfHighOutdoorAirTemperature",
+          "OnIfHighZoneAirTemperature",
+          "OnIfHighZoneCooling",
+          "OnNightIfLowOutdoorTempAndOffDay",
+          "OnNightIfLowInsideTempAndOffDay",
+          "OnNightIfHeatingAndOffDay"
+        ],
+        "type": "string"
       }
     }
   }