urbanopt-cli 0.8.3 → 0.9.0

data/example_files/resources/hpxml-measures/workflow/real_homes/house046.xml

@@ -143,31 +143,36 @@
             </Insulation>
           </Wall>
         </Walls>
-        <FrameFloors>
-          <FrameFloor>
-            <SystemIdentifier id='FrameFloor1'/>
+        <Floors>
+          <Floor>
+            <SystemIdentifier id='Floor1'/>
             <ExteriorAdjacentTo>attic - vented</ExteriorAdjacentTo>
             <InteriorAdjacentTo>living space</InteriorAdjacentTo>
+            <FloorOrCeiling>ceiling</FloorOrCeiling>
+            <FloorType>
+              <WoodFrame/>
+            </FloorType>
             <Area>870.0</Area>
             <Insulation>
-              <SystemIdentifier id='FrameFloor1Insulation'/>
+              <SystemIdentifier id='Floor1Insulation'/>
               <AssemblyEffectiveRValue>24.61</AssemblyEffectiveRValue>
             </Insulation>
-          </FrameFloor>
-          <FrameFloor>
-            <SystemIdentifier id='FrameFloor2'/>
+          </Floor>
+          <Floor>
+            <SystemIdentifier id='Floor2'/>
             <ExteriorAdjacentTo>other housing unit</ExteriorAdjacentTo>
             <InteriorAdjacentTo>living space</InteriorAdjacentTo>
+            <FloorOrCeiling>floor</FloorOrCeiling>
+            <FloorType>
+              <WoodFrame/>
+            </FloorType>
             <Area>870.0</Area>
             <Insulation>
-              <SystemIdentifier id='FrameFloor2Insulation'/>
+              <SystemIdentifier id='Floor2Insulation'/>
               <AssemblyEffectiveRValue>11.81</AssemblyEffectiveRValue>
             </Insulation>
-            <extension>
-              <OtherSpaceAboveOrBelow>below</OtherSpaceAboveOrBelow>
-            </extension>
-          </FrameFloor>
-        </FrameFloors>
+          </Floor>
+        </Floors>
         <Windows>
           <Window>
             <SystemIdentifier id='Window1'/>
@@ -284,12 +289,14 @@
                   </DuctLeakage>
                 </DuctLeakageMeasurement>
                 <Ducts>
+                  <SystemIdentifier id='Duct1'/>
                   <DuctType>supply</DuctType>
                   <DuctInsulationRValue>8.0</DuctInsulationRValue>
                   <DuctLocation>attic - vented</DuctLocation>
                   <DuctSurfaceArea>234.9</DuctSurfaceArea>
                 </Ducts>
                 <Ducts>
+                  <SystemIdentifier id='Duct2'/>
                   <DuctType>return</DuctType>
                   <DuctInsulationRValue>6.1</DuctInsulationRValue>
                   <DuctLocation>attic - vented</DuctLocation>

data/example_files/resources/hpxml-measures/workflow/real_homes/house047.xml

@@ -112,21 +112,22 @@
             </Insulation>
           </Wall>
         </Walls>
-        <FrameFloors>
-          <FrameFloor>
-            <SystemIdentifier id='FrameFloor1'/>
+        <Floors>
+          <Floor>
+            <SystemIdentifier id='Floor1'/>
             <ExteriorAdjacentTo>other housing unit</ExteriorAdjacentTo>
             <InteriorAdjacentTo>living space</InteriorAdjacentTo>
+            <FloorOrCeiling>ceiling</FloorOrCeiling>
+            <FloorType>
+              <WoodFrame/>
+            </FloorType>
             <Area>718.0</Area>
             <Insulation>
-              <SystemIdentifier id='FrameFloor1Insulation'/>
+              <SystemIdentifier id='Floor1Insulation'/>
               <AssemblyEffectiveRValue>1.67</AssemblyEffectiveRValue>
             </Insulation>
