openstudio-common-measures 0.12.3 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6fc54ceaa02693faa0c67c4cd257777bbd28498d841a37aad3abcd944c5168ce
-  data.tar.gz: f155ff913f9da9cbf00268c5fab4a9d8e29b6bfd843dd1a5a58c1cfbc8b12c43
+  metadata.gz: a1f2ca1aec36285d2410b717985e5ea6883e7415f3d3664219dab2c92288bade
+  data.tar.gz: d286c38f2287f1fb5136eb6e348f6e158dbeb9df056dca48d7668321ac1ba8ab
 SHA512:
-  metadata.gz: aec3f379bf56b66205c93ca98ca32f0ec0ce56095a6e426cf68f9dada85bd41944faa72ef665c9b6e763a958c44157a833a8456041300690a40e03f33da7a5f2
-  data.tar.gz: 8984854de6cec5eee0e528d2183a02727adcdae289d088e3874be74ba2bd2de178717adaefd33a304554c131d5d3b4b17ea3cae96503c9f71a7adfc6d8f6ec2b
+  metadata.gz: 5e42117348fcf33d322ff8f2ef9f6b58cb40dbe4d2ea594cc1486249691c09eb6b653194fcdb10ecccdfda4f6b9ae964a3fb0e5a80116c87b65ad0aadbbc85f2
+  data.tar.gz: 252e2a7f0ac9ceba93aba3e01a90a621fe7e59de22c746c46b2bd5bc8a8ef6694c753c8858a3e0fd64641ca8cdeb388a22a7e1b75eba67b5fe2814b6296f7a9a

data/.github/workflows/test_with_openstudio.yml

@@ -12,12 +12,12 @@ jobs:
       S3_BUCKET: ext-gem-dashboard
 
     container: # Define the Docker container for the job. All subsequent steps run inside it.
-      image: nrel/openstudio:3.10.0
+      image: nrel/openstudio:dev-3.11.0-rc3
       options: -u root -e "LANG=en_US.UTF-8" # These options are passed to the 'docker run' command internally
 
     steps:
       - name: Checkout Repository
-        # The repository will be checked out inside the 'nrel/openstudio:3.10.0' container
+        # The repository will be checked out inside the 'nrel/openstudio:3.11.0' container
         uses: actions/checkout@v4 # Use v4 for better security and features
         with:
           submodules: true # Set to true if your repository uses Git submodules
@@ -39,7 +39,7 @@ jobs:
           apt-get install -y nodejs
 
           # Install AWS CLI v2
-          curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
+          curl --retry 5 --retry-connrefused "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
           unzip awscliv2.zip
           ./aws/install
 
@@ -56,7 +56,7 @@ jobs:
         shell: bash # Specify the shell if needed, though bash is default for Ubuntu runners
         run: |
           # Fix git ownership issue in container
-          git config --global --add safe.directory /__w/openstudio-load-flexibility-measures-gem/openstudio-load-flexibility-measures-gem
+          git config --global --add safe.directory /__w/openstudio-common-measures-gem/openstudio-common-measures-gem
           
           echo "OpenStudio Version: $(openstudio --version)"
           echo "Ruby Version: $(ruby -v)"
@@ -79,6 +79,7 @@ jobs:
           ls -al ./test # Verify the output directory exists and contains files
 
       - name: Configure AWS Credentials
+        if: success() || failure()
         # This step is crucial for authenticating with AWS S3
         uses: aws-actions/configure-aws-credentials@v4 # Use v4 for updated features
         with:
@@ -87,6 +88,7 @@ jobs:
           aws-region: ${{ secrets.AWS_DEFAULT_REGION }} # Replace with your AWS region, e.g., us-east-1
 
       - name: Sync files to S3 with branch and build in path
+        if: success() || failure()
         shell: bash
         run: |
           echo "Deploying to s3://${{ env.S3_BUCKET }}/${{ env.DEPLOY_PATH }}/"
@@ -102,7 +104,8 @@ jobs:
           echo dir_name=$dir_name >> $GITHUB_ENV # Save the directory name to an environment variable for later use
 
       - name: Archive static site as artifact
+        if: always()
         uses: actions/upload-artifact@v4
         with:
           name: static-html-artifact
-          path: ${{ env.dir_name }} # Path should be relative to the GitHub workspace, which is shared with the container          
+          path: ${{ env.dir_name }} # Path should be relative to the GitHub workspace, which is shared with the container          

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # OpenStudio Common Measures Gem
 
