urbanopt-cli 0.8.3 → 0.9.0

data/example_files/resources/hpxml-measures/HPXMLtoOpenStudio/resources/schedules.rb

@@ -10,19 +10,19 @@ class HourlyByMonthSchedule
     @year = model.getYearDescription.assumedYear
     @sch_name = sch_name
     @schedule = nil
-    @weekday_month_by_hour_values = validateValues(weekday_month_by_hour_values, 12, 24)
-    @weekend_month_by_hour_values = validateValues(weekend_month_by_hour_values, 12, 24)
+    @weekday_month_by_hour_values = validate_values(weekday_month_by_hour_values, 12, 24)
+    @weekend_month_by_hour_values = validate_values(weekend_month_by_hour_values, 12, 24)
     @schedule_type_limits_name = schedule_type_limits_name
 
     if normalize_values
-      @maxval = calcMaxval()
+      @maxval = calc_max_val()
     else
       @maxval = 1.0
     end
-    @schedule = createSchedule()
+    @schedule = create_schedule()
   end
 
-  def calcDesignLevel(val)
+  def calc_design_level(val)
     return val * 1000
   end
 
@@ -36,7 +36,7 @@ class HourlyByMonthSchedule
 
   private
 
-  def validateValues(vals, num_outter_values, num_inner_values)
+  def validate_values(vals, num_outter_values, num_inner_values)
     err_msg = "A #{num_outter_values}-element array with #{num_inner_values}-element arrays of numbers must be entered for the schedule."
     if not vals.is_a?(Array)
       fail err_msg
@@ -61,7 +61,7 @@ class HourlyByMonthSchedule
     return vals
   end
 
-  def calcMaxval()
+  def calc_max_val()
     maxval = [@weekday_month_by_hour_values.flatten.max, @weekend_month_by_hour_values.flatten.max].max
     if maxval == 0.0
       maxval = 1.0 # Prevent divide by zero
@@ -69,7 +69,7 @@ class HourlyByMonthSchedule
     return maxval
   end
 
-  def createSchedule()
+  def create_schedule()
     day_startm = Schedule.day_start_months(@year)
     day_endm = Schedule.day_end_months(@year)
 
@@ -176,19 +176,19 @@ class HourlyByDaySchedule
     @sch_name = sch_name
     @schedule = nil
     @num_days = Constants.NumDaysInYear(@year)
-    @weekday_day_by_hour_values = validateValues(weekday_day_by_hour_values, @num_days, 24)
-    @weekend_day_by_hour_values = validateValues(weekend_day_by_hour_values, @num_days, 24)
+    @weekday_day_by_hour_values = validate_values(weekday_day_by_hour_values, @num_days, 24)
+    @weekend_day_by_hour_values = validate_values(weekend_day_by_hour_values, @num_days, 24)
     @schedule_type_limits_name = schedule_type_limits_name
 
     if normalize_values
-      @maxval = calcMaxval()
+      @maxval = calc_max_val()
     else
       @maxval = 1.0
     end
-    @schedule = createSchedule()
+    @schedule = create_schedule()
   end
 
-  def calcDesignLevel(val)
+  def calc_design_level(val)
     return val * 1000
   end
 
@@ -202,7 +202,7 @@ class HourlyByDaySchedule
 
   private
 
-  def validateValues(vals, num_outter_values, num_inner_values)
+  def validate_values(vals, num_outter_values, num_inner_values)
     err_msg = "A #{num_outter_values}-element array with #{num_inner_values}-element arrays of numbers must be entered for the schedule."
     if not vals.is_a?(Array)
       fail err_msg
@@ -227,7 +227,7 @@ class HourlyByDaySchedule
     return vals
   end
 
-  def calcMaxval()
+  def calc_max_val()
     maxval = [@weekday_month_by_hour_values.flatten.max, @weekend_month_by_hour_values.flatten.max].max
     if maxval == 0.0
       maxval = 1.0 # Prevent divide by zero
@@ -235,7 +235,7 @@ class HourlyByDaySchedule
     return maxval
   end
 
-  def createSchedule()
+  def create_schedule()
     time = []
     for h in 1..24
       time[h] = OpenStudio::Time.new(0, h, 0, 0)
@@ -340,9 +340,9 @@ class MonthWeekdayWeekendSchedule
     @year = model.getYearDescription.assumedYear
     @sch_name = sch_name
     @schedule = nil
