Merge pull request #1210 from NREL/901_2016_2019

Add 90.1-2019 prototypes
NREL · Sep 23, 2021 · 9b2e994 · 9b2e994
2 parents d35ebfc + 06cba03
commit 9b2e994
Show file tree

Hide file tree

Showing 331 changed files with 2,443,858 additions and 2,128,710 deletions.
diff --git a/data/geometry/ASHRAEMidriseApartment.json b/data/geometry/ASHRAEMidriseApartment.json
@@ -1,9 +1,9 @@
 [
   {
-    "type": "SAC",
+    "type": "PSZ-AC",
     "operation_schedule": "ApartmentMidRise All On",
     "oa_damper_schedule": "ApartmentMidRise COMPACT HVAC-ALWAYS 1",
-    "fan_type": "ConstantVolume",
+    "fan_type": "Cycling",
     "cooling_type": "Single Speed DX AC",
     "heating_type": "Gas",
     "supplemental_heating_type": "Gas",
@@ -12,10 +12,10 @@
     ]
   },
   {
-    "type": "SAC",
+    "type": "PSZ-AC",
     "operation_schedule": "ApartmentMidRise All On",
     "oa_damper_schedule": "ApartmentMidRise COMPACT HVAC-ALWAYS 1",
-    "fan_type": "ConstantVolume",
+    "fan_type": "Cycling",
     "cooling_type": "Single Speed DX AC",
     "heating_type": "Gas",
     "supplemental_heating_type": "Gas",
@@ -24,10 +24,10 @@
     ]
   },
   {
-    "type": "SAC",
+    "type": "PSZ-AC",
     "operation_schedule": "ApartmentMidRise All On",
     "oa_damper_schedule": "ApartmentMidRise COMPACT HVAC-ALWAYS 1",
-    "fan_type": "ConstantVolume",
+    "fan_type": "Cycling",
     "cooling_type": "Single Speed DX AC",
     "heating_type": "Gas",
     "supplemental_heating_type": "Gas",
@@ -36,10 +36,10 @@
     ]
   },
   {
-    "type": "SAC",
+    "type": "PSZ-AC",
     "operation_schedule": "ApartmentMidRise All On",
     "oa_damper_schedule": "ApartmentMidRise COMPACT HVAC-ALWAYS 1",
-    "fan_type": "ConstantVolume",
+    "fan_type": "Cycling",
     "cooling_type": "Single Speed DX AC",
     "heating_type": "Gas",
     "supplemental_heating_type": "Gas",
@@ -48,10 +48,10 @@
     ]
   },
   {
-    "type": "SAC",
+    "type": "PSZ-AC",
     "operation_schedule": "ApartmentMidRise All On",
     "oa_damper_schedule": "ApartmentMidRise COMPACT HVAC-ALWAYS 1",
-    "fan_type": "ConstantVolume",
+    "fan_type": "Cycling",
     "cooling_type": "Single Speed DX AC",
     "heating_type": "Gas",
     "supplemental_heating_type": "Gas",
@@ -60,10 +60,10 @@
     ]
   },
   {
-    "type": "SAC",
+    "type": "PSZ-AC",
     "operation_schedule": "ApartmentMidRise All On",
     "oa_damper_schedule": "ApartmentMidRise COMPACT HVAC-ALWAYS 1",
-    "fan_type": "ConstantVolume",
+    "fan_type": "Cycling",
     "cooling_type": "Single Speed DX AC",
     "heating_type": "Gas",
     "supplemental_heating_type": "Gas",
@@ -72,10 +72,10 @@
     ]
   },
   {
-    "type": "SAC",
+    "type": "PSZ-AC",
     "operation_schedule": "ApartmentMidRise All On",
     "oa_damper_schedule": "ApartmentMidRise COMPACT HVAC-ALWAYS 1",
-    "fan_type": "ConstantVolume",
+    "fan_type": "Cycling",
     "cooling_type": "Single Speed DX AC",
     "heating_type": "Gas",
     "supplemental_heating_type": "Gas",
@@ -84,10 +84,10 @@
     ]
   },
   {
-    "type": "SAC",
+    "type": "PSZ-AC",
     "operation_schedule": "ApartmentMidRise All On",
     "oa_damper_schedule": "ApartmentMidRise COMPACT HVAC-ALWAYS 1",
-    "fan_type": "ConstantVolume",
+    "fan_type": "Cycling",
     "cooling_type": "Single Speed DX AC",
     "heating_type": "Gas",
     "supplemental_heating_type": "Gas",
@@ -96,10 +96,10 @@
     ]
   },
   {
-    "type": "SAC",
+    "type": "PSZ-AC",
     "operation_schedule": "ApartmentMidRise All On",
     "oa_damper_schedule": "ApartmentMidRise COMPACT HVAC-ALWAYS 1",
-    "fan_type": "ConstantVolume",
+    "fan_type": "Cycling",
     "cooling_type": "Single Speed DX AC",
     "heating_type": "Gas",
     "supplemental_heating_type": "Gas",
@@ -108,10 +108,10 @@
     ]
   },
   {
-    "type": "SAC",
+    "type": "PSZ-AC",
     "operation_schedule": "ApartmentMidRise All On",
     "oa_damper_schedule": "ApartmentMidRise COMPACT HVAC-ALWAYS 1",
-    "fan_type": "ConstantVolume",
+    "fan_type": "Cycling",
     "cooling_type": "Single Speed DX AC",
     "heating_type": "Gas",
     "supplemental_heating_type": "Gas",
@@ -120,10 +120,10 @@
     ]
   },
   {
-    "type": "SAC",
+    "type": "PSZ-AC",
     "operation_schedule": "ApartmentMidRise All On",
     "oa_damper_schedule": "ApartmentMidRise COMPACT HVAC-ALWAYS 1",
-    "fan_type": "ConstantVolume",
+    "fan_type": "Cycling",
     "cooling_type": "Single Speed DX AC",
     "heating_type": "Gas",
     "supplemental_heating_type": "Gas",
@@ -132,10 +132,10 @@
     ]
   },
   {
-    "type": "SAC",
+    "type": "PSZ-AC",
     "operation_schedule": "ApartmentMidRise All On",
     "oa_damper_schedule": "ApartmentMidRise COMPACT HVAC-ALWAYS 1",
-    "fan_type": "ConstantVolume",
+    "fan_type": "Cycling",
     "cooling_type": "Single Speed DX AC",
     "heating_type": "Gas",
     "supplemental_heating_type": "Gas",
@@ -144,10 +144,10 @@
     ]
   },
   {
-    "type": "SAC",
+    "type": "PSZ-AC",
     "operation_schedule": "ApartmentMidRise All On",
     "oa_damper_schedule": "ApartmentMidRise COMPACT HVAC-ALWAYS 1",
-    "fan_type": "ConstantVolume",
+    "fan_type": "Cycling",
     "cooling_type": "Single Speed DX AC",
     "heating_type": "Gas",
     "supplemental_heating_type": "Gas",
@@ -156,10 +156,10 @@
     ]
   },
   {
-    "type": "SAC",
+    "type": "PSZ-AC",
     "operation_schedule": "ApartmentMidRise All On",
     "oa_damper_schedule": "ApartmentMidRise COMPACT HVAC-ALWAYS 1",
-    "fan_type": "ConstantVolume",
+    "fan_type": "Cycling",
     "cooling_type": "Single Speed DX AC",
     "heating_type": "Gas",
     "supplemental_heating_type": "Gas",
@@ -168,10 +168,10 @@
     ]
   },
   {
-    "type": "SAC",
+    "type": "PSZ-AC",
     "operation_schedule": "ApartmentMidRise All On",
     "oa_damper_schedule": "ApartmentMidRise COMPACT HVAC-ALWAYS 1",
-    "fan_type": "ConstantVolume",
+    "fan_type": "Cycling",
     "cooling_type": "Single Speed DX AC",
     "heating_type": "Gas",
     "supplemental_heating_type": "Gas",
@@ -180,10 +180,10 @@
     ]
   },
   {
-    "type": "SAC",
+    "type": "PSZ-AC",
     "operation_schedule": "ApartmentMidRise All On",
     "oa_damper_schedule": "ApartmentMidRise COMPACT HVAC-ALWAYS 1",
-    "fan_type": "ConstantVolume",
+    "fan_type": "Cycling",
     "cooling_type": "Single Speed DX AC",
     "heating_type": "Gas",
     "supplemental_heating_type": "Gas",
@@ -192,10 +192,10 @@
     ]
   },
   {
-    "type": "SAC",
+    "type": "PSZ-AC",
     "operation_schedule": "ApartmentMidRise All On",
     "oa_damper_schedule": "ApartmentMidRise COMPACT HVAC-ALWAYS 1",
-    "fan_type": "ConstantVolume",
+    "fan_type": "Cycling",
     "cooling_type": "Single Speed DX AC",
     "heating_type": "Gas",
     "supplemental_heating_type": "Gas",
@@ -204,10 +204,10 @@
     ]
   },
   {
-    "type": "SAC",
+    "type": "PSZ-AC",
     "operation_schedule": "ApartmentMidRise All On",
     "oa_damper_schedule": "ApartmentMidRise COMPACT HVAC-ALWAYS 1",
-    "fan_type": "ConstantVolume",
+    "fan_type": "Cycling",
     "cooling_type": "Single Speed DX AC",
     "heating_type": "Gas",
     "supplemental_heating_type": "Gas",
@@ -216,10 +216,10 @@
     ]
   },
   {
-    "type": "SAC",
+    "type": "PSZ-AC",
     "operation_schedule": "ApartmentMidRise All On",
     "oa_damper_schedule": "ApartmentMidRise COMPACT HVAC-ALWAYS 1",
-    "fan_type": "ConstantVolume",
+    "fan_type": "Cycling",
     "cooling_type": "Single Speed DX AC",
     "heating_type": "Gas",
     "supplemental_heating_type": "Gas",
@@ -228,10 +228,10 @@
     ]
   },
   {
-    "type": "SAC",
+    "type": "PSZ-AC",
     "operation_schedule": "ApartmentMidRise All On",
     "oa_damper_schedule": "ApartmentMidRise COMPACT HVAC-ALWAYS 1",
-    "fan_type": "ConstantVolume",
+    "fan_type": "Cycling",
     "cooling_type": "Single Speed DX AC",
     "heating_type": "Gas",
     "supplemental_heating_type": "Gas",
@@ -240,10 +240,10 @@
     ]
   },
   {
-    "type": "SAC",
+    "type": "PSZ-AC",
     "operation_schedule": "ApartmentMidRise All On",
     "oa_damper_schedule": "ApartmentMidRise COMPACT HVAC-ALWAYS 1",
-    "fan_type": "ConstantVolume",
+    "fan_type": "Cycling",
     "cooling_type": "Single Speed DX AC",
     "heating_type": "Gas",
     "supplemental_heating_type": "Gas",
@@ -252,10 +252,10 @@
     ]
   },
   {
-    "type": "SAC",
+    "type": "PSZ-AC",
     "operation_schedule": "ApartmentMidRise All On",
     "oa_damper_schedule": "ApartmentMidRise COMPACT HVAC-ALWAYS 1",
-    "fan_type": "ConstantVolume",
+    "fan_type": "Cycling",
     "cooling_type": "Single Speed DX AC",
     "heating_type": "Gas",
     "supplemental_heating_type": "Gas",
@@ -264,10 +264,10 @@
     ]
   },
   {
-    "type": "SAC",
+    "type": "PSZ-AC",
     "operation_schedule": "ApartmentMidRise All On",
     "oa_damper_schedule": "ApartmentMidRise COMPACT HVAC-ALWAYS 1",
-    "fan_type": "ConstantVolume",
+    "fan_type": "Cycling",
     "cooling_type": "Single Speed DX AC",
     "heating_type": "Gas",
     "supplemental_heating_type": "Gas",
@@ -276,7 +276,7 @@
     ]
   },
   {
-    "type": "SAC",
+    "type": "PSZ-AC",
     "operation_schedule": "ApartmentMidRise All On",
     "oa_damper_schedule": "ApartmentMidRise COMPACT HVAC-ALWAYS 1",
     "fan_type": "ConstantVolume",

diff --git a/data/standards/manage_OpenStudio_Standards.rb b/data/standards/manage_OpenStudio_Standards.rb
@@ -98,6 +98,8 @@ def unique_properties(sheet_name)
            ['template', 'fluid_type', 'fuel_type', 'condensing', 'condensing_control', 'minimum_capacity', 'maximum_capacity', 'start_date', 'end_date']
          when 'chillers'
            ['template', 'cooling_type', 'condenser_type', 'compressor_type', 'absorption_type', 'variable_speed_drive', 'minimum_capacity', 'maximum_capacity', 'start_date', 'end_date']
+         when 'furnaces'
+           ['template', 'minimum_capacity', 'maximum_capacity', 'start_date', 'end_date']
          when 'heat_rejection'
            ['template', 'equipment_type', 'fan_type', 'start_date', 'end_date']
          when 'water_source_heat_pumps'
@@ -143,7 +145,7 @@ def unique_properties(sheet_name)
          when 'climate_zones'
            ['name', 'standard']
          when 'energy_recovery'
-           ['template', 'climate_zone', 'under_8000_hours']
+           ['template', 'climate_zone', 'under_8000_hours', 'nontransient_dwelling', 'enthalpy_recovery_ratio_design_conditions']
          when 'space_types_lighting_control'
            ['template', 'building_type', 'space_type']
          else
@@ -294,6 +296,7 @@ def export_spreadsheet_to_json(spreadsheet_titles, dataset_type: 'os_stds')
   bool_cols << 'hx'
   bool_cols << 'data_center'
   bool_cols << 'under_8000_hours'
+  bool_cols << 'nontransient_dwelling'
   bool_cols << 'u_value_includes_interior_film_coefficient'
   bool_cols << 'u_value_includes_exterior_film_coefficient'
 

diff --git a/data/standards/metadata_units_OpenStudio_Standards-ashrae_90_1.csv b/data/standards/metadata_units_OpenStudio_Standards-ashrae_90_1.csv
@@ -282,6 +282,15 @@ boilers,minimum_thermal_efficiency,%
 boilers,minimum_combustion_efficiency,%
 boilers,efffplr,
 boilers,notes,
+furnaces,template,
+furnaces,minimum_capacity,Btu/hr
+furnaces,maximum_capacity,Btu/hr
+furnaces,start_date,
+furnaces,end_date,
+furnaces,minimum_annual_fuel_utilization_efficiency,AFUE
+furnaces,minimum_thermal_efficiency,%
+furnaces,minimum_combustion_efficiency,%
+furnaces,notes,
 chillers,template,
 chillers,cooling_type,
 chillers,condenser_type,