openstudio-calibration 0.9.0 → 0.10.0

data/lib/measures/GeneralCalibrationMeasureMultiplier/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.0</schema_version>
   <name>general_calibration_measure_multiplier</name>
   <uid>d622534e-a3c9-4ba5-b616-53dce2a18ac8</uid>
-  <version_id>7f783168-2f37-45b3-bb47-2fe78d3f7931</version_id>
-  <version_modified>20230602T154652Z</version_modified>
+  <version_id>acada3ad-5f82-494a-b8d2-1e68d12fe3a4</version_id>
+  <version_modified>20240428T231344Z</version_modified>
   <xml_checksum>DEC0D835</xml_checksum>
   <class_name>GeneralCalibrationMeasureMultiplier</class_name>
   <display_name>General Calibration Measure Multiplier</display_name>
@@ -17,10 +17,10 @@
       <type>Choice</type>
       <required>true</required>
       <model_dependent>false</model_dependent>
-      <default_value>{a10ec323-f081-4d58-83e3-f77b122d01ca}</default_value>
+      <default_value>{82deef47-52ff-4598-a6fe-6dbfaef5dd4d}</default_value>
       <choices>
         <choice>
-          <value>{a10ec323-f081-4d58-83e3-f77b122d01ca}</value>
+          <value>{82deef47-52ff-4598-a6fe-6dbfaef5dd4d}</value>
           <display_name>*All SpaceTypes*</display_name>
         </choice>
         <choice>
@@ -35,10 +35,10 @@
       <type>Choice</type>
       <required>true</required>
       <model_dependent>false</model_dependent>
-      <default_value>{a10ec323-f081-4d58-83e3-f77b122d01ca}</default_value>
+      <default_value>{82deef47-52ff-4598-a6fe-6dbfaef5dd4d}</default_value>
       <choices>
         <choice>
-          <value>{a10ec323-f081-4d58-83e3-f77b122d01ca}</value>
+          <value>{82deef47-52ff-4598-a6fe-6dbfaef5dd4d}</value>
           <display_name>*All Spaces*</display_name>
         </choice>
         <choice>
@@ -225,7 +225,7 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>675FC9D6</checksum>
+      <checksum>D8F7D718</checksum>
     </file>
   </files>
 </measure>

data/lib/measures/GeneralCalibrationMeasurePercentChange/measure.rb

@@ -464,7 +464,7 @@ class GeneralCalibrationMeasurePercentChange < OpenStudio::Measure::ModelMeasure
           runner.registerInfo("Skipping change to #{internalmass_def.name.get}")
         end
       end
-    end # end space_type loop
+    end
 
     runner.registerInfo("altered_lights_definitions: #{altered_lights_definitions}")
     runner.registerInfo("altered_luminaires_definitions: #{altered_luminaires_definitions}")
@@ -697,7 +697,7 @@ class GeneralCalibrationMeasurePercentChange < OpenStudio::Measure::ModelMeasure
           runner.registerInfo("Skipping change to #{internalmass_def.name.get}")
         end
       end
-    end # end spaces loop
+    end
 
     runner.registerInfo("altered_lights_definitions: #{altered_lights_definitions}")
     runner.registerInfo("altered_luminaires_definitions: #{altered_luminaires_definitions}")

data/lib/measures/GeneralCalibrationMeasurePercentChange/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.0</schema_version>
   <name>general_calibration_measure_percent_change</name>
   <uid>0f583ac1-fa7e-48bc-9f80-12ed17180669</uid>
-  <version_id>7cbf215b-1a4f-4952-97bd-30770b745a89</version_id>
-  <version_modified>20230602T154653Z</version_modified>
+  <version_id>eba32481-a76a-4dba-a375-95a3156d4fe1</version_id>
+  <version_modified>20240428T231345Z</version_modified>
   <xml_checksum>DEC0D835</xml_checksum>
   <class_name>GeneralCalibrationMeasurePercentChange</class_name>
   <display_name>General Calibration Measure Percent Change</display_name>