-    @weekday_hourly_values = validateValues(weekday_hourly_values, 24, 'weekday')
-    @weekend_hourly_values = validateValues(weekend_hourly_values, 24, 'weekend')
-    @monthly_values = validateValues(monthly_values, 12, 'monthly')
+    @weekday_hourly_values = validate_values(weekday_hourly_values, 24, 'weekday')
+    @weekend_hourly_values = validate_values(weekend_hourly_values, 24, 'weekend')
+    @monthly_values = validate_values(monthly_values, 12, 'monthly')
     @schedule_type_limits_name = schedule_type_limits_name
     @begin_month = begin_month
     @begin_day = begin_day
@@ -350,28 +350,28 @@ class MonthWeekdayWeekendSchedule
     @end_day = end_day
 
     if normalize_values
-      @weekday_hourly_values = normalizeSumToOne(@weekday_hourly_values)
-      @weekend_hourly_values = normalizeSumToOne(@weekend_hourly_values)
-      @monthly_values = normalizeAvgToOne(@monthly_values)
-      @maxval = calcMaxval()
-      @schadjust = calcSchadjust()
+      @weekday_hourly_values = normalize_sum_to_one(@weekday_hourly_values)
+      @weekend_hourly_values = normalize_sum_to_one(@weekend_hourly_values)
+      @monthly_values = normalize_avg_to_one(@monthly_values)
+      @maxval = calc_max_val()
+      @schadjust = calc_sch_adjust()
     else
       @maxval = 1.0
       @schadjust = 1.0
     end
-    @schedule = createSchedule()
+    @schedule = create_schedule()
   end
 
-  def calcDesignLevelFromDailykWh(daily_kwh)
+  def calc_design_level_from_daily_kwh(daily_kwh)
     design_level_kw = daily_kwh * @maxval * @schadjust
     return UnitConversions.convert(design_level_kw, 'kW', 'W')
   end
 
-  def calcDesignLevelFromDailyTherm(daily_therm)
-    return calcDesignLevelFromDailykWh(UnitConversions.convert(daily_therm, 'therm', 'kWh'))
+  def calc_design_level_from_daily_therm(daily_therm)
+    return calc_design_level_from_daily_kwh(UnitConversions.convert(daily_therm, 'therm', 'kWh'))
   end
 
-  def calcPeakFlowFromDailygpm(daily_water)
+  def calc_design_level_from_daily_gpm(daily_water)
     water_gpm = daily_water * @maxval * @schadjust / 60.0
     return UnitConversions.convert(water_gpm, 'gal/min', 'm^3/s')
   end
@@ -382,7 +382,7 @@ class MonthWeekdayWeekendSchedule
 
   private
 
-  def validateValues(values, num_values, sch_name)
+  def validate_values(values, num_values, sch_name)
     err_msg = "A comma-separated string of #{num_values} numbers must be entered for the #{sch_name} schedule."
     if values.is_a?(Array)
       if values.length != num_values
@@ -420,7 +420,7 @@ class MonthWeekdayWeekendSchedule
     !!Float(str) rescue false
   end
 
-  def normalizeSumToOne(values)
+  def normalize_sum_to_one(values)
     sum = values.reduce(:+).to_f
     if sum == 0.0
       return values
@@ -429,7 +429,7 @@ class MonthWeekdayWeekendSchedule
     return values.map { |val| val / sum }
   end
 
-  def normalizeAvgToOne(values)
+  def normalize_avg_to_one(values)
     avg = values.reduce(:+).to_f / values.size
     if avg == 0.0
       return values
@@ -438,7 +438,7 @@ class MonthWeekdayWeekendSchedule
     return values.map { |val| val / avg }
   end
 
-  def calcMaxval()
+  def calc_max_val()
     if @weekday_hourly_values.max > @weekend_hourly_values.max
       maxval = @monthly_values.max * @weekday_hourly_values.max
     else
@@ -450,7 +450,7 @@ class MonthWeekdayWeekendSchedule
     return maxval
   end
 
-  def calcSchadjust()
+  def calc_sch_adjust()
     # if sum != 1, normalize to get correct max val
     sum_wkdy = 0
     sum_wknd = 0
@@ -467,7 +467,7 @@ class MonthWeekdayWeekendSchedule
     return 1 / sum_wkdy
   end
 
-  def createSchedule()
+  def create_schedule()
     month_num_days = Constants.NumDaysInMonths(@year)
     month_num_days[@end_month - 1] = @end_day
 
@@ -1035,7 +1035,7 @@ class Schedule
 
   def self.day_start_months(year)
     month_num_days = Constants.NumDaysInMonths(year)