+## Version 0.13.0
+- Updated dependency (openstudio-extension gem 0.9.3 to 0.9.7)
+- Updated dependency (openstudio-standards gem 0.8.2 to 0.8.5)
+
 ## Version 0.12.3
 - Update dependency: `openstudio-extension` upgraded from `~> 0.9.2` to `~> 0.9.3`.
 

data/README.md

@@ -38,6 +38,7 @@ bundle exec rake openstudio:test_with_openstudio
 
 |OpenStudio Common Measures Gem|OpenStudio|Ruby|
 |:--------------:|:----------:|:--------:|
+| 0.13.0         | 3.11     | 3.2.2     |
 | 0.12.3         | 3.10      | 3.2.2    |
 | 0.12.2         | 3.10      | 3.2.2    |
 | 0.12.1         | 3.10      | 3.2.2    |

data/lib/measures/generic_qaqc/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.1</schema_version>
   <name>generic_qaqc</name>
   <uid>d58d6b29-69ba-4915-b907-3c2c37ddb7c7</uid>
-  <version_id>cd027531-07d3-47a6-a25d-19e8a28403ff</version_id>
-  <version_modified>2025-08-08T03:48:28Z</version_modified>
+  <version_id>32960d7f-45bd-4502-acf7-841d0ea28524</version_id>
+  <version_modified>2026-06-08T06:43:45Z</version_modified>
   <xml_checksum>0A3BF61C</xml_checksum>
   <class_name>GenericQAQC</class_name>
   <display_name>Generic QAQC</display_name>
@@ -450,7 +450,7 @@
       <version>
         <software_program>OpenStudio</software_program>
         <identifier>2.0.0</identifier>
-        <min_compatible>3.8.0</min_compatible>
+        <min_compatible>3.11.0</min_compatible>
       </version>
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
@@ -521,13 +521,13 @@
       <filename>check_mech_sys_efficiency.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>E470E5E3</checksum>
+      <checksum>366300C3</checksum>
     </file>
     <file>
       <filename>check_mech_sys_part_load_eff.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>B6AC9F08</checksum>
+      <checksum>8366CC75</checksum>
     </file>
     <file>
       <filename>check_mech_sys_type.rb</filename>

data/lib/measures/generic_qaqc/resources/check_mech_sys_efficiency.rb

@@ -234,7 +234,7 @@ module OsLib_QAQC
         if use_old_gem_code
           motor_bhp = component.brake_horsepower
         else
-          motor_bhp = std.pump_brake_horsepower(component)
+          motor_bhp = OpenstudioStandards::HVAC.pump_get_brake_horsepower(component)
         end
         next if motor_bhp == 0.0
         if use_old_gem_code
@@ -260,7 +260,7 @@ module OsLib_QAQC
         if use_old_gem_code
           motor_bhp = component.brake_horsepower
         else
-          motor_bhp = std.pump_brake_horsepower(component)
+          motor_bhp = OpenstudioStandards::HVAC.pump_get_brake_horsepower(component)
         end
         next if motor_bhp == 0.0
         if use_old_gem_code

data/lib/measures/generic_qaqc/resources/check_mech_sys_part_load_eff.rb

@@ -59,7 +59,7 @@ module OsLib_QAQC
         # get curve and evaluate
         electric_input_to_cooling_output_ratio_function_of_PLR = component.electricInputToCoolingOutputRatioFunctionOfPLR
         curve_40_pct = electric_input_to_cooling_output_ratio_function_of_PLR.evaluate(0.4)
-        curve_80_pct = electric_input_to_cooling_output_ratio_function_of_PLR.evaluate(0.8)
+        curve_80_pct = electric_input_to_cooling_output_ratio_function_of_PLR.evaluate(0.8)    
 
         # find ac properties
         if use_old_gem_code
@@ -110,7 +110,7 @@ module OsLib_QAQC
         if use_old_gem_code
           capacity_w = component.find_capacity
         else
-          capacity_w = std.chiller_electric_eir_find_capacity(component)
+          capacity_w = OpenstudioStandards::HVAC.chiller_electric_get_capacity(component)
         end
         capacity_tons = OpenStudio.convert(capacity_w, 'W', 'ton').get
 