@@ -17,10 +17,10 @@
       <type>Choice</type>
       <required>true</required>
       <model_dependent>false</model_dependent>
-      <default_value>{f0b412eb-06c7-48a3-931e-97d4b4f7d09b}</default_value>
+      <default_value>{7b2b167b-35c5-4a11-b8fb-e8b5d4fe21e5}</default_value>
       <choices>
         <choice>
-          <value>{f0b412eb-06c7-48a3-931e-97d4b4f7d09b}</value>
+          <value>{7b2b167b-35c5-4a11-b8fb-e8b5d4fe21e5}</value>
           <display_name>*All SpaceTypes*</display_name>
         </choice>
         <choice>
@@ -35,10 +35,10 @@
       <type>Choice</type>
       <required>true</required>
       <model_dependent>false</model_dependent>
-      <default_value>{f0b412eb-06c7-48a3-931e-97d4b4f7d09b}</default_value>
+      <default_value>{7b2b167b-35c5-4a11-b8fb-e8b5d4fe21e5}</default_value>
       <choices>
         <choice>
-          <value>{f0b412eb-06c7-48a3-931e-97d4b4f7d09b}</value>
+          <value>{7b2b167b-35c5-4a11-b8fb-e8b5d4fe21e5}</value>
           <display_name>*All Spaces*</display_name>
         </choice>
         <choice>
@@ -224,7 +224,7 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>81C8F498</checksum>
+      <checksum>5EAD059F</checksum>
     </file>
   </files>
 </measure>

data/lib/measures/HardSizeHvac/measure.rb

@@ -27,9 +27,7 @@ class HardSizeHVAC < OpenStudio::Measure::ModelMeasure
 
   # define the arguments that the user will input
   def arguments(_model)
-    args = OpenStudio::Measure::OSArgumentVector.new
-
-    args
+    OpenStudio::Measure::OSArgumentVector.new
   end
 
   # define what happens when the measure is run
@@ -40,7 +38,7 @@ class HardSizeHVAC < OpenStudio::Measure::ModelMeasure
     standard = Standard.build('90.1-2004') # template choice doesn't matter
 
     # Perform a sizing run (2.5.1 and later)
-    sizing_run_path = OpenStudio::Path.new(File.dirname(__FILE__) + '/output/SR1').to_s
+    sizing_run_path = OpenStudio::Path.new("#{File.dirname(__FILE__)}/output/SR1").to_s
     runner.registerInfo("Performing sizing run at #{sizing_run_path}.")
     if standard.model_run_sizing_run(model, sizing_run_path) == false
       return false

data/lib/measures/HardSizeHvac/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.0</schema_version>
   <name>hard_size_hvac</name>
   <uid>d7da749f-6318-4077-b502-25994a713b27</uid>
-  <version_id>896c932e-915e-4c05-bc05-ca990ce88a0c</version_id>
-  <version_modified>20230602T154657Z</version_modified>
+  <version_id>3a26969f-2d60-4448-bc4a-60c4619078e9</version_id>
+  <version_modified>20240428T231349Z</version_modified>
   <xml_checksum>2B526343</xml_checksum>
   <class_name>HardSizeHVAC</class_name>
   <display_name>Hard Size HVAC</display_name>
@@ -82,13 +82,13 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>F0528E19</checksum>
+      <checksum>56DF50B7</checksum>
     </file>
     <file>
       <filename>hard_size_hvac_test.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>5C7F03AC</checksum>
+      <checksum>4A195AEA</checksum>
     </file>
   </files>
 </measure>

data/lib/measures/RValueOfInsulationForConstructionMultiplier/measure.rb

@@ -63,7 +63,7 @@ class RValueOfInsulationForConstructionMultiplier < OpenStudio::Measure::ModelMe
     args << r_value_multplier
 
     args
-  end # end the arguments method
+  end
 
   # define what happens when the measure is run
   def run(model, runner, user_arguments)
@@ -94,7 +94,7 @@ class RValueOfInsulationForConstructionMultiplier < OpenStudio::Measure::ModelMe
         runner.registerError('Script Error - argument not showing up as construction.')
         return false
       end