-    return month_num_days.each_with_index.map { |n, i| get_day_num_from_month_day(year, i + 1, 1) }
+    return month_num_days.each_with_index.map { |_n, i| get_day_num_from_month_day(year, i + 1, 1) }
   end
 
   def self.day_end_months(year)
@@ -1094,6 +1094,23 @@ class Schedule
     return begin_month, begin_day, end_month, end_day
   end
 
+  def self.get_begin_and_end_dates_from_monthly_array(months, year)
+    if months[0] == 1 && months[11] == 1 # Wrap around year
+      begin_month = 12 - months.reverse.index(0) + 1
+      end_month = months.index(0)
+    else
+      begin_month = months.index(1) + 1
+      end_month = 12 - months.reverse.index(1)
+    end
+
+    num_days_in_month = Constants.NumDaysInMonths(year)
+
+    begin_day = 1
+    end_day = num_days_in_month[end_month - 1]
+
+    return begin_month, begin_day, end_month, end_day
+  end
+
   def self.schedules_file_includes_col_name(schedules_file, col_name)
     schedules_file_includes_col_name = false
     if not schedules_file.nil?
@@ -1135,24 +1152,28 @@ class SchedulesFile
   ColumnHotWaterClothesWasher = 'hot_water_clothes_washer'
   ColumnHotWaterFixtures = 'hot_water_fixtures'
   ColumnVacancy = 'vacancy'
+  ColumnSleeping = 'sleeping'
   ColumnHeatingSetpoint = 'heating_setpoint'
   ColumnCoolingSetpoint = 'cooling_setpoint'
   ColumnWaterHeaterSetpoint = 'water_heater_setpoint'
   ColumnWaterHeaterOperatingMode = 'water_heater_operating_mode'
+  ColumnBattery = 'battery'
+  ColumnBatteryCharging = 'battery_charging'
+  ColumnBatteryDischarging = 'battery_discharging'
 
   def initialize(runner: nil,
                  model: nil,
-                 schedules_paths:,
-                 col_names:)
+                 schedules_paths:)
     return if schedules_paths.empty?
 
     @runner = runner
     @model = model
     @schedules_paths = schedules_paths
 
-    import(col_names: col_names)
-
+    import()
+    battery_schedules
     @tmp_schedules = Marshal.load(Marshal.dump(@schedules))
+
     set_vacancy
     convert_setpoints
 
@@ -1174,15 +1195,12 @@ class SchedulesFile
     return false
   end
 
-  def import(col_names:)
+  def import()
     @schedules = {}
     @schedules_paths.each do |schedules_path|
       columns = CSV.read(schedules_path).transpose
       columns.each do |col|
         col_name = col[0]
-        unless col_names.include? col_name
-          fail "Schedule column name '#{col_name}' is invalid. [context: #{schedules_path}]" unless [SchedulesFile::ColumnVacancy].include?(col_name)
-        end
 
         values = col[1..-1].reject { |v| v.nil? }
 
@@ -1225,6 +1243,12 @@ class SchedulesFile
           end
         end
 
+        if min_value_neg_one[col_name]
+          if values.min < -1
+            fail "Schedule min value for column '#{col_name}' must be -1. [context: #{schedules_path}]"
+          end
+        end
+
         if only_zeros_and_ones[col_name]
           if values.any? { |v| v != 0 && v != 1 }
             fail "Schedule value for column '#{col_name}' must be either 0 or 1. [context: #{schedules_path}]"
@@ -1267,12 +1291,8 @@ class SchedulesFile
   end
 
   def get_col_index(col_name:)
-    headers = []
-    @schedules_paths.each do |schedules_path|
-      next if schedules_path.nil?
+    headers = @tmp_schedules.keys
 
-      headers += CSV.open(schedules_path, 'r') { |csv| csv.first }
-    end
     col_num = headers.index(col_name)
     return col_num
   end
@@ -1393,6 +1413,8 @@ class SchedulesFile
           File.delete(tmp_schedules_path)
         rescue
         end
+      else
+        fail "Could not get external file for path '#{tmp_schedules_path}'."
       end
     end
   end
@@ -1401,10 +1423,9 @@ class SchedulesFile
     return unless @tmp_schedules.keys.include? ColumnVacancy
     return if @tmp_schedules[ColumnVacancy].all? { |i| i == 0 }
 