@@ -172,7 +172,7 @@ module OsLib_QAQC
         if use_old_gem_code
           capacity_w = component.find_capacity
         else
-          capacity_w = std.coil_cooling_dx_single_speed_find_capacity(component)
+          capacity_w = OpenstudioStandards::HVAC.coil_cooling_dx_single_speed_get_capacity(component)
         end
         capacity_btu_per_hr = OpenStudio.convert(capacity_w, 'W', 'Btu/hr').get
 
@@ -183,7 +183,7 @@ module OsLib_QAQC
             ac_props = component.model.find_object($os_standards['unitary_acs'], search_criteria, capacity_btu_per_hr, Date.today)
           end
         else
-          if std.coil_dx_heat_pump?(component)
+          if OpenstudioStandards::HVAC.coil_dx_heat_pump?(component)
             ac_props = std.model_find_object(std.standards_data['heat_pumps'], search_criteria, capacity_btu_per_hr, Date.today)
           else
             ac_props = std.model_find_object(std.standards_data['unitary_acs'], search_criteria, capacity_btu_per_hr, Date.today)
@@ -237,7 +237,7 @@ module OsLib_QAQC
         if use_old_gem_code
           capacity_w = component.find_capacity
         else
-          capacity_w = std.coil_cooling_dx_two_speed_find_capacity(component)
+          capacity_w = OpenstudioStandards::HVAC.coil_cooling_dx_two_speed_get_capacity(component)
         end
         capacity_btu_per_hr = OpenStudio.convert(capacity_w, 'W', 'Btu/hr').get
 
@@ -294,7 +294,7 @@ module OsLib_QAQC
         if use_old_gem_code
           capacity_w = component.find_capacity
         else
-          capacity_w = std.coil_heating_dx_single_speed_find_capacity(component)
+          capacity_w = OpenstudioStandards::HVAC.coil_heating_dx_single_speed_get_capacity(component)
         end
         capacity_btu_per_hr = OpenStudio.convert(capacity_w, 'W', 'Btu/hr').get
 
@@ -387,7 +387,7 @@ module OsLib_QAQC
         if use_old_gem_code
           target_fan.set_control_type('Multi Zone VAV with Static Pressure Reset')
         else
-          std.fan_variable_volume_set_control_type(target_fan, 'Multi Zone VAV with VSD and Static Pressure Reset')
+          OpenstudioStandards::HVAC.fan_variable_volume_set_control_type(target_fan, control_type: 'Multi Zone VAV with VSD and Static Pressure Reset')
         end
 
         # get coeficents for fan

data/lib/measures/openstudio_results/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.1</schema_version>
   <name>openstudio_results</name>
   <uid>a25386cd-60e4-46bc-8b11-c755f379d916</uid>
-  <version_id>b5b4c945-c608-47fb-9596-08234e7c2a0f</version_id>
-  <version_modified>2025-08-08T03:48:25Z</version_modified>
+  <version_id>29f574c5-6089-4ba8-8c56-7c3214b5944e</version_id>
+  <version_modified>2026-06-09T20:14:08Z</version_modified>
   <xml_checksum>557BF06F</xml_checksum>
   <class_name>OpenStudioResults</class_name>
   <display_name>OpenStudio Results</display_name>
@@ -797,13 +797,13 @@
       <filename>Siz.ChillerElectricEIR.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>F2210A57</checksum>
+      <checksum>BBED4519</checksum>
     </file>
     <file>
       <filename>Siz.ChillerHeaterPerformanceElectricEIR.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>1E0C0AD6</checksum>
+      <checksum>2E37D5CF</checksum>
     </file>
     <file>
       <filename>Siz.CoilCoolingDXMultiSpeed.rb</filename>
@@ -827,7 +827,7 @@
       <filename>Siz.CoilCoolingDXTwoSpeed.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>E513D800</checksum>
+      <checksum>71E9191E</checksum>
     </file>
     <file>
       <filename>Siz.CoilCoolingDXTwoStageWithHumidityControlMode.rb</filename>
@@ -1127,7 +1127,7 @@
       <filename>Siz.FanSystemModel.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>335E730E</checksum>
+      <checksum>A4C0F52E</checksum>
     </file>
     <file>
       <filename>Siz.FanVariableVolume.rb</filename>
@@ -1397,7 +1397,7 @@
       <filename>Siz.ZoneHVACLowTempRadiantVarFlow.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>A760C489</checksum>