-    end # end of if construction.empty?
+    end
 
     # set limit for minimum insulation. This is used to limit input and for inferring insulation layer in construction.
     min_expected_r_value_multplier_ip = 1 # ip units
@@ -114,11 +114,9 @@ class RValueOfInsulationForConstructionMultiplier < OpenStudio::Measure::ModelMe
     # loop through construction layers and infer insulation layer/material
     construction_layers.each do |construction_layer|
       construction_layer_r_value = construction_layer.to_OpaqueMaterial.get.thermalResistance
-      unless thermal_resistance_values.empty?
-        if construction_layer_r_value > thermal_resistance_values.max
-          max_thermal_resistance_material = construction_layer
-          max_thermal_resistance_material_index = counter
-        end
+      if !thermal_resistance_values.empty? && (construction_layer_r_value > thermal_resistance_values.max)
+        max_thermal_resistance_material = construction_layer
+        max_thermal_resistance_material_index = counter
       end
       thermal_resistance_values << construction_layer_r_value
       counter += 1
@@ -159,8 +157,8 @@ class RValueOfInsulationForConstructionMultiplier < OpenStudio::Measure::ModelMe
     runner.registerFinalCondition("The Final R-value of #{construction.name} is #{final_r_value_ip} (ft^2*h*R/Btu).")
     runner.registerValue('final_r_value_ip', final_r_value_ip.to_f, 'ft^2*h*R/Btu')
     true
-  end # end the run method
-end # end the measure
+  end
+end
 
 # this allows the measure to be used by the application
 RValueOfInsulationForConstructionMultiplier.new.registerWithApplication

data/lib/measures/RValueOfInsulationForConstructionMultiplier/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.0</schema_version>
   <name>r_value_of_insulation_for_construction_multiplier</name>
   <uid>3c7a6751-bb54-4600-9410-8f042e1a513b</uid>
-  <version_id>5534f7d5-e91a-4f72-929f-70683a291538</version_id>
-  <version_modified>20230602T154652Z</version_modified>
+  <version_id>55c500d1-80a4-4f4b-a09f-6a9a473c8b3a</version_id>
+  <version_modified>20240428T231344Z</version_modified>
   <xml_checksum>0BF71A3E</xml_checksum>
   <class_name>RValueOfInsulationForConstructionMultiplier</class_name>
   <display_name>Change R-value of Insulation Layer for Construction By a Multiplier</display_name>
@@ -127,7 +127,7 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>EB2C3AE0</checksum>
+      <checksum>2C93B86A</checksum>
     </file>
   </files>
 </measure>

data/lib/measures/RValueOfInsulationForConstructionPercentageChange/measure.rb

@@ -56,7 +56,7 @@ class RValueOfInsulationForConstructionPercentageChange < OpenStudio::Measure::M
     args << r_value_prct_inc
 
     args
-  end # end the arguments method
+  end
 
   # define what happens when the measure is run
   def run(model, runner, user_arguments)
@@ -87,7 +87,7 @@ class RValueOfInsulationForConstructionPercentageChange < OpenStudio::Measure::M
         runner.registerError('Script Error - argument not showing up as construction.')
         return false
       end
-    end # end of if construction.empty?
+    end
 
     # set limit for minimum insulation. This is used to limit input and for inferring insulation layer in construction.
     min_expected_r_value_prct_inc_ip = 1 # ip units
@@ -107,11 +107,9 @@ class RValueOfInsulationForConstructionPercentageChange < OpenStudio::Measure::M
     # loop through construction layers and infer insulation layer/material
     construction_layers.each do |construction_layer|
       construction_layer_r_value = construction_layer.to_OpaqueMaterial.get.thermalResistance
-      unless thermal_resistance_values.empty?
-        if construction_layer_r_value > thermal_resistance_values.max
-          max_thermal_resistance_material = construction_layer
-          max_thermal_resistance_material_index = counter
-        end
+      if !thermal_resistance_values.empty? && (construction_layer_r_value > thermal_resistance_values.max)
+        max_thermal_resistance_material = construction_layer
+        max_thermal_resistance_material_index = counter
       end
       thermal_resistance_values << construction_layer_r_value
       counter += 1