-    col_names = SchedulesFile.ColumnNames
-
-    @tmp_schedules[col_names[0]].each_with_index do |ts, i|
-      col_names.each do |col_name|
+    @tmp_schedules[ColumnVacancy].each_with_index do |_ts, i|
+      @tmp_schedules.keys.each do |col_name|
+        next if col_name == ColumnVacancy
         next unless affected_by_vacancy[col_name] # skip those unaffected by vacancy
 
         @tmp_schedules[col_name][i] *= (1.0 - @tmp_schedules[ColumnVacancy][i])
@@ -1417,7 +1438,7 @@ class SchedulesFile
 
     col_names = @tmp_schedules.keys
 
-    @tmp_schedules[col_names[0]].each_with_index do |ts, i|
+    @tmp_schedules[col_names[0]].each_with_index do |_ts, i|
       SchedulesFile.SetpointColumnNames.each do |setpoint_col_name|
         next unless col_names.include?(setpoint_col_name)
 
@@ -1426,8 +1447,23 @@ class SchedulesFile
     end
   end
 
+  def battery_schedules
+    return if !@schedules.keys.include?(SchedulesFile::ColumnBattery)
+
+    @schedules[SchedulesFile::ColumnBatteryCharging] = Array.new(@schedules[SchedulesFile::ColumnBattery].size, 0)
+    @schedules[SchedulesFile::ColumnBatteryDischarging] = Array.new(@schedules[SchedulesFile::ColumnBattery].size, 0)
+    @schedules[SchedulesFile::ColumnBattery].each_with_index do |_ts, i|
+      if @schedules[SchedulesFile::ColumnBattery][i] > 0
+        @schedules[SchedulesFile::ColumnBatteryCharging][i] = @schedules[SchedulesFile::ColumnBattery][i]
+      elsif @schedules[SchedulesFile::ColumnBattery][i] < 0
+        @schedules[SchedulesFile::ColumnBatteryDischarging][i] = -1 * @schedules[SchedulesFile::ColumnBattery][i]
+      end
+    end
+    @schedules.delete(SchedulesFile::ColumnBattery)
+  end
+
   def self.ColumnNames
-    return SchedulesFile.OccupancyColumnNames + SchedulesFile.HVACSetpointColumnNames + SchedulesFile.WaterHeaterColumnNames
+    return SchedulesFile.OccupancyColumnNames + SchedulesFile.HVACSetpointColumnNames + SchedulesFile.WaterHeaterColumnNames + SchedulesFile.BatteryColumnNames
   end
 
   def self.OccupancyColumnNames
@@ -1490,6 +1526,14 @@ class SchedulesFile
     ]
   end
 
+  def self.BatteryColumnNames
+    return [
+      ColumnBattery,
+      ColumnBatteryCharging,
+      ColumnBatteryDischarging
+    ]
+  end
+
   def affected_by_vacancy
     affected_by_vacancy = {}
     column_names = SchedulesFile.ColumnNames
@@ -1501,7 +1545,8 @@ class SchedulesFile
                     ColumnPoolPump,
                     ColumnPoolHeater,
                     ColumnHotTubPump,
-                    ColumnHotTubHeater] + SchedulesFile.HVACSetpointColumnNames + SchedulesFile.WaterHeaterColumnNames).include? column_name
+                    ColumnHotTubHeater,
+                    ColumnSleeping] + SchedulesFile.HVACSetpointColumnNames + SchedulesFile.WaterHeaterColumnNames + SchedulesFile.BatteryColumnNames).include? column_name
 
       affected_by_vacancy[column_name] = false
     end
@@ -1525,13 +1570,25 @@ class SchedulesFile
     column_names = SchedulesFile.ColumnNames
     column_names.each do |column_name|
       min_value_zero[column_name] = true
-      if SchedulesFile.SetpointColumnNames.include?(column_name) || SchedulesFile.OperatingModeColumnNames.include?(column_name)
+      if SchedulesFile.SetpointColumnNames.include?(column_name) || SchedulesFile.OperatingModeColumnNames.include?(column_name) || SchedulesFile.BatteryColumnNames.include?(column_name)
         min_value_zero[column_name] = false
       end
     end
     return min_value_zero
   end
 
+  def min_value_neg_one
+    min_value_neg_one = {}
+    column_names = SchedulesFile.ColumnNames
+    column_names.each do |column_name|
+      min_value_neg_one[column_name] = false
+      if column_name == SchedulesFile::ColumnBattery
+        min_value_neg_one[column_name] = true
+      end
+    end
+    return min_value_neg_one
+  end
+
   def only_zeros_and_ones
     only_zeros_and_ones = { SchedulesFile::ColumnVacancy => true }
     column_names = SchedulesFile.ColumnNames