-            <extension>
-              <OtherSpaceAboveOrBelow>above</OtherSpaceAboveOrBelow>
-            </extension>
-          </FrameFloor>
-        </FrameFloors>
+          </Floor>
+        </Floors>
         <Slabs>
           <Slab>
             <SystemIdentifier id='Slab1'/>
@@ -233,12 +234,14 @@
                   </DuctLeakage>
                 </DuctLeakageMeasurement>
                 <Ducts>
+                  <SystemIdentifier id='Duct1'/>
                   <DuctType>supply</DuctType>
                   <DuctInsulationRValue>0.0</DuctInsulationRValue>
                   <DuctLocation>living space</DuctLocation>
                   <DuctSurfaceArea>145.4</DuctSurfaceArea>
                 </Ducts>
                 <Ducts>
+                  <SystemIdentifier id='Duct2'/>
                   <DuctType>return</DuctType>
                   <DuctInsulationRValue>0.0</DuctInsulationRValue>
                   <DuctLocation>living space</DuctLocation>

data/example_files/resources/hpxml-measures/workflow/real_homes/house048.xml

@@ -248,38 +248,47 @@
             </Insulation>
           </Wall>
         </Walls>
-        <FrameFloors>
-          <FrameFloor>
-            <SystemIdentifier id='FrameFloor1'/>
+        <Floors>
+          <Floor>
+            <SystemIdentifier id='Floor1'/>
             <ExteriorAdjacentTo>attic - vented</ExteriorAdjacentTo>
             <InteriorAdjacentTo>living space</InteriorAdjacentTo>
+            <FloorType>
+              <WoodFrame/>
+            </FloorType>
             <Area>1657.0</Area>
             <Insulation>
-              <SystemIdentifier id='FrameFloor1Insulation'/>
+              <SystemIdentifier id='Floor1Insulation'/>
               <AssemblyEffectiveRValue>38.17</AssemblyEffectiveRValue>
             </Insulation>
-          </FrameFloor>
-          <FrameFloor>
-            <SystemIdentifier id='FrameFloor2'/>
+          </Floor>
+          <Floor>
+            <SystemIdentifier id='Floor2'/>
             <ExteriorAdjacentTo>attic - vented</ExteriorAdjacentTo>
             <InteriorAdjacentTo>living space</InteriorAdjacentTo>
+            <FloorType>
+              <WoodFrame/>
+            </FloorType>
             <Area>150.0</Area>
             <Insulation>
-              <SystemIdentifier id='FrameFloor2Insulation'/>
+              <SystemIdentifier id='Floor2Insulation'/>
               <AssemblyEffectiveRValue>19.81</AssemblyEffectiveRValue>
             </Insulation>
-          </FrameFloor>
-          <FrameFloor>
-            <SystemIdentifier id='FrameFloor3'/>
+          </Floor>
+          <Floor>
+            <SystemIdentifier id='Floor3'/>
             <ExteriorAdjacentTo>garage</ExteriorAdjacentTo>
             <InteriorAdjacentTo>living space</InteriorAdjacentTo>
+            <FloorType>
+              <WoodFrame/>
+            </FloorType>
             <Area>32.0</Area>
             <Insulation>
-              <SystemIdentifier id='FrameFloor3Insulation'/>
+              <SystemIdentifier id='Floor3Insulation'/>
               <AssemblyEffectiveRValue>22.16</AssemblyEffectiveRValue>
             </Insulation>
-          </FrameFloor>
-        </FrameFloors>
+          </Floor>
+        </Floors>
         <Slabs>
           <Slab>
             <SystemIdentifier id='Slab1'/>
@@ -474,12 +483,14 @@
                   </DuctLeakage>
                 </DuctLeakageMeasurement>
                 <Ducts>
+                  <SystemIdentifier id='Duct1'/>
                   <DuctType>supply</DuctType>
                   <DuctInsulationRValue>8.0</DuctInsulationRValue>
                   <DuctLocation>attic - vented</DuctLocation>
                   <DuctSurfaceArea>542.700012</DuctSurfaceArea>
                 </Ducts>
                 <Ducts>