@@ -152,8 +150,8 @@ class RValueOfInsulationForConstructionPercentageChange < OpenStudio::Measure::M
     runner.registerFinalCondition("The Final R-value of #{construction.name} is #{final_r_value_ip} (ft^2*h*R/Btu).")
     runner.registerValue('final_r_value_ip', final_r_value_ip.to_f, 'ft^2*h*R/Btu')
     true
-  end # end the run method
-end # end the measure
+  end
+end
 
 # this allows the measure to be used by the application
 RValueOfInsulationForConstructionPercentageChange.new.registerWithApplication

data/lib/measures/RValueOfInsulationForConstructionPercentageChange/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.0</schema_version>
   <name>r_value_of_insulation_for_construction_percentage_change</name>
   <uid>7ee248fd-052a-48d6-a8eb-b1fc6a0dc348</uid>
-  <version_id>c6595746-84ca-408a-8066-d1325e2604ed</version_id>
-  <version_modified>20230602T154656Z</version_modified>
+  <version_id>af995773-d9c9-470c-9566-59b4951952e7</version_id>
+  <version_modified>20240428T231348Z</version_modified>
   <xml_checksum>0BF71A3E</xml_checksum>
   <class_name>RValueOfInsulationForConstructionPercentageChange</class_name>
   <display_name>Change R-value of Insulation Layer for Construction By a Specified Percentage</display_name>
@@ -127,7 +127,7 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>2E8E54BE</checksum>
+      <checksum>ED427A87</checksum>
     </file>
   </files>
 </measure>

data/lib/measures/RoofThermalPropertiesMultiplier/measure.rb

@@ -21,7 +21,8 @@ class RoofThermalPropertiesMultiplier < OpenStudio::Measure::ModelMeasure
   end
 
   # short def to make numbers pretty (converts 4125001.25641 to 4,125,001.26 or 4,125,001). The definition be called through this measure
-  def neat_numbers(number, roundto = 2) # round to 0 or 2)
+  # round to 0 or 2)
+  def neat_numbers(number, roundto = 2)
     number = if roundto == 2
                format '%.2f', number
              else
@@ -29,7 +30,7 @@ class RoofThermalPropertiesMultiplier < OpenStudio::Measure::ModelMeasure
              end
     # regex to add commas
     number.to_s.reverse.gsub(/([0-9]{3}(?=([0-9])))/, '\\1,').reverse
-  end # end def neat_numbers
+  end
 
   # helper to make it easier to do unit conversions on the fly
   def unit_helper(number, from_unit_string, to_unit_string)
@@ -64,7 +65,7 @@ class RoofThermalPropertiesMultiplier < OpenStudio::Measure::ModelMeasure
     args << thermal_mass_mult
 
     args
-  end # end the arguments method
+  end
 
   # define what happens when the measure is run
   def run(model, runner, user_arguments)
@@ -89,6 +90,7 @@ class RoofThermalPropertiesMultiplier < OpenStudio::Measure::ModelMeasure
     roof_surface_constructions = []
     surfaces.each do |surface|
       next unless surface.outsideBoundaryCondition == 'Outdoors' && surface.surfaceType == 'RoofCeiling'
+
       roof_surfaces << surface
       roof_surface_const = surface.construction.get
       # only add construction if it hasn't been added yet
@@ -155,6 +157,7 @@ class RoofThermalPropertiesMultiplier < OpenStudio::Measure::ModelMeasure
     end
     initial_sol_abs.each_index do |index1|
       next unless initial_sol_abs[index1]
+
       desired_sol_abs[index1] = initial_sol_abs[index1] * solar_abs_mult
       if desired_sol_abs[index1] > 1
         desired_sol_abs[index1] = 1