+      <checksum>4F218062</checksum>
     </file>
     <file>
       <filename>Siz.ZoneHVACPackagedTerminalAirConditioner.rb</filename>
@@ -1475,7 +1475,7 @@
       <filename>os_lib_reporting.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>8DEAE75A</checksum>
+      <checksum>BEF185BF</checksum>
     </file>
     <file>
       <filename>report.html.erb</filename>

data/lib/measures/openstudio_results/resources/Siz.ChillerElectricEIR.rb

@@ -58,11 +58,11 @@ class OpenStudio::Model::ChillerElectricEIR
   def performanceCharacteristics
     effs = []
     effs << [referenceCOP, 'Reference COP']
-    # check os version
-    if Gem::Version.new(OpenStudio.openStudioVersion) > Gem::Version.new('2.9.1')
-      effs << [fractionofCompressorElectricConsumptionRejectedbyCondenser, 'Fraction of Compressor Electric Consumption Rejected by Condenser']
+    # changed in OpenStudio 2.9.1
+    if Gem::Version.new(OpenStudio.openStudioVersion) < Gem::Version.new('2.9.1')
+      effs << [compressorMotorEfficiency, 'Compressor Motor Efficiency']
     else
-      effs << [compressorMotorEfficiency, 'Compressor Motor Fraction of Compressor Electric Consumption Rejected by Condenser']
+      effs << [fractionofCompressorElectricConsumptionRejectedbyCondenser, 'Fraction of Compressor Electric Consumption Rejected by Condenser']
     end
     return effs
   end

data/lib/measures/openstudio_results/resources/Siz.ChillerHeaterPerformanceElectricEIR.rb

@@ -41,12 +41,7 @@ class OpenStudio::Model::ChillerHeaterPerformanceElectricEIR
   def performanceCharacteristics
     effs = []
     effs << [referenceCoolingModeCOP, 'Reference Cooling Mode COP']
-    # check os version
-    if Gem::Version.new(OpenStudio.openStudioVersion) > Gem::Version.new('2.9.1')
-      effs << [fractionofCompressorElectricConsumptionRejectedbyCondenser, 'Fraction of Compressor Electric Consumption Rejected by Condenser']
-    else
-      effs << [compressorMotorEfficiency, 'Compressor Motor Fraction of Compressor Electric Consumption Rejected by Condenser']
-    end
+    effs << [compressorMotorEfficiency, 'Compressor Motor Efficiency']
     return effs
   end
 end

data/lib/measures/openstudio_results/resources/Siz.CoilCoolingDXTwoSpeed.rb

@@ -46,5 +46,6 @@ class OpenStudio::Model::CoilCoolingDXTwoSpeed
       effs << [highSpeedEvaporativeCondenserEffectiveness, 'High Speed Evaporative Condenser Effectiveness']
       effs << [lowSpeedEvaporativeCondenserEffectiveness, 'Low Speed Evaporative Condenser Effectiveness']
     end
+    return effs
   end
 end

data/lib/measures/openstudio_results/resources/Siz.FanSystemModel.rb

@@ -5,15 +5,15 @@
 
 class OpenStudio::Model::FanSystemModel
   def maxAirFlowRate
-    if designMaximumFlowRate.is_initialized
-      designMaximumFlowRate
+    if designMaximumAirFlowRate.is_initialized
+      designMaximumAirFlowRate
     else
-      autosizedDesignMaximumFlowRate
+      autosizedDesignMaximumAirFlowRate
     end
   end
 
   def maxAirFlowRateAutosized
-    if designMaximumFlowRate.is_initialized
+    if designMaximumAirFlowRate.is_initialized
       # Not autosized if hard size field value present
       return OpenStudio::OptionalBool.new(false)
     else

data/lib/measures/openstudio_results/resources/Siz.ZoneHVACLowTempRadiantVarFlow.rb

@@ -6,11 +6,11 @@
 class OpenStudio::Model::ZoneHVACLowTempRadiantVarFlow
   def maxWaterFlowRate
     vals = []
-    if coolingCoil.maxWaterFlowRate.is_initialized
-      vals << coolingCoil.maxWaterFlowRate.get
+    if coolingCoil.is_initialized && coolingCoil.get.maxWaterFlowRate.is_initialized
+      vals << coolingCoil.get.maxWaterFlowRate.get
     end