+                  <SystemIdentifier id='Duct2'/>
                   <DuctType>return</DuctType>
                   <DuctInsulationRValue>8.0</DuctInsulationRValue>
                   <DuctLocation>attic - vented</DuctLocation>

data/example_files/resources/hpxml-measures/workflow/real_homes/house049.xml

@@ -158,18 +158,21 @@
             </Insulation>
           </Wall>
         </Walls>
-        <FrameFloors>
-          <FrameFloor>
-            <SystemIdentifier id='FrameFloor1'/>
+        <Floors>
+          <Floor>
+            <SystemIdentifier id='Floor1'/>
             <ExteriorAdjacentTo>attic - vented</ExteriorAdjacentTo>
             <InteriorAdjacentTo>living space</InteriorAdjacentTo>
+            <FloorType>
+              <WoodFrame/>
+            </FloorType>
             <Area>1571.0</Area>
             <Insulation>
-              <SystemIdentifier id='FrameFloor1Insulation'/>
+              <SystemIdentifier id='Floor1Insulation'/>
               <AssemblyEffectiveRValue>42.52</AssemblyEffectiveRValue>
             </Insulation>
-          </FrameFloor>
-        </FrameFloors>
+          </Floor>
+        </Floors>
         <Slabs>
           <Slab>
             <SystemIdentifier id='Slab1'/>
@@ -561,7 +564,7 @@
               <Recirculation>
                 <ControlType>temperature</ControlType>
                 <RecirculationPipingLoopLength>133.5</RecirculationPipingLoopLength>
-                <BranchPipingLoopLength>10.0</BranchPipingLoopLength>
+                <BranchPipingLength>10.0</BranchPipingLength>
                 <PumpPower>50.0</PumpPower>
               </Recirculation>
             </SystemType>

data/example_files/resources/hpxml-measures/workflow/real_homes/house050.xml

@@ -185,28 +185,34 @@
             </Insulation>
           </FoundationWall>
         </FoundationWalls>
-        <FrameFloors>
-          <FrameFloor>
-            <SystemIdentifier id='FrameFloor1'/>
+        <Floors>
+          <Floor>
+            <SystemIdentifier id='Floor1'/>
             <ExteriorAdjacentTo>attic - vented</ExteriorAdjacentTo>
             <InteriorAdjacentTo>living space</InteriorAdjacentTo>
+            <FloorType>
+              <WoodFrame/>
+            </FloorType>
             <Area>1922.0</Area>
             <Insulation>
-              <SystemIdentifier id='FrameFloor1Insulation'/>
+              <SystemIdentifier id='Floor1Insulation'/>
               <AssemblyEffectiveRValue>44.95</AssemblyEffectiveRValue>
             </Insulation>
-          </FrameFloor>
-          <FrameFloor>
-            <SystemIdentifier id='FrameFloor2'/>
+          </Floor>
+          <Floor>
+            <SystemIdentifier id='Floor2'/>
             <ExteriorAdjacentTo>crawlspace - vented</ExteriorAdjacentTo>
             <InteriorAdjacentTo>living space</InteriorAdjacentTo>
+            <FloorType>
+              <WoodFrame/>
+            </FloorType>
             <Area>1922.0</Area>
             <Insulation>
-              <SystemIdentifier id='FrameFloor2Insulation'/>
+              <SystemIdentifier id='Floor2Insulation'/>
               <AssemblyEffectiveRValue>33.91</AssemblyEffectiveRValue>
             </Insulation>
-          </FrameFloor>
-        </FrameFloors>
+          </Floor>
+        </Floors>
         <Slabs>
           <Slab>
             <SystemIdentifier id='Slab1'/>
@@ -391,24 +397,28 @@
                   </DuctLeakage>
                 </DuctLeakageMeasurement>
                 <Ducts>
+                  <SystemIdentifier id='Duct1'/>
                   <DuctType>supply</DuctType>
                   <DuctInsulationRValue>8.0</DuctInsulationRValue>
                   <DuctLocation>living space</DuctLocation>
                   <DuctSurfaceArea>518.9</DuctSurfaceArea>
                 </Ducts>
                 <Ducts>