@@ -226,8 +229,8 @@ class RoofThermalPropertiesMultiplier < OpenStudio::Measure::ModelMeasure
     runner.registerFinalCondition("Applied R #{r_value_mult.round(1)}x Solar #{solar_abs_mult.round(1)}x Therm #{thermal_mass_mult.round(1)}x change")
 
     true
-  end # end the run method
-end # end the measure
+  end
+end
 
 # this allows the measure to be used by the application
 RoofThermalPropertiesMultiplier.new.registerWithApplication

data/lib/measures/RoofThermalPropertiesMultiplier/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.0</schema_version>
   <name>roof_thermal_properties_multiplier</name>
   <uid>6c4eb22b-770f-456c-bcd1-084cfad89eeb</uid>
-  <version_id>2bb4add5-d936-4469-8a46-d458142e98dd</version_id>
-  <version_modified>20230602T154657Z</version_modified>
+  <version_id>1087cde3-4f8c-48fb-b877-556c37bfca77</version_id>
+  <version_modified>20240428T231349Z</version_modified>
   <xml_checksum>EB1A0C08</xml_checksum>
   <class_name>RoofThermalPropertiesMultiplier</class_name>
   <display_name>Roof Thermal Properties Multiplier</display_name>
@@ -88,6 +88,12 @@
       <usage_type>license</usage_type>
       <checksum>BFFB1AA6</checksum>
     </file>
+    <file>
+      <filename>RoofThermalPropertiesMultiplier_test.rb</filename>
+      <filetype>rb</filetype>
+      <usage_type>test</usage_type>
+      <checksum>7197D29B</checksum>
+    </file>
     <file>
       <version>
         <software_program>OpenStudio</software_program>
@@ -97,13 +103,7 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>7C6B77F6</checksum>
-    </file>
-    <file>
-      <filename>RoofThermalPropertiesMultiplier_test.rb</filename>
-      <filetype>rb</filetype>
-      <usage_type>test</usage_type>
-      <checksum>7197D29B</checksum>
+      <checksum>1E5855C1</checksum>
     </file>
   </files>
 </measure>

data/lib/measures/RoofThermalPropertiesPercentChange/measure.rb

@@ -21,7 +21,8 @@ class RoofThermalPropertiesPercentChange < OpenStudio::Measure::ModelMeasure
   end
 
   # short def to make numbers pretty (converts 4125001.25641 to 4,125,001.26 or 4,125,001). The definition be called through this measure
-  def neat_numbers(number, roundto = 2) # round to 0 or 2)
+  # round to 0 or 2)
+  def neat_numbers(number, roundto = 2)
     number = if roundto == 2
                format '%.2f', number
              else
@@ -29,7 +30,7 @@ class RoofThermalPropertiesPercentChange < OpenStudio::Measure::ModelMeasure
              end
     # regex to add commas
     number.to_s.reverse.gsub(/([0-9]{3}(?=([0-9])))/, '\\1,').reverse
-  end # end def neat_numbers
+  end
 
   # helper to make it easier to do unit conversions on the fly
   def unit_helper(number, from_unit_string, to_unit_string)
@@ -57,7 +58,7 @@ class RoofThermalPropertiesPercentChange < OpenStudio::Measure::ModelMeasure
     args << thermal_mass_perc_change
 
     args
-  end # end the arguments method
+  end
 
   # define what happens when the measure is run
   def run(model, runner, user_arguments)
@@ -79,6 +80,7 @@ class RoofThermalPropertiesPercentChange < OpenStudio::Measure::ModelMeasure
     roof_surface_constructions = []
     surfaces.each do |surface|
       next unless surface.outsideBoundaryCondition == 'Outdoors' && surface.surfaceType == 'RoofCeiling'
+
       roof_surfaces << surface
       roof_surface_const = surface.construction.get
       # only add construction if it hasn't been added yet
@@ -145,6 +147,7 @@ class RoofThermalPropertiesPercentChange < OpenStudio::Measure::ModelMeasure
     end
     initial_sol_abs.each_index do |index1|
       next unless initial_sol_abs[index1]
+
       desired_sol_abs[index1] = initial_sol_abs[index1] + initial_sol_abs[index1] * solar_abs_perc_change * 0.01
       if desired_sol_abs[index1] > 1
         desired_sol_abs[index1] = 1
