Merge pull request #1491 from NREL/nrcan

Including changes in nrcan branch.
NREL · Apr 4, 2023 · 873be55 · 873be55
2 parents 49266ba + c16ec80
commit 873be55
Show file tree

Hide file tree

Showing 123 changed files with 695,938 additions and 689,444 deletions.
diff --git a/lib/openstudio-standards/standards/necb/BTAP1980TO2010/data/space_types.json b/lib/openstudio-standards/standards/necb/BTAP1980TO2010/data/space_types.json
diff --git a/lib/openstudio-standards/standards/necb/BTAPPRE1980/data/space_types.json b/lib/openstudio-standards/standards/necb/BTAPPRE1980/data/space_types.json
diff --git a/lib/openstudio-standards/standards/necb/NECB2011/data/space_type_unit_definitions.txt b/lib/openstudio-standards/standards/necb/NECB2011/data/space_type_unit_definitions.txt
@@ -21,7 +21,8 @@
           "high_bay_lighting_schedule":
           "specialty_lighting_schedule":
           "exit_lighting_schedule":
-          "target_illuminance_setpoint":
+          "target_illuminance_setpoint": lux
+          "target_illuminance_setpoint_ref":
           "psa_nongeometry_fraction":
           "ssa_nongeometry_fraction":
           "ventilation_standard":

