lib/openstudio-standards/standards/necb/BTAP1980TO2010/btap_1980to2010.rb in openstudio-standards-0.2.12.rc4 vs lib/openstudio-standards/standards/necb/BTAP1980TO2010/btap_1980to2010.rb in openstudio-standards-0.2.12.rc5

- old
+ new

@@ -26,11 +26,11 @@ elsif !data['constants'].nil? @standards_data['formulas'] = [*@standards_data['formulas'], *data['formulas']].to_h end end else - files = Dir.glob("#{File.dirname(__FILE__)}/data/*.json").select {|e| File.file? e} + files = Dir.glob("#{File.dirname(__FILE__)}/data/*.json").select { |e| File.file? e } files.each do |file| data = JSON.parse(File.read(file)) if !data['tables'].nil? @standards_data['tables'] = [*@standards_data['tables'], *data['tables']].to_h elsif !data['constants'].nil? @@ -44,26 +44,10 @@ # File.open(File.join(File.dirname(__FILE__), '..', 'NECB2017.json'), 'w') {|f| f.write(JSON.pretty_generate(@standards_data))} return @standards_data end - # Created this method so that additional methods can be addded for bulding the prototype model in later - # code versions without modifying the build_protoype_model method or copying it wholesale for a few changes. - def model_apply_standard(model:, - epw_file:, - sizing_run_dir: Dir.pwd, - primary_heating_fuel: 'DefaultFuel') - apply_weather_data(model: model, epw_file: epw_file) - apply_loads(model: model) - apply_envelope( model: model) - #Keeping default window sizes in 1980-2010 buildings and removing daylighting - #apply_fdwr_srr_daylighting(model: model) - apply_auto_zoning(model: model, sizing_run_dir: sizing_run_dir) - apply_systems(model: model, primary_heating_fuel: primary_heating_fuel, sizing_run_dir: sizing_run_dir) - apply_standard_efficiencies(model: model, sizing_run_dir: sizing_run_dir) - model = apply_loop_pump_power(model: model, sizing_run_dir: sizing_run_dir) - return model - end + #occupancy sensor control applied using lighting schedule, see apply_lighting_schedule method def set_occ_sensor_spacetypes(model, space_type_map) return true end