@@ -216,8 +219,8 @@ class RoofThermalPropertiesPercentChange < OpenStudio::Measure::ModelMeasure
     runner.registerFinalCondition("Applied R #{r_value_perc_change.round(1)} Solar #{solar_abs_perc_change.round(1)} Therm #{thermal_mass_perc_change.round(1)} Percent change")
 
     true
-  end # end the run method
-end # end the measure
+  end
+end
 
 # this allows the measure to be used by the application
 RoofThermalPropertiesPercentChange.new.registerWithApplication

data/lib/measures/RoofThermalPropertiesPercentChange/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.0</schema_version>
   <name>roof_thermal_properties_percent_change</name>
   <uid>07516685-60fd-4da8-9872-1154a995047d</uid>
-  <version_id>db469840-e1ca-40ba-a628-58855984662f</version_id>
-  <version_modified>20230602T154656Z</version_modified>
+  <version_id>6c9d8dec-0134-4f58-924b-b12ba6ecb8cb</version_id>
+  <version_modified>20240428T231348Z</version_modified>
   <xml_checksum>EB1A0C08</xml_checksum>
   <class_name>RoofThermalPropertiesPercentChange</class_name>
   <display_name>Roof Thermal Properties Percent Change</display_name>
@@ -88,6 +88,12 @@
       <usage_type>license</usage_type>
       <checksum>BFFB1AA6</checksum>
     </file>
+    <file>
+      <filename>RoofThermalPropertiesMultiplier_test.rb</filename>
+      <filetype>rb</filetype>
+      <usage_type>test</usage_type>
+      <checksum>3F4E0142</checksum>
+    </file>
     <file>
       <version>
         <software_program>OpenStudio</software_program>
@@ -97,13 +103,7 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>3A4BB94C</checksum>
-    </file>
-    <file>
-      <filename>RoofThermalPropertiesMultiplier_test.rb</filename>
-      <filetype>rb</filetype>
-      <usage_type>test</usage_type>
-      <checksum>3F4E0142</checksum>
+      <checksum>D0AD2402</checksum>
     </file>
   </files>
 </measure>

data/lib/measures/TimeseriesObjectiveFunction/measure.rb

@@ -290,22 +290,22 @@ class TimeseriesObjectiveFunction < OpenStudio::Measure::ReportingMeasure
       js_time = js_time.gsub('Sep', '09')
       js_time = js_time.gsub('Oct', '10')
       js_time = js_time.gsub('Nov', '11')
-      js_time = js_time.gsub('Dec', '12')
-
-      js_time
+      js_time.gsub('Dec', '12')
     end
 
     # setup convert
-    if convert_data == 'F to C'
+    case convert_data
+    when 'F to C'
       convert = 0.5556
-    elsif convert_data == 'WH to J'
+    when 'WH to J'
       convert = 3600
-    elsif convert_data == 'CFM to m3/s'
+    when 'CFM to m3/s'
       convert = 0.00047
-    elsif convert_data == 'PSI to Pa'
+    when 'PSI to Pa'
       convert = 6894.76
-    else convert_data == 'None'
-         convert = 1
+    else
+      convert_data == 'None'
+      convert = 1
     end
 
     diff = 0.0
@@ -428,13 +428,13 @@ class TimeseriesObjectiveFunction < OpenStudio::Measure::ReportingMeasure
              "+0#{tzs.to_i}:00"
            else # two digit
              "+#{tzs.to_i}:00"
-                end
+           end
          else # negative number
            if tzs.to_i * -1 < 10 # one digit
              "-0#{tzs.to_i * -1}:00"
            else # two digit
              "-#{tzs.to_i * -1}:00"
-                end
+           end
          end
     runner.registerInfo("timezone = #{tz}")
     # export for plotting
@@ -501,6 +501,7 @@ class TimeseriesObjectiveFunction < OpenStudio::Measure::ReportingMeasure
 
           csv.each_index do |row|
             next unless row > 0