diff --git a/lib/openstudio-standards/standards/necb/NECB2011/data/space_types.json b/lib/openstudio-standards/standards/necb/NECB2011/data/space_types.json
diff --git a/lib/openstudio-standards/standards/necb/NECB2011/necb_2011.rb b/lib/openstudio-standards/standards/necb/NECB2011/necb_2011.rb
diff --git a/lib/openstudio-standards/standards/necb/NECB2015/data/space_types.json b/lib/openstudio-standards/standards/necb/NECB2015/data/space_types.json
diff --git a/lib/openstudio-standards/standards/necb/NECB2017/data/space_types.json b/lib/openstudio-standards/standards/necb/NECB2017/data/space_types.json
diff --git a/lib/openstudio-standards/standards/necb/NECB2020/data/space_types.json b/lib/openstudio-standards/standards/necb/NECB2020/data/space_types.json
diff --git a/lib/openstudio-standards/standards/necb/common/btap_datapoint.rb b/lib/openstudio-standards/standards/necb/common/btap_datapoint.rb
@@ -226,7 +226,7 @@ def initialize(input_folder: nil,
         model.setSqlFile(sql)
 
         @cost_result = nil
-        if @options[:enable_costing] == true
+        if defined?(BTAPCosting)
           # Perform costing
           costing = BTAPCosting.new
           costing.load_database

diff --git a/...ool-BTAP1980TO2010-Electricity-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm b/...ool-BTAP1980TO2010-Electricity-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm
diff --git a/...hool-BTAP1980TO2010-NaturalGas-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm b/...hool-BTAP1980TO2010-NaturalGas-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm
diff --git a/...School-BTAPPRE1980-Electricity-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm b/...School-BTAPPRE1980-Electricity-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm
diff --git a/...ySchool-BTAPPRE1980-NaturalGas-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm b/...ySchool-BTAPPRE1980-NaturalGas-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm
diff --git a/...arySchool-NECB2011-Electricity-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm b/...arySchool-NECB2011-Electricity-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm
diff --git a/...CB2011-ElectricityHPElecBackup-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm b/...CB2011-ElectricityHPElecBackup-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm
diff --git a/...11-ElectricityHPGasBackupMixed-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm b/...11-ElectricityHPGasBackupMixed-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm
diff --git a/...marySchool-NECB2011-NaturalGas-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm b/...marySchool-NECB2011-NaturalGas-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm
diff --git a/...11-NaturalGasHPElecBackupMixed-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm b/...11-NaturalGasHPElecBackupMixed-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm
diff --git a/...NECB2011-NaturalGasHPGasBackup-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm b/...NECB2011-NaturalGasHPGasBackup-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm
diff --git a/...arySchool-NECB2017-Electricity-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm b/...arySchool-NECB2017-Electricity-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm
diff --git a/...CB2017-ElectricityHPElecBackup-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm b/...CB2017-ElectricityHPElecBackup-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm
diff --git a/...17-ElectricityHPGasBackupMixed-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm b/...17-ElectricityHPGasBackupMixed-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm
diff --git a/...marySchool-NECB2017-NaturalGas-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm b/...marySchool-NECB2017-NaturalGas-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm
diff --git a/...17-NaturalGasHPElecBackupMixed-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm b/...17-NaturalGasHPElecBackupMixed-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm
diff --git a/...NECB2017-NaturalGasHPGasBackup-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm b/...NECB2017-NaturalGasHPGasBackup-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm
diff --git a/...arySchool-NECB2020-Electricity-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm b/...arySchool-NECB2020-Electricity-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm
diff --git a/...CB2020-ElectricityHPElecBackup-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm b/...CB2020-ElectricityHPElecBackup-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm
diff --git a/...20-ElectricityHPGasBackupMixed-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm b/...20-ElectricityHPGasBackupMixed-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm
diff --git a/...marySchool-NECB2020-NaturalGas-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm b/...marySchool-NECB2020-NaturalGas-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm
diff --git a/...20-NaturalGasHPElecBackupMixed-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm b/...20-NaturalGasHPElecBackupMixed-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm
diff --git a/...NECB2020-NaturalGasHPGasBackup-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm b/...NECB2020-NaturalGasHPGasBackup-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm
diff --git a/...one-BTAP1980TO2010-Electricity-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm b/...one-BTAP1980TO2010-Electricity-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm
diff --git a/...lone-BTAP1980TO2010-NaturalGas-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm b/...lone-BTAP1980TO2010-NaturalGas-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm
diff --git a/...dalone-BTAPPRE1980-Electricity-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm b/...dalone-BTAPPRE1980-Electricity-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm
diff --git a/...ndalone-BTAPPRE1980-NaturalGas-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm b/...ndalone-BTAPPRE1980-NaturalGas-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm
diff --git a/...tandalone-NECB2011-Electricity-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm b/...tandalone-NECB2011-Electricity-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm
diff --git a/...CB2011-ElectricityHPElecBackup-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm b/...CB2011-ElectricityHPElecBackup-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm
diff --git a/...11-ElectricityHPGasBackupMixed-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm b/...11-ElectricityHPGasBackupMixed-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm
diff --git a/...Standalone-NECB2011-NaturalGas-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm b/...Standalone-NECB2011-NaturalGas-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm
diff --git a/...11-NaturalGasHPElecBackupMixed-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm b/...11-NaturalGasHPElecBackupMixed-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm
diff --git a/...NECB2011-NaturalGasHPGasBackup-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm b/...NECB2011-NaturalGasHPGasBackup-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm
diff --git a/...tandalone-NECB2017-Electricity-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm b/...tandalone-NECB2017-Electricity-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm
diff --git a/...CB2017-ElectricityHPElecBackup-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm b/...CB2017-ElectricityHPElecBackup-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm
diff --git a/...17-ElectricityHPGasBackupMixed-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm b/...17-ElectricityHPGasBackupMixed-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm
diff --git a/...Standalone-NECB2017-NaturalGas-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm b/...Standalone-NECB2017-NaturalGas-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm
diff --git a/...17-NaturalGasHPElecBackupMixed-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm b/...17-NaturalGasHPElecBackupMixed-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm
diff --git a/...NECB2017-NaturalGasHPGasBackup-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm b/...NECB2017-NaturalGasHPGasBackup-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm
diff --git a/...tandalone-NECB2020-Electricity-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm b/...tandalone-NECB2020-Electricity-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm
diff --git a/...CB2020-ElectricityHPElecBackup-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm b/...CB2020-ElectricityHPElecBackup-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm
diff --git a/...20-ElectricityHPGasBackupMixed-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm b/...20-ElectricityHPGasBackupMixed-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm
diff --git a/...Standalone-NECB2020-NaturalGas-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm b/...Standalone-NECB2020-NaturalGas-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm
diff --git a/...20-NaturalGasHPElecBackupMixed-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm b/...20-NaturalGasHPElecBackupMixed-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm
diff --git a/...NECB2020-NaturalGasHPGasBackup-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm b/...NECB2020-NaturalGasHPGasBackup-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm
diff --git a/...ool-BTAP1980TO2010-Electricity-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm b/...ool-BTAP1980TO2010-Electricity-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm
diff --git a/...hool-BTAP1980TO2010-NaturalGas-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm b/...hool-BTAP1980TO2010-NaturalGas-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm
diff --git a/...School-BTAPPRE1980-Electricity-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm b/...School-BTAPPRE1980-Electricity-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm
diff --git a/...ySchool-BTAPPRE1980-NaturalGas-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm b/...ySchool-BTAPPRE1980-NaturalGas-CAN_AB_Calgary.Intl.AP.718770_CWEC2016_expected_result.osm