data/example_files/resources/hpxml-measures/HPXMLtoOpenStudio/resources/simcontrols.rb

@@ -36,6 +36,7 @@ class SimControls
     insurf.setAlgorithm('TARP')
 
     zonecap = model.getZoneCapacitanceMultiplierResearchSpecial
+    zonecap.setTemperatureCapacityMultiplier(hpxml.header.temperature_capacitance_multiplier)
     zonecap.setHumidityCapacityMultiplier(15)
 
     convlim = model.getConvergenceLimits

data/example_files/resources/hpxml-measures/HPXMLtoOpenStudio/resources/utility_bills.rb

@@ -0,0 +1,148 @@
+# frozen_string_literal: true
+
+class UtilityBills
+  def self.get_rates_from_eia_data(runner, state_code, fuel_type, fixed_charge, marginal_rate = nil)
+    if state_code == 'US'
+      if fuel_type == HPXML::FuelTypeElectricity
+        state_name = 'United States'
+      else
+        state_name = 'U.S.'
+      end
+    else
+      state_name = Constants.StateCodesMap[state_code]
+    end
+    return if state_name.nil?
+
+    average_rate = nil
+    if fuel_type == HPXML::FuelTypeElectricity
+      household_consumption = get_household_consumption(state_code, fuel_type)
+      if not marginal_rate.nil?
+        # Calculate average rate from user-specified fixed charge, user-specified marginal rate, and EIA data
+        average_rate = marginal_rate_to_average_rate(marginal_rate, fixed_charge, household_consumption)
+      else
+        # Calculate marginal & average rates from user-specified fixed charge and EIA data
+        year_ix = nil
+        rows = CSV.read(File.join(File.dirname(__FILE__), '../../ReportUtilityBills/resources/simple_rates/Average_retail_price_of_electricity.csv'))
+        rows.each do |row|
+          year_ix = row.index('2021') if row[0] == 'description'
+          next if row[0].upcase != "Residential : #{state_name}".upcase
+
+          average_rate = Float(row[year_ix]) / 100.0 # Convert cents/kWh to $/kWh
+        end
+        marginal_rate = average_rate_to_marginal_rate(average_rate, fixed_charge, household_consumption)
+      end
+
+    elsif fuel_type == HPXML::FuelTypeNaturalGas
+      household_consumption = get_household_consumption(state_code, fuel_type)
+      if not marginal_rate.nil?
+        # Calculate average rate from user-specified fixed charge, user-specified marginal rate, and EIA data
+        average_rate = marginal_rate_to_average_rate(marginal_rate, fixed_charge, household_consumption)
+      else
+        # Calculate marginal & average rates from user-specified fixed charge and EIA data
+        rows = CSV.read(File.join(File.dirname(__FILE__), '../../ReportUtilityBills/resources/simple_rates/NG_PRI_SUM_A_EPG0_PRS_DMCF_A.csv'))
+        rows = rows[2..-1]
+        state_ix = rows[0].index("#{state_name} Price of Natural Gas Delivered to Residential Consumers (Dollars per Thousand Cubic Feet)")
+        rows[1..-1].each do |row|
+          average_rate = Float(row[state_ix]) / 10.37 if !row[state_ix].nil? # Convert Mcf to therms, from https://www.eia.gov/tools/faqs/faq.php?id=45&t=7
+        end
+        marginal_rate = average_rate_to_marginal_rate(average_rate, fixed_charge, household_consumption)
+      end
+
+    elsif [HPXML::FuelTypeOil, HPXML::FuelTypePropane].include? fuel_type
+      if fuel_type == HPXML::FuelTypeOil
+        marginal_rates = get_gallon_marginal_rates('PET_PRI_WFR_A_EPD2F_PRS_DPGAL_W.csv')
+        header = "Weekly #{state_name} Weekly No. 2 Heating Oil Residential Price  (Dollars per Gallon)"
+      elsif fuel_type == HPXML::FuelTypePropane
+        marginal_rates = get_gallon_marginal_rates('PET_PRI_WFR_A_EPLLPA_PRS_DPGAL_W.csv')
+        header = "Weekly #{state_name} Propane Residential Price  (Dollars per Gallon)"
+      end
+
+      if marginal_rates[header].nil?
+        padd = get_state_code_to_padd[state_code]
+        marginal_rates.keys.each do |k|
+          header = k if k.include?(padd)
+        end
+        average = "region (#{padd})"
+
+        if marginal_rates[header].nil?
+          if fuel_type == HPXML::FuelTypeOil
+            header = 'Weekly U.S. Weekly No. 2 Heating Oil Residential Price  (Dollars per Gallon)'
+          elsif fuel_type == HPXML::FuelTypePropane
+            header = 'Weekly U.S. Propane Residential Price  (Dollars per Gallon)'
+          end
+          average = 'national'
+        end
+
+        runner.registerWarning("Could not find state average #{fuel_type} rate based on #{state_name}; using #{average} average.") if !runner.nil?
+      end
+      marginal_rate = marginal_rates[header].sum / marginal_rates[header].size
+    end
+
+    return marginal_rate, average_rate
+  end
+
+  def self.get_household_consumption(state_code, fuel_type)
+    rows = CSV.read(File.join(File.dirname(__FILE__), '../../ReportUtilityBills/resources/simple_rates/HouseholdConsumption.csv'))
+    rows.each do |row|
+      next if row[0] != state_code
+
+      if fuel_type == HPXML::FuelTypeElectricity
+        return Float(row[1])
+      elsif fuel_type == HPXML::FuelTypeNaturalGas
+        return Float(row[2])
+      end
+    end
+  end
+
+  def self.average_rate_to_marginal_rate(average_rate, fixed_charge, household_consumption)
+    return average_rate - 12.0 * fixed_charge / household_consumption
+  end
+
+  def self.marginal_rate_to_average_rate(marginal_rate, fixed_charge, household_consumption)
+    return marginal_rate + 12.0 * fixed_charge / household_consumption
+  end
+
+  def self.get_state_code_to_padd
+    # https://www.eia.gov/tools/glossary/index.php?id=petroleum%20administration%20for%20defense%20district
+    padd_to_state_codes = { 'PADD 1A' => ['CT', 'MA', 'ME', 'NH', 'RI', 'VT'],
+                            'PADD 1B' => ['DE', 'DC', 'MD', 'NJ', 'NY', 'PA'],
+                            'PADD 1C' => ['FL', 'GA', 'NC', 'SC', 'WV', 'VA'],
+                            'PADD 2' => ['IA', 'IL', 'IN', 'KS', 'KY', 'MI', 'MN', 'MO', 'ND', 'NE', 'OH', 'OK', 'SD', 'TN', 'WI'],
+                            'PADD 3' => ['AL', 'AR', 'LA', 'MS', 'NM', 'TX'],
+                            'PADD 4' => ['CO', 'ID', 'MT', 'UT', 'WY'],
+                            'PADD 5' => ['AK', 'AZ', 'CA', 'HI', 'NV', 'OR', 'WA'] }
+
+    state_code_to_padd = {}
+    padd_to_state_codes.each do |padd, state_codes|
+      state_codes.each do |state_code|
+        state_code_to_padd[state_code] = padd
+      end
+    end
+
+    return state_code_to_padd
+  end
+
+  def self.get_gallon_marginal_rates(filename)
+    marginal_rates = {}
+
+    rows = CSV.read(File.join(File.dirname(__FILE__), "../../ReportUtilityBills/resources/simple_rates/#{filename}"))
+    rows = rows[2..-1]
+    headers = rows[0]
+
+    rows = rows.reverse[1..26].transpose
+    rows.each_with_index do |row, i|
+      marginal_rates[headers[i]] = row
+    end
+
+    marginal_rates.delete('Date')
+    marginal_rates.each do |header, values|
+      if values.all? { |x| x.nil? }
+        marginal_rates.delete(header)
+        next
+      end
+      marginal_rates[header] = marginal_rates[header].map { |x| Float(x) }
+    end
+
+    return marginal_rates
+  end
+end

data/example_files/resources/hpxml-measures/HPXMLtoOpenStudio/resources/version.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 class Version
-  OS_HPXML_Version = '1.4.0' # Version of the OS-HPXML workflow
-  OS_Version = '3.4.0' # Required version of OpenStudio (can be 'X.X' or 'X.X.X')
+  OS_HPXML_Version = '1.5.0' # Version of the OS-HPXML workflow
+  OS_Version = '3.5.0' # Required version of OpenStudio (can be 'X.X' or 'X.X.X')
   HPXML_Version = '4.0' # HPXML schemaVersion
 
   def self.check_openstudio_version