urbanopt-cli 0.6.2 → 0.7.1

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

@@ -48,12 +48,29 @@ def run_hpxml_workflow(rundir, measures, measures_dir, debug: false, output_vars
     om.setReportingFrequency(output_meter[1])
   end
 
+  # Remove unused objects automatically added by OpenStudio?
+  remove_objects = []
+  if model.alwaysOnContinuousSchedule.directUseCount == 0
+    remove_objects << ['Schedule:Constant', model.alwaysOnContinuousSchedule.name.to_s]
+  end
+  if model.alwaysOnDiscreteSchedule.directUseCount == 0
+    remove_objects << ['Schedule:Constant', model.alwaysOnDiscreteSchedule.name.to_s]
+  end
+  if model.alwaysOffDiscreteSchedule.directUseCount == 0
+    remove_objects << ['Schedule:Constant', model.alwaysOffDiscreteSchedule.name.to_s]
+  end
+
   # Translate model to workspace
   forward_translator = OpenStudio::EnergyPlus::ForwardTranslator.new
   forward_translator.setExcludeLCCObjects(true)
   workspace = forward_translator.translateModel(model)
   success = report_ft_errors_warnings(forward_translator, rundir)
 
+  # Remove objects
+  remove_objects.each do |remove_object|
+    workspace.getObjectByTypeAndName(remove_object[0].to_IddObjectType, remove_object[1]).get.remove
+  end
+
   if not success
     print "#{print_prefix}Creating input unsuccessful.\n"
     print "#{print_prefix}See #{File.join(rundir, 'run.log')} for details.\n"
@@ -145,7 +162,29 @@ def run_hpxml_workflow(rundir, measures, measures_dir, debug: false, output_vars
   return { success: true, runner: runner, sim_time: sim_time }
 end
 
-def apply_measures(measures_dir, measures, runner, model, show_measure_calls = true, measure_type = 'OpenStudio::Measure::ModelMeasure')
+def apply_measures(measures_dir, measures, runner, model, show_measure_calls = true, measure_type = 'OpenStudio::Measure::ModelMeasure', osw_out = nil)
+  if not osw_out.nil?
+    # Create a workflow based on the measures we're going to call. Convenient for debugging.
+    workflowJSON = OpenStudio::WorkflowJSON.new
+    workflowJSON.setOswPath(File.expand_path("../#{osw_out}"))
+    workflowJSON.addMeasurePath('measures')
+    workflowJSON.addMeasurePath('resources/hpxml-measures')
+    steps = OpenStudio::WorkflowStepVector.new
+    measures.each do |measure_subdir, args_array|
+      args_array.each do |args|
+        step = OpenStudio::MeasureStep.new(measure_subdir)
+        args.each do |k, v|
+          next if v.nil?
+
+          step.setArgument(k, "#{v}")
+        end
+        steps.push(step)
+      end
+    end
+    workflowJSON.setWorkflowSteps(steps)
+    workflowJSON.save
+  end
+
   # Call each measure in the specified order
   measures.keys.each do |measure_subdir|
     # Gather measure arguments and call measure
@@ -443,7 +482,6 @@ def report_os_warnings(os_log, rundir)
       next if s.logMessage.include? 'WorkflowStepResult value called with undefined stepResult'
       next if s.logMessage.include?("Object of type 'Schedule:Constant' and named 'Always") && s.logMessage.include?('points to an object named') && s.logMessage.include?('but that object cannot be located')
       next if s.logMessage.include? 'Appears there are no design condition fields in the EPW file'
-      next if s.logMessage.include?('Using EnergyPlusVersion version') && s.logMessage.include?("which should have 'Year' field, but it's always zero")
 
       f << "OS Message: #{s.logMessage}\n"
     end
@@ -500,7 +538,7 @@ def get_argument_values(runner, arguments, user_arguments)
       when 'Choice'.to_OSArgumentType
         args[argument.name] = runner.getOptionalStringArgumentValue(argument.name, user_arguments)
       when 'Boolean'.to_OSArgumentType
-        args[argument.name] = runner.getOptionalStringArgumentValue(argument.name, user_arguments)
+        args[argument.name] = runner.getOptionalBoolArgumentValue(argument.name, user_arguments)
       when 'Double'.to_OSArgumentType
         args[argument.name] = runner.getOptionalDoubleArgumentValue(argument.name, user_arguments)
       when 'Integer'.to_OSArgumentType

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

@@ -1,8 +1,20 @@
 # frozen_string_literal: true
 
-require 'minitest/autorun'
+called_from_cli = true
+begin
+  OpenStudio.getOpenStudioCLI
+rescue
+  called_from_cli = false
+end
+
+if ENV['CI'] && !called_from_cli
+  require 'simplecov'
+  SimpleCov.coverage_dir(File.join(Dir.getwd, 'coverage'))
+  SimpleCov.formatter = SimpleCov::Formatter::HTMLFormatter
+  SimpleCov.start
+end
 
+require 'minitest/autorun'
 require 'minitest/reporters'
 require 'minitest/reporters/spec_reporter' # Needed when run via OS CLI
-
 Minitest::Reporters.use! Minitest::Reporters::SpecReporter.new # spec-like progress

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

@@ -3,30 +3,30 @@
 class MiscLoads
   def self.apply_plug(model, plug_load, obj_name, living_space, apply_ashrae140_assumptions, schedules_file)
     kwh = 0
-
     if not plug_load.nil?
       kwh = plug_load.kWh_per_year * plug_load.usage_multiplier
-      if not schedules_file.nil?
-        if plug_load.plug_load_type == HPXML::PlugLoadTypeOther
-          col_name = 'plug_loads_other'
-        elsif plug_load.plug_load_type == HPXML::PlugLoadTypeTelevision
-          col_name = 'plug_loads_tv'
-        elsif plug_load.plug_load_type == HPXML::PlugLoadTypeElectricVehicleCharging
-          col_name = 'plug_loads_vehicle'
-        elsif plug_load.plug_load_type == HPXML::PlugLoadTypeWellPump
-          col_name = 'plug_loads_well_pump'
-        end
-        space_design_level = schedules_file.calc_design_level_from_annual_kwh(col_name: col_name, annual_kwh: kwh)
-        sch = schedules_file.create_schedule_file(col_name: col_name)
-      else
-        sch = MonthWeekdayWeekendSchedule.new(model, obj_name + ' schedule', plug_load.weekday_fractions, plug_load.weekend_fractions, plug_load.monthly_multipliers, Constants.ScheduleTypeLimitsFraction)
-        space_design_level = sch.calcDesignLevelFromDailykWh(kwh / 365.0)
-        sch = sch.schedule
-      end
     end
 
     return if kwh <= 0
 
+    if not schedules_file.nil?
+      if plug_load.plug_load_type == HPXML::PlugLoadTypeOther
+        col_name = 'plug_loads_other'
+      elsif plug_load.plug_load_type == HPXML::PlugLoadTypeTelevision
+        col_name = 'plug_loads_tv'
+      elsif plug_load.plug_load_type == HPXML::PlugLoadTypeElectricVehicleCharging
+        col_name = 'plug_loads_vehicle'
+      elsif plug_load.plug_load_type == HPXML::PlugLoadTypeWellPump
+        col_name = 'plug_loads_well_pump'
+      end
+      space_design_level = schedules_file.calc_design_level_from_annual_kwh(col_name: col_name, annual_kwh: kwh)
+      sch = schedules_file.create_schedule_file(col_name: col_name)
+    else
+      sch = MonthWeekdayWeekendSchedule.new(model, obj_name + ' schedule', plug_load.weekday_fractions, plug_load.weekend_fractions, plug_load.monthly_multipliers, Constants.ScheduleTypeLimitsFraction)
+      space_design_level = sch.calcDesignLevelFromDailykWh(kwh / 365.0)
+      sch = sch.schedule
+    end
+
     sens_frac = plug_load.frac_sensible
     lat_frac = plug_load.frac_latent
 

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

@@ -13,6 +13,20 @@ class PV
       max_power = pv_system.max_power_output * nbeds.to_f / pv_system.number_of_bedrooms_served.to_f
     end
 
+    elcds = model.getElectricLoadCenterDistributions
+    if elcds.empty?
+      elcd = OpenStudio::Model::ElectricLoadCenterDistribution.new(model)
+      elcd.setName('PVSystem elec load center dist')
+
+      ipvwatts = OpenStudio::Model::ElectricLoadCenterInverterPVWatts.new(model)
+      ipvwatts.setName('PVSystem inverter')
+      ipvwatts.setInverterEfficiency(pv_system.inverter_efficiency)
+
+      elcd.setInverter(ipvwatts)
+    else
+      elcd = elcds[0]
+    end
+
     gpvwatts = OpenStudio::Model::GeneratorPVWatts.new(model, max_power)
     gpvwatts.setName("#{obj_name} generator")
     gpvwatts.setSystemLosses(pv_system.system_losses_fraction)
@@ -37,14 +51,7 @@ class PV
       gpvwatts.setModuleType('ThinFilm')
     end
 
-    ipvwatts = OpenStudio::Model::ElectricLoadCenterInverterPVWatts.new(model)
-    ipvwatts.setName("#{obj_name} inverter")
-    ipvwatts.setInverterEfficiency(pv_system.inverter_efficiency)
-
-    elcd = OpenStudio::Model::ElectricLoadCenterDistribution.new(model)
-    elcd.setName("#{obj_name} elec load center dist")
     elcd.addGenerator(gpvwatts)
-    elcd.setInverter(ipvwatts)
   end
 
   def self.calc_module_power_from_year(year_modules_manufactured)