-    if heatingCoil.maxWaterFlowRate.is_initialized
-      vals << heatingCoil.maxWaterFlowRate.get
+    if heatingCoil.is_initialized && heatingCoil.get.maxWaterFlowRate.is_initialized
+      vals << heatingCoil.get.maxWaterFlowRate.get
     end
     if vals.size.zero?
       OpenStudio::OptionalDouble.new
@@ -20,9 +20,9 @@ class OpenStudio::Model::ZoneHVACLowTempRadiantVarFlow
   end
 
   def maxWaterFlowRateAutosized
-    if coolingCoil.maxWaterFlowRate.is_initialized
+    if coolingCoil.is_initialized && coolingCoil.get.maxWaterFlowRate.is_initialized
       return OpenStudio::OptionalBool.new(false)
-    elsif heatingCoil.maxWaterFlowRate.is_initialized
+    elsif heatingCoil.is_initialized && heatingCoil.get.maxWaterFlowRate.is_initialized
       return OpenStudio::OptionalBool.new(false)
     else
       return OpenStudio::OptionalBool.new(true)
@@ -31,8 +31,12 @@ class OpenStudio::Model::ZoneHVACLowTempRadiantVarFlow
 
   def performanceCharacteristics
     effs = []
-    effs += heatingCoil.performanceCharacteristics
-    effs += coolingCoil.performanceCharacteristics
+    if coolingCoil.is_initialized
+      effs += coolingCoil.get.performanceCharacteristics
+    end
+    if heatingCoil.is_initialized
+      effs += heatingCoil.get.performanceCharacteristics
+    end
     return effs
   end
 end

data/lib/measures/openstudio_results/resources/os_lib_reporting.rb

@@ -4216,7 +4216,7 @@ module OsLib_Reporting
     # loop through each year and record the cash flow
     for i in 0..(length_yrs - 1) do
       new_yr = base_yr + i
-      yr = "January         #{new_yr.round}" # note: two spaces removed from earlier version of sql file
+      yr = "January #{new_yr.round}" # note: two spaces removed from earlier version of sql file
       ann_cap_cash = 0.0
       ann_om_cash = 0.0
       ann_energy_cash = 0.0
@@ -4259,7 +4259,8 @@ module OsLib_Reporting
         ann_gas_cash += gas.get
       end
 
-      dist_htg_query = "SELECT Value FROM tabulardatawithstrings WHERE ReportName='Life-Cycle Cost Report' AND ReportForString='Entire Facility' AND TableName='Energy and Water Cost Cash Flows (Without Escalation)' AND RowName='#{yr}' AND ColumnName='DistrictHeating'"
+      Gem::Version.new(OpenStudio.openStudioVersion) < Gem::Version.new('3.8.0') ? fuel_type_str_district_htg = 'DistrictHeating' : fuel_type_str_district_htg = 'DistrictHeatingWater'
+      dist_htg_query = "SELECT Value FROM tabulardatawithstrings WHERE ReportName='Life-Cycle Cost Report' AND ReportForString='Entire Facility' AND TableName='Energy and Water Cost Cash Flows (Without Escalation)' AND RowName='#{yr}' AND ColumnName='#{fuel_type_str_district_htg}'"
       dist_htg = sqlFile.execAndReturnFirstDouble(dist_htg_query)
       if dist_htg.is_initialized
         ann_dist_htg_cash += dist_htg.get

data/lib/measures/tariff_selection_block/measure.rb

@@ -277,11 +277,12 @@ class TariffSelectionBlock < OpenStudio::Measure::EnergyPlusMeasure
     end
 
     # disthtg tariff object
+    Gem::Version.new(OpenStudio.openStudioVersion) < Gem::Version.new('3.8.0') ? output_meter_name = 'DistrictHeating:Facility' : output_meter_name = 'DistrictHeatingWater:Facility'
     if args['disthtg_rate'] > 0
       new_object_string = "
       UtilityCost:Tariff,
-        DistrictHeating Tariff,                             !- Name
-        DistrictHeating:Facility,                           !- Output Meter Name
+        DistrictHeatingWater Tariff,            !- Name
+        #{output_meter_name},                   !- Output Meter Name
         Therm,                                  !- Conversion Factor Choice
         ,                                       !- Energy Conversion Factor
         ,                                       !- Demand Conversion Factor
