Merge pull request #1698 from NREL/nrcan_3.7.0

Merging nrcan_3.7.0 into nrcan branch
NREL · Mar 1, 2024 · 214b1e1 · 214b1e1
2 parents 3345817 + 89f3e3d
commit 214b1e1
Show file tree

Hide file tree

Showing 267 changed files with 1,677,858 additions and 1,674,979 deletions.
diff --git a/lib/openstudio-standards/standards/necb/ECMS/hvac_systems.rb b/lib/openstudio-standards/standards/necb/ECMS/hvac_systems.rb
@@ -1907,10 +1907,10 @@ def add_ecm_hs14_cgshp_fancoils(model:,
 
     # add output variables  for district heating and cooling
     model.getOutputVariables.each {|ivar| ivar.remove}
-    dist_htg_var = OpenStudio::Model::OutputVariable.new("District Heating Hot Water Rate",model)
+    dist_htg_var = OpenStudio::Model::OutputVariable.new("District Heating Water Rate",model)
     dist_htg_var.setReportingFrequency("hourly")
     dist_htg_var.setKeyValue("*")
-    dist_clg_var = OpenStudio::Model::OutputVariable.new("District Cooling Chilled Water Rate",model)
+    dist_clg_var = OpenStudio::Model::OutputVariable.new("District Cooling Water Rate",model)
     dist_clg_var.setReportingFrequency("hourly")
     dist_clg_var.setKeyValue("*")
 
@@ -2029,9 +2029,9 @@ def set_ghx_loop_district_cap(model)
       case dist_htg_eqpts[0].iddObjectType.valueName.to_s
       when 'OS_DistrictHeating'
         dist_htg_eqpt = dist_htg_eqpts[0].to_DistrictHeating.get
-      when 'OS_DistrictHeatingWater'
+      when 'OS_DistrictHeating_Water'
         dist_htg_eqpt = dist_htg_eqpts[0].to_DistrictHeatingWater.get
-      when 'OS_DistrictHeatingSteam'
+      when 'OS_DistrictHeating_Steam'
         dist_htg_eqpt = dist_htg_eqpts[0].to_DistrictHeatingSteam.get
       end
     end
@@ -2040,7 +2040,7 @@ def set_ghx_loop_district_cap(model)
     raise("set_cond_loop_district_cap: condenser loop doesn't have a district heating and district cooling objects") if dist_htg_eqpts.empty? || dist_clg_eqpts.empty?
     # District Heating
     sql_command = "SELECT ReportVariableDataDictionaryIndex FROM ReportVariableDataDictionary
-               WHERE VariableName='District Heating Hot Water Rate'"
+               WHERE VariableName='District Heating Water Rate'"
     dhtg_index = model.sqlFile.get.execAndReturnFirstString(sql_command).get
     raise("set_ghx_loop_district_cap: EnergyPlus sql results file has no data for district heating hot water rate") if dhtg_index.nil?
     sql_command = "SELECT Value FROM ReportVariableWithTime
@@ -2051,7 +2051,7 @@ def set_ghx_loop_district_cap(model)
     dist_htg_s = model.sqlFile.get.execAndReturnVectorOfString(sql_command).get
     # District Cooling
     sql_command = "SELECT ReportVariableDataDictionaryIndex FROM ReportVariableDataDictionary
-               WHERE VariableName='District Cooling Chilled Water Rate'"
+               WHERE VariableName='District Cooling Water Rate'"
     dclg_index = model.sqlFile.get.execAndReturnFirstString(sql_command).get
     raise("set_ghx_loop_district_cap: EnergyPlus sql results file has no data for district cooling chilled water rate") if dclg_index.nil?
     sql_command = "SELECT Value FROM ReportVariableWithTime

diff --git a/...ant-BTAP1980TO2010-Electricity-CAN_AB_Calgary.Intl.AP.718770_CWEC2020_expected_result.osm b/...ant-BTAP1980TO2010-Electricity-CAN_AB_Calgary.Intl.AP.718770_CWEC2020_expected_result.osm
diff --git a/...rant-BTAP1980TO2010-NaturalGas-CAN_AB_Calgary.Intl.AP.718770_CWEC2020_expected_result.osm b/...rant-BTAP1980TO2010-NaturalGas-CAN_AB_Calgary.Intl.AP.718770_CWEC2020_expected_result.osm
diff --git a/...aurant-BTAPPRE1980-Electricity-CAN_AB_Calgary.Intl.AP.718770_CWEC2020_expected_result.osm b/...aurant-BTAPPRE1980-Electricity-CAN_AB_Calgary.Intl.AP.718770_CWEC2020_expected_result.osm
diff --git a/...taurant-BTAPPRE1980-NaturalGas-CAN_AB_Calgary.Intl.AP.718770_CWEC2020_expected_result.osm b/...taurant-BTAPPRE1980-NaturalGas-CAN_AB_Calgary.Intl.AP.718770_CWEC2020_expected_result.osm
diff --git a/...estaurant-NECB2011-Electricity-CAN_AB_Calgary.Intl.AP.718770_CWEC2020_expected_result.osm b/...estaurant-NECB2011-Electricity-CAN_AB_Calgary.Intl.AP.718770_CWEC2020_expected_result.osm
diff --git a/...CB2011-ElectricityHPElecBackup-CAN_AB_Calgary.Intl.AP.718770_CWEC2020_expected_result.osm b/...CB2011-ElectricityHPElecBackup-CAN_AB_Calgary.Intl.AP.718770_CWEC2020_expected_result.osm
diff --git a/...11-ElectricityHPGasBackupMixed-CAN_AB_Calgary.Intl.AP.718770_CWEC2020_expected_result.osm b/...11-ElectricityHPGasBackupMixed-CAN_AB_Calgary.Intl.AP.718770_CWEC2020_expected_result.osm
diff --git a/...Restaurant-NECB2011-NaturalGas-CAN_AB_Calgary.Intl.AP.718770_CWEC2020_expected_result.osm b/...Restaurant-NECB2011-NaturalGas-CAN_AB_Calgary.Intl.AP.718770_CWEC2020_expected_result.osm
diff --git a/...11-NaturalGasHPElecBackupMixed-CAN_AB_Calgary.Intl.AP.718770_CWEC2020_expected_result.osm b/...11-NaturalGasHPElecBackupMixed-CAN_AB_Calgary.Intl.AP.718770_CWEC2020_expected_result.osm
diff --git a/...NECB2011-NaturalGasHPGasBackup-CAN_AB_Calgary.Intl.AP.718770_CWEC2020_expected_result.osm b/...NECB2011-NaturalGasHPGasBackup-CAN_AB_Calgary.Intl.AP.718770_CWEC2020_expected_result.osm
diff --git a/...estaurant-NECB2017-Electricity-CAN_AB_Calgary.Intl.AP.718770_CWEC2020_expected_result.osm b/...estaurant-NECB2017-Electricity-CAN_AB_Calgary.Intl.AP.718770_CWEC2020_expected_result.osm
diff --git a/...CB2017-ElectricityHPElecBackup-CAN_AB_Calgary.Intl.AP.718770_CWEC2020_expected_result.osm b/...CB2017-ElectricityHPElecBackup-CAN_AB_Calgary.Intl.AP.718770_CWEC2020_expected_result.osm
diff --git a/...17-ElectricityHPGasBackupMixed-CAN_AB_Calgary.Intl.AP.718770_CWEC2020_expected_result.osm b/...17-ElectricityHPGasBackupMixed-CAN_AB_Calgary.Intl.AP.718770_CWEC2020_expected_result.osm
diff --git a/...Restaurant-NECB2017-NaturalGas-CAN_AB_Calgary.Intl.AP.718770_CWEC2020_expected_result.osm b/...Restaurant-NECB2017-NaturalGas-CAN_AB_Calgary.Intl.AP.718770_CWEC2020_expected_result.osm
diff --git a/...17-NaturalGasHPElecBackupMixed-CAN_AB_Calgary.Intl.AP.718770_CWEC2020_expected_result.osm b/...17-NaturalGasHPElecBackupMixed-CAN_AB_Calgary.Intl.AP.718770_CWEC2020_expected_result.osm
diff --git a/...NECB2017-NaturalGasHPGasBackup-CAN_AB_Calgary.Intl.AP.718770_CWEC2020_expected_result.osm b/...NECB2017-NaturalGasHPGasBackup-CAN_AB_Calgary.Intl.AP.718770_CWEC2020_expected_result.osm
diff --git a/...estaurant-NECB2020-Electricity-CAN_AB_Calgary.Intl.AP.718770_CWEC2020_expected_result.osm b/...estaurant-NECB2020-Electricity-CAN_AB_Calgary.Intl.AP.718770_CWEC2020_expected_result.osm
diff --git a/...CB2020-ElectricityHPElecBackup-CAN_AB_Calgary.Intl.AP.718770_CWEC2020_expected_result.osm b/...CB2020-ElectricityHPElecBackup-CAN_AB_Calgary.Intl.AP.718770_CWEC2020_expected_result.osm
diff --git a/...20-ElectricityHPGasBackupMixed-CAN_AB_Calgary.Intl.AP.718770_CWEC2020_expected_result.osm b/...20-ElectricityHPGasBackupMixed-CAN_AB_Calgary.Intl.AP.718770_CWEC2020_expected_result.osm
diff --git a/...Restaurant-NECB2020-NaturalGas-CAN_AB_Calgary.Intl.AP.718770_CWEC2020_expected_result.osm b/...Restaurant-NECB2020-NaturalGas-CAN_AB_Calgary.Intl.AP.718770_CWEC2020_expected_result.osm
diff --git a/...20-NaturalGasHPElecBackupMixed-CAN_AB_Calgary.Intl.AP.718770_CWEC2020_expected_result.osm b/...20-NaturalGasHPElecBackupMixed-CAN_AB_Calgary.Intl.AP.718770_CWEC2020_expected_result.osm
diff --git a/...NECB2020-NaturalGasHPGasBackup-CAN_AB_Calgary.Intl.AP.718770_CWEC2020_expected_result.osm b/...NECB2020-NaturalGasHPGasBackup-CAN_AB_Calgary.Intl.AP.718770_CWEC2020_expected_result.osm
diff --git a/...ent-BTAP1980TO2010-Electricity-CAN_AB_Calgary.Intl.AP.718770_CWEC2020_expected_result.osm b/...ent-BTAP1980TO2010-Electricity-CAN_AB_Calgary.Intl.AP.718770_CWEC2020_expected_result.osm
diff --git a/...ment-BTAP1980TO2010-NaturalGas-CAN_AB_Calgary.Intl.AP.718770_CWEC2020_expected_result.osm b/...ment-BTAP1980TO2010-NaturalGas-CAN_AB_Calgary.Intl.AP.718770_CWEC2020_expected_result.osm
diff --git a/...rtment-BTAPPRE1980-Electricity-CAN_AB_Calgary.Intl.AP.718770_CWEC2020_expected_result.osm b/...rtment-BTAPPRE1980-Electricity-CAN_AB_Calgary.Intl.AP.718770_CWEC2020_expected_result.osm
diff --git a/...artment-BTAPPRE1980-NaturalGas-CAN_AB_Calgary.Intl.AP.718770_CWEC2020_expected_result.osm b/...artment-BTAPPRE1980-NaturalGas-CAN_AB_Calgary.Intl.AP.718770_CWEC2020_expected_result.osm
diff --git a/...Apartment-NECB2011-Electricity-CAN_AB_Calgary.Intl.AP.718770_CWEC2020_expected_result.osm b/...Apartment-NECB2011-Electricity-CAN_AB_Calgary.Intl.AP.718770_CWEC2020_expected_result.osm
diff --git a/...CB2011-ElectricityHPElecBackup-CAN_AB_Calgary.Intl.AP.718770_CWEC2020_expected_result.osm b/...CB2011-ElectricityHPElecBackup-CAN_AB_Calgary.Intl.AP.718770_CWEC2020_expected_result.osm
diff --git a/...11-ElectricityHPGasBackupMixed-CAN_AB_Calgary.Intl.AP.718770_CWEC2020_expected_result.osm b/...11-ElectricityHPGasBackupMixed-CAN_AB_Calgary.Intl.AP.718770_CWEC2020_expected_result.osm
diff --git a/...eApartment-NECB2011-NaturalGas-CAN_AB_Calgary.Intl.AP.718770_CWEC2020_expected_result.osm b/...eApartment-NECB2011-NaturalGas-CAN_AB_Calgary.Intl.AP.718770_CWEC2020_expected_result.osm
diff --git a/...11-NaturalGasHPElecBackupMixed-CAN_AB_Calgary.Intl.AP.718770_CWEC2020_expected_result.osm b/...11-NaturalGasHPElecBackupMixed-CAN_AB_Calgary.Intl.AP.718770_CWEC2020_expected_result.osm
diff --git a/...NECB2011-NaturalGasHPGasBackup-CAN_AB_Calgary.Intl.AP.718770_CWEC2020_expected_result.osm b/...NECB2011-NaturalGasHPGasBackup-CAN_AB_Calgary.Intl.AP.718770_CWEC2020_expected_result.osm
diff --git a/...Apartment-NECB2017-Electricity-CAN_AB_Calgary.Intl.AP.718770_CWEC2020_expected_result.osm b/...Apartment-NECB2017-Electricity-CAN_AB_Calgary.Intl.AP.718770_CWEC2020_expected_result.osm
diff --git a/...CB2017-ElectricityHPElecBackup-CAN_AB_Calgary.Intl.AP.718770_CWEC2020_expected_result.osm b/...CB2017-ElectricityHPElecBackup-CAN_AB_Calgary.Intl.AP.718770_CWEC2020_expected_result.osm
diff --git a/...17-ElectricityHPGasBackupMixed-CAN_AB_Calgary.Intl.AP.718770_CWEC2020_expected_result.osm b/...17-ElectricityHPGasBackupMixed-CAN_AB_Calgary.Intl.AP.718770_CWEC2020_expected_result.osm