+                  <SystemIdentifier id='Duct2'/>
                   <DuctType>return</DuctType>
                   <DuctInsulationRValue>8.0</DuctInsulationRValue>
                   <DuctLocation>living space</DuctLocation>
                   <DuctSurfaceArea>76.9</DuctSurfaceArea>
                 </Ducts>
                 <Ducts>
+                  <SystemIdentifier id='Duct3'/>
                   <DuctType>supply</DuctType>
                   <DuctInsulationRValue>8.0</DuctInsulationRValue>
                   <DuctLocation>attic - vented</DuctLocation>
                   <DuctSurfaceArea>518.9</DuctSurfaceArea>
                 </Ducts>
                 <Ducts>
+                  <SystemIdentifier id='Duct4'/>
                   <DuctType>return</DuctType>
                   <DuctInsulationRValue>8.0</DuctInsulationRValue>
                   <DuctLocation>attic - vented</DuctLocation>
@@ -428,7 +438,6 @@
               <HoursInOperation>24.0</HoursInOperation>
               <UsedForWholeBuildingVentilation>true</UsedForWholeBuildingVentilation>
               <IsSharedSystem>false</IsSharedSystem>
-              <AdjustedTotalRecoveryEfficiency>0.0</AdjustedTotalRecoveryEfficiency>
               <AdjustedSensibleRecoveryEfficiency>0.68</AdjustedSensibleRecoveryEfficiency>
               <FanPower>74.6</FanPower>
             </VentilationFan>

data/example_files/resources/hpxml-measures/workflow/run_simulation.rb

@@ -11,8 +11,9 @@ require_relative '../HPXMLtoOpenStudio/resources/version'
 
 basedir = File.expand_path(File.dirname(__FILE__))
 
-def run_workflow(basedir, rundir, hpxml, debug, timeseries_output_freq, timeseries_outputs, skip_validation, add_comp_loads, add_utility_bills,
-                 output_format, building_id, ep_input_format, detailed_schedules_type, timeseries_time_column_types, timeseries_output_variables)
+def run_workflow(basedir, rundir, hpxml, debug, timeseries_output_freq, timeseries_outputs, skip_validation, add_comp_loads,
+                 output_format, building_id, ep_input_format, detailed_schedules_type, timeseries_time_column_types,
+                 timeseries_output_variables, timeseries_timestamp_convention)
   measures_dir = File.join(basedir, '..')
 
   measures = {}