+
             if csv[row][0].nil?
               if warning_messages
                 runner.registerWarning("empty csv row number #{row}")
@@ -516,7 +517,7 @@ class TimeseriesObjectiveFunction < OpenStudio::Measure::ReportingMeasure
             if year.nil?
               dat = OpenStudio::Date.new(OpenStudio::MonthOfYear.new(cal[mon]), day)
             else
-              dat = OpenStudio::Date.new(OpenStudio::MonthOfYear.new(cal[mon]),day,year)
+              dat = OpenStudio::Date.new(OpenStudio::MonthOfYear.new(cal[mon]), day, year)
             end
             tim = if sec.nil?
                     OpenStudio::Time.new(0, hou, min, 0)
@@ -550,6 +551,7 @@ class TimeseriesObjectiveFunction < OpenStudio::Measure::ReportingMeasure
             runner.registerInfo("dtm: #{dtm}") if verbose_messages
             csv[row].each_index do |col|
               next unless col > 0
+
               mtr = csv[row][col].to_s
               # try converting
               if convert == 0.5556 # this is a temperature
@@ -568,6 +570,7 @@ class TimeseriesObjectiveFunction < OpenStudio::Measure::ReportingMeasure
                 end
               end
               next unless csv[0][col] == hdr
+
               sim = ser.value(dtm)
               # store timeseries for plotting
               point = {}
@@ -579,9 +582,10 @@ class TimeseriesObjectiveFunction < OpenStudio::Measure::ReportingMeasure
               point2['time'] = to_JSTime(dtm)
               data2 << point2
 
-              dif = if norm == 1
+              dif = case norm
+                    when 1
                       scale.to_f * (mtr.to_f - sim.to_f).abs
-                    elsif norm == 2
+                    when 2
                       (scale.to_f * (mtr.to_f - sim.to_f))**2
                     else
                       scale.to_f * (mtr.to_f - sim.to_f)
@@ -606,6 +610,7 @@ class TimeseriesObjectiveFunction < OpenStudio::Measure::ReportingMeasure
           end
           # add 0 for plotting
           next unless last_zero
+
           runner.registerInfo("add last_zero: #{last_date + delta}")
           point = {}
           point['y'] = 0.0
@@ -654,15 +659,13 @@ class TimeseriesObjectiveFunction < OpenStudio::Measure::ReportingMeasure
     FileUtils.mkdir_p(File.dirname("allseries_#{csv_var}.json")) unless Dir.exist?(File.dirname("allseries_#{csv_var}.json"))
     File.open("allseries_#{csv_var}.json", 'wb') { |f| f << JSON.pretty_generate(all_series) }
     # check if analysis directory exists on server
-    if algorithm_download
-      if File.basename(File.expand_path(File.join(Dir.pwd, '../../../'))).split('_')[0] == 'analysis'
-        runner.registerInfo("Copying timeseries_#{csv_var}.json to downloads directory")
-        directory_name = File.expand_path(File.join(Dir.pwd, '../../../downloads'))
-        Dir.mkdir(directory_name) unless File.exist?(directory_name)
-        FileUtils.cp("timeseries_#{csv_var}.json", directory_name)
-        FileUtils.cp("allseries_#{csv_var}.json", directory_name)
-        FileUtils.cp("timeseries_#{plot_name}.csv", directory_name)
-      end
+    if algorithm_download && (File.basename(File.expand_path(File.join(Dir.pwd, '../../../'))).split('_')[0] == 'analysis')
+      runner.registerInfo("Copying timeseries_#{csv_var}.json to downloads directory")
+      directory_name = File.expand_path(File.join(Dir.pwd, '../../../downloads'))
+      Dir.mkdir(directory_name) unless File.exist?(directory_name)
+      FileUtils.cp("timeseries_#{csv_var}.json", directory_name)
+      FileUtils.cp("allseries_#{csv_var}.json", directory_name)
+      FileUtils.cp("timeseries_#{plot_name}.csv", directory_name)
     end
     diff = Math.sqrt(diff) if norm == 2