@@ -296,8 +297,8 @@ class TariffSelectionBlock < OpenStudio::Measure::EnergyPlusMeasure
       # make UtilityCost:Charge:Simple objects for disthtg
       new_object_string = "
       UtilityCost:Charge:Simple,
-        DistrictHeatingTariffEnergyCharge, !- Name
-        DistrictHeating Tariff,                             !- Tariff Name
+        DistrictHeatingWaterTariffEnergyCharge, !- Name
+        DistrictHeatingWater Tariff,            !- Tariff Name
         totalEnergy,                            !- Source Variable
         Annual,                                 !- Season
         EnergyCharges,                          !- Category Variable Name

data/lib/measures/tariff_selection_block/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.1</schema_version>
   <name>tariff_selection_block</name>
   <uid>42e9f831-f39a-4709-a79b-41db49c94f8c</uid>
-  <version_id>485c76ca-98af-49e4-919c-67fb4adff2d8</version_id>
-  <version_modified>2025-08-01T14:35:30Z</version_modified>
+  <version_id>f8d68095-5e39-4738-9a7a-4f74d16c848b</version_id>
+  <version_modified>2026-06-09T20:14:22Z</version_modified>
   <xml_checksum>92578CE8</xml_checksum>
   <class_name>TariffSelectionBlock</class_name>
   <display_name> Tariff Selection-Block</display_name>
@@ -260,7 +260,7 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>5685B81E</checksum>
+      <checksum>B8390C30</checksum>
     </file>
     <file>
       <filename>EnvelopeAndLoadTestModel_01.osm</filename>

data/lib/measures/tariff_selection_flat/measure.rb

@@ -255,11 +255,12 @@ class TariffSelectionFlat < OpenStudio::Measure::EnergyPlusMeasure
     end
 
     # disthtg tariff object
+    Gem::Version.new(OpenStudio.openStudioVersion) < Gem::Version.new('3.8.0') ? output_meter_name = 'DistrictHeating:Facility' : output_meter_name = 'DistrictHeatingWater:Facility'
     if args['disthtg_rate'] > 0
       new_object_string = "
       UtilityCost:Tariff,
-        DistrictHeating Tariff,                             !- Name
-        DistrictHeating:Facility,                           !- Output Meter Name
+        DistrictHeatingWater Tariff,            !- Name
+        #{output_meter_name},                   !- Output Meter Name
         Therm,                                  !- Conversion Factor Choice
         ,                                       !- Energy Conversion Factor
         ,                                       !- Demand Conversion Factor
@@ -274,8 +275,8 @@ class TariffSelectionFlat < OpenStudio::Measure::EnergyPlusMeasure
       # make UtilityCost:Charge:Simple objects for disthtg
       new_object_string = "
       UtilityCost:Charge:Simple,
-        DistrictHeatingTariffEnergyCharge, !- Name
-        DistrictHeating Tariff,                             !- Tariff Name
+        DistrictHeatingWaterTariffEnergyCharge, !- Name
+        DistrictHeatingWater Tariff,            !- Tariff Name
         totalEnergy,                            !- Source Variable
         Annual,                                 !- Season
         EnergyCharges,                          !- Category Variable Name

data/lib/measures/tariff_selection_flat/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.1</schema_version>
   <name>tariff_selection_flat</name>
   <uid>539c3e8e-6c41-4f50-ac61-6cbbf1ee1b55</uid>
-  <version_id>90dae49f-fb67-46eb-96fa-0560a97071a6</version_id>
-  <version_modified>2025-08-01T14:35:32Z</version_modified>
+  <version_id>b67f0e4d-c743-4ba2-a79a-462f92224860</version_id>
+  <version_modified>2026-06-09T20:14:32Z</version_modified>
   <xml_checksum>FBDC6D11</xml_checksum>
   <class_name>TariffSelectionFlat</class_name>
   <display_name>Tariff Selection-Flat</display_name>
@@ -236,7 +236,7 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>AE5AA325</checksum>
+      <checksum>568C953A</checksum>
     </file>
     <file>
       <filename>EnvelopeAndLoadTestModel_01.osm</filename>

data/lib/measures/tariff_selection_time_and_date_dependant/measure.rb

@@ -464,11 +464,12 @@ class TariffSelectionTimeAndDateDependant < OpenStudio::Measure::EnergyPlusMeasu
     end
 
     # disthtg tariff object