@@ -25,6 +26,7 @@ def run_workflow(basedir, rundir, hpxml, debug, timeseries_output_freq, timeseri
     args['hpxml_output_path'] = hpxml
     args['schedules_type'] = detailed_schedules_type
     args['output_csv_path'] = File.join(rundir, "#{detailed_schedules_type}.csv")
+    args['debug'] = debug
     update_args_hash(measures, measure_subdir, args)
   end
 
@@ -48,41 +50,41 @@ def run_workflow(basedir, rundir, hpxml, debug, timeseries_output_freq, timeseri
   args['include_timeseries_fuel_consumptions'] = timeseries_outputs.include? 'fuels'
   args['include_timeseries_end_use_consumptions'] = timeseries_outputs.include? 'enduses'
   args['include_timeseries_emissions'] = timeseries_outputs.include? 'emissions'
+  args['include_timeseries_emission_fuels'] = timeseries_outputs.include? 'emissionfuels'
+  args['include_timeseries_emission_end_uses'] = timeseries_outputs.include? 'emissionenduses'
   args['include_timeseries_hot_water_uses'] = timeseries_outputs.include? 'hotwater'
   args['include_timeseries_total_loads'] = timeseries_outputs.include? 'loads'
   args['include_timeseries_component_loads'] = timeseries_outputs.include? 'componentloads'
+  args['include_timeseries_unmet_hours'] = timeseries_outputs.include? 'unmethours'
   args['include_timeseries_zone_temperatures'] = timeseries_outputs.include? 'temperatures'
   args['include_timeseries_airflows'] = timeseries_outputs.include? 'airflows'
   args['include_timeseries_weather'] = timeseries_outputs.include? 'weather'
+  args['timeseries_timestamp_convention'] = timeseries_timestamp_convention
   args['add_timeseries_dst_column'] = timeseries_time_column_types.include? 'DST'
   args['add_timeseries_utc_column'] = timeseries_time_column_types.include? 'UTC'
   args['user_output_variables'] = timeseries_output_variables.join(', ') unless timeseries_output_variables.empty?
   update_args_hash(measures, measure_subdir, args)
 
-  # Add hpxml output measure to workflow
-  measure_subdir = 'ReportHPXMLOutput'
+  output_format = 'csv' if output_format == 'csv_dview'
+
+  # Add utility bills measure to workflow
+  measure_subdir = 'ReportUtilityBills'
   args = {}
   args['output_format'] = output_format
   update_args_hash(measures, measure_subdir, args)
 
-  # Add utility bills measure to workflow
-  if add_utility_bills
-    measure_subdir = 'ReportUtilityBills'
-    args = {}
-    args['output_format'] = output_format
-    update_args_hash(measures, measure_subdir, args)
-  end
-
   results = run_hpxml_workflow(rundir, measures, measures_dir, debug: debug, ep_input_format: ep_input_format)
 
   return results[:success]
 end
 
-timeseries_types = ['ALL', 'total', 'fuels', 'enduses', 'emissions', 'hotwater', 'loads', 'componentloads', 'temperatures', 'airflows', 'weather']
+timeseries_types = ['ALL', 'total', 'fuels', 'enduses', 'emissions', 'emissionfuels',
+                    'emissionenduses', 'hotwater', 'loads', 'componentloads',
+                    'unmethours', 'temperatures', 'airflows', 'weather']
 
 options = {}
 OptionParser.new do |opts|
-  opts.banner = "Usage: #{File.basename(__FILE__)} -x building.xml\n e.g., #{File.basename(__FILE__)} -x base.xml\n"
+  opts.banner = "Usage: #{File.basename(__FILE__)} -x building.xml"
 
   opts.on('-x', '--xml <FILE>', 'HPXML file') do |t|
     options[:hpxml] = t
@@ -92,37 +94,37 @@ OptionParser.new do |opts|
     options[:output_dir] = t
   end
 
-  opts.on('--output-format TYPE', ['csv', 'json', 'msgpack'], 'Output file format type (csv, json, msgpack)') do |t|
+  opts.on('--output-format TYPE', ['csv', 'json', 'msgpack', 'csv_dview'], 'Output file format type (csv, json, msgpack, csv_dview)') do |t|
     options[:output_format] = t
   end
 
   options[:hourly_outputs] = []
-  opts.on('--hourly TYPE', timeseries_types, "Request hourly output type (#{timeseries_types[0..5].join(', ')},", "#{timeseries_types[6..-1].join(', ')}); can be called multiple times") do |t|
+  opts.on('--hourly TYPE', timeseries_types, "Request hourly output type (#{timeseries_types.join(', ')}); can be called multiple times") do |t|
     options[:hourly_outputs] << t
   end
 
   options[:daily_outputs] = []
-  opts.on('--daily TYPE', timeseries_types, "Request daily output type (#{timeseries_types[0..5].join(', ')},", "#{timeseries_types[6..-1].join(', ')}); can be called multiple times") do |t|
+  opts.on('--daily TYPE', timeseries_types, "Request daily output type (#{timeseries_types.join(', ')}); can be called multiple times") do |t|
     options[:daily_outputs] << t
   end
 
   options[:monthly_outputs] = []
-  opts.on('--monthly TYPE', timeseries_types, "Request monthly output type (#{timeseries_types[0..5].join(', ')},", "#{timeseries_types[6..-1].join(', ')}); can be called multiple times") do |t|
+  opts.on('--monthly TYPE', timeseries_types, "Request monthly output type (#{timeseries_types.join(', ')}); can be called multiple times") do |t|
     options[:monthly_outputs] << t
   end
 
   options[:timestep_outputs] = []
-  opts.on('--timestep TYPE', timeseries_types, "Request timestep output type (#{timeseries_types[0..5].join(', ')},", "#{timeseries_types[6..-1].join(', ')}); can be called multiple times") do |t|
+  opts.on('--timestep TYPE', timeseries_types, "Request timestep output type (#{timeseries_types.join(', ')}); can be called multiple times") do |t|
     options[:timestep_outputs] << t
   end
 
   options[:skip_validation] = false
-  opts.on('-s', '--skip-validation', 'Skip Schema/Schematron validation for faster performance') do |t|
+  opts.on('-s', '--skip-validation', 'Skip Schema/Schematron validation for faster performance') do |_t|
     options[:skip_validation] = true
   end
 
   options[:add_comp_loads] = false
-  opts.on('--add-component-loads', 'Add heating/cooling component loads calculation') do |t|
+  opts.on('--add-component-loads', 'Add heating/cooling component loads calculation') do |_t|
     options[:add_comp_loads] = true
   end
 
@@ -140,9 +142,9 @@ OptionParser.new do |opts|
     options[:timeseries_output_variables] << t
   end
 
-  options[:add_utility_bills] = false
-  opts.on('--add-utility-bills', 'Add utility bill calculations (using default rates).') do |t|
-    options[:add_utility_bills] = true
+  options[:timeseries_timestamp_convention] = 'start'
+  opts.on('--timeseries-timestamp-convention TYPE', ['start', 'end'], 'Convention (start, end) for timeseries timestamps') do |t|
+    options[:timeseries_timestamp_convention] = t
   end
 
   options[:ep_input_format] = 'idf'
@@ -155,12 +157,12 @@ OptionParser.new do |opts|
   end
 
   options[:version] = false
-  opts.on('-v', '--version', 'Reports the version') do |t|
+  opts.on('-v', '--version', 'Reports the version') do |_t|
     options[:version] = true
   end
 
   options[:debug] = false
-  opts.on('-d', '--debug') do |t|
+  opts.on('-d', '--debug', 'Generate additional debug output/files') do |_t|
     options[:debug] = true
   end
 
@@ -172,77 +174,78 @@ end.parse!
 
 if options[:version]
   puts "OpenStudio-HPXML v#{Version::OS_HPXML_Version}"
-  exit!
-end
+  puts "OpenStudio v#{OpenStudio.openStudioLongVersion}"
+  puts "EnergyPlus v#{OpenStudio.energyPlusVersion}.#{OpenStudio.energyPlusBuildSHA}"
+else
+  if not options[:hpxml]
+    fail "HPXML argument is required. Call #{File.basename(__FILE__)} -h for usage."
+  end
 
-if not options[:hpxml]
-  fail "HPXML argument is required. Call #{File.basename(__FILE__)} -h for usage."
-end
+  timeseries_output_freq = 'none'
+  timeseries_outputs = []
+  n_freq = 0
+  if not options[:hourly_outputs].empty?
+    n_freq += 1
+    timeseries_output_freq = 'hourly'
+    timeseries_outputs = options[:hourly_outputs]
+  end
+  if not options[:daily_outputs].empty?
+    n_freq += 1
+    timeseries_output_freq = 'daily'
+    timeseries_outputs = options[:daily_outputs]
+  end
+  if not options[:monthly_outputs].empty?
+    n_freq += 1
+    timeseries_output_freq = 'monthly'
+    timeseries_outputs = options[:monthly_outputs]
+  end
+  if not options[:timestep_outputs].empty?
+    n_freq += 1
+    timeseries_output_freq = 'timestep'
+    timeseries_outputs = options[:timestep_outputs]
+  end
 
-timeseries_output_freq = 'none'
-timeseries_outputs = []
-n_freq = 0
-if not options[:hourly_outputs].empty?
-  n_freq += 1
-  timeseries_output_freq = 'hourly'
-  timeseries_outputs = options[:hourly_outputs]
-end
-if not options[:daily_outputs].empty?
-  n_freq += 1
-  timeseries_output_freq = 'daily'
-  timeseries_outputs = options[:daily_outputs]
-end
-if not options[:monthly_outputs].empty?
-  n_freq += 1
-  timeseries_output_freq = 'monthly'
-  timeseries_outputs = options[:monthly_outputs]
-end
-if not options[:timestep_outputs].empty?
-  n_freq += 1
-  timeseries_output_freq = 'timestep'
-  timeseries_outputs = options[:timestep_outputs]
-end
+  if not options[:timeseries_output_variables].empty?
+    timeseries_output_freq = 'timestep' if timeseries_output_freq == 'none'
+  end
 
-if not options[:timeseries_output_variables].empty?
-  timeseries_output_freq = 'timestep' if timeseries_output_freq == 'none'
-end
+  if n_freq > 1
+    fail 'Multiple timeseries frequencies (hourly, daily, monthly, timestep) are not supported.'
+  end
 
-if n_freq > 1
-  fail 'Multiple timeseries frequencies (hourly, daily, monthly, timestep) are not supported.'
-end
+  if timeseries_outputs.include? 'ALL'
+    timeseries_outputs = timeseries_types[1..-1]
+  end
 
-if timeseries_outputs.include? 'ALL'
-  timeseries_outputs = timeseries_types[1..-1]
-end
+  unless (Pathname.new options[:hpxml]).absolute?
+    options[:hpxml] = File.expand_path(options[:hpxml])
+  end
+  unless File.exist?(options[:hpxml]) && options[:hpxml].downcase.end_with?('.xml')
+    fail "'#{options[:hpxml]}' does not exist or is not an .xml file."
+  end
 
-unless (Pathname.new options[:hpxml]).absolute?
-  options[:hpxml] = File.expand_path(options[:hpxml])
-end
-unless File.exist?(options[:hpxml]) && options[:hpxml].downcase.end_with?('.xml')
-  fail "'#{options[:hpxml]}' does not exist or is not an .xml file."
-end
+  if options[:output_dir].nil?
+    options[:output_dir] = File.dirname(options[:hpxml]) # default
+  end
+  options[:output_dir] = File.expand_path(options[:output_dir])
 
-if options[:output_dir].nil?
-  options[:output_dir] = File.dirname(options[:hpxml]) # default
-end
-options[:output_dir] = File.expand_path(options[:output_dir])
+  unless Dir.exist?(options[:output_dir])
+    FileUtils.mkdir_p(options[:output_dir])
+  end
 
-unless Dir.exist?(options[:output_dir])
-  FileUtils.mkdir_p(options[:output_dir])
-end
+  # Create run dir
+  rundir = File.join(options[:output_dir], 'run')
 
-# Create run dir
-rundir = File.join(options[:output_dir], 'run')
+  # Run design
+  puts "HPXML: #{options[:hpxml]}"
+  success = run_workflow(basedir, rundir, options[:hpxml], options[:debug], timeseries_output_freq, timeseries_outputs,
+                         options[:skip_validation], options[:add_comp_loads], options[:output_format], options[:building_id],
+                         options[:ep_input_format], options[:detailed_schedules_type], options[:timeseries_time_column_types],
+                         options[:timeseries_output_variables], options[:timeseries_timestamp_convention])
 
-# Run design
-puts "HPXML: #{options[:hpxml]}"
-success = run_workflow(basedir, rundir, options[:hpxml], options[:debug], timeseries_output_freq, timeseries_outputs,
-                       options[:skip_validation], options[:add_comp_loads], options[:add_utility_bills], options[:output_format], options[:building_id],
-                       options[:ep_input_format], options[:detailed_schedules_type],
-                       options[:timeseries_time_column_types], options[:timeseries_output_variables])
+  if not success
+    exit! 1
+  end
 
-if not success
-  exit! 1
+  puts "Completed in #{(Time.now - start_time).round(1)}s."
 end
-
-puts "Completed in #{(Time.now - start_time).round(1)}s."