+    Gem::Version.new(OpenStudio.openStudioVersion) < Gem::Version.new('3.8.0') ? output_meter_name = 'DistrictHeating:Facility' : output_meter_name = 'DistrictHeatingWater:Facility'
     if args['disthtg_rate'] > 0
       new_object_string = "
       UtilityCost:Tariff,
-        DistrictHeating Tariff,                             !- Name
-        DistrictHeating:Facility,                           !- Output Meter Name
+        DistrictHeatingWater Tariff,            !- Name
+        #{output_meter_name},                   !- Output Meter Name
         Therm,                                  !- Conversion Factor Choice
         ,                                       !- Energy Conversion Factor
         ,                                       !- Demand Conversion Factor
@@ -483,8 +484,8 @@ class TariffSelectionTimeAndDateDependant < OpenStudio::Measure::EnergyPlusMeasu
       # make UtilityCost:Charge:Simple objects for disthtg
       new_object_string = "
       UtilityCost:Charge:Simple,
-        DistrictHeatingTariffEnergyCharge, !- Name
-        DistrictHeating Tariff,                             !- Tariff Name
+        DistrictHeatingWaterTariffEnergyCharge, !- Name
+        DistrictHeatingWater Tariff,            !- Tariff Name
         totalEnergy,                            !- Source Variable
         Annual,                                 !- Season
         EnergyCharges,                          !- Category Variable Name

data/lib/measures/tariff_selection_time_and_date_dependant/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.1</schema_version>
   <name>tariff_selection_time_and_date_dependant</name>
   <uid>a890e296-b357-432f-8d53-6428d9bf3c0a</uid>
-  <version_id>1d80d526-4a93-4017-b973-c29d945233d4</version_id>
-  <version_modified>2025-08-01T14:35:30Z</version_modified>
+  <version_id>d3aa2a06-c6b2-4736-96a3-766405ee546d</version_id>
+  <version_modified>2026-06-09T20:14:39Z</version_modified>
   <xml_checksum>135F7E88</xml_checksum>
   <class_name>TariffSelectionTimeAndDateDependant</class_name>
   <display_name>Tariff Selection-Time and Date Dependant</display_name>
@@ -290,7 +290,7 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>D8EDD118</checksum>
+      <checksum>A248A50E</checksum>
     </file>
     <file>
       <filename>EnvelopeAndLoadTestModel_01.osm</filename>

data/lib/openstudio/common_measures/version.rb

@@ -5,6 +5,6 @@
 
 module OpenStudio
   module CommonMeasures
-    VERSION = '0.12.3'.freeze
+    VERSION = '0.13.0'.freeze
   end
 end

data/openstudio-common-measures.gemspec

@@ -29,8 +29,8 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '~> 3.2.2'
 
   spec.add_dependency 'bundler', '~> 2.4.10'
-  spec.add_dependency 'openstudio-extension', '~> 0.9.3'
-  spec.add_dependency 'openstudio-standards', '0.8.2'
+  spec.add_dependency 'openstudio-extension', '~> 0.9.7'
+  spec.add_dependency 'openstudio-standards', '0.8.5'
 
   # if we need the following dependencies pinned, 
   # let's set them in extension-gem for next release

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openstudio-common-measures
 version: !ruby/object:Gem::Version
-  version: 0.12.3
+  version: 0.13.0
 platform: ruby
 authors:
 - David Goldwasser
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-08-08 00:00:00.000000000 Z
+date: 2026-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -31,28 +31,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.9.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.9.7
 - !ruby/object:Gem::Dependency
   name: openstudio-standards
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: 0.8.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: 0.8.5
 - !ruby/object:Gem::Dependency
   name: multipart-post
   requirement: !ruby/object:Gem::Requirement
@@ -173,6 +173,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".coverage"
 - ".github/workflows/test_with_openstudio.yml"
 - ".gitignore"
 - ".rspec"
@@ -891,7 +892,7 @@ licenses: []
 metadata:
   bug_tracker_uri: https://github.com/NREL/openstudio-common-measures-gem/issues
   changelog_uri: https://github.com/NREL/openstudio-common-measures-gem/blob/develop/CHANGELOG.md
-  source_code_uri: https://github.com/NREL/openstudio-common-measures-gem/tree/v0.12.3
+  source_code_uri: https://github.com/NREL/openstudio-common-measures-gem/tree/v0.13.0
 post_install_message:
 rdoc_options: []
 require_paths: