lib/openstudio-standards.rb in openstudio-standards-0.6.0.rc2 vs lib/openstudio-standards.rb in openstudio-standards-0.6.3

@@ -22,20 +22,24 @@
   require_relative 'openstudio-standards/constructions/materials/information'
   require_relative 'openstudio-standards/constructions/materials/modify'
 
   # Infiltration Module
   require_relative 'openstudio-standards/infiltration/infiltration'
+  require_relative 'openstudio-standards/infiltration/nist_infiltration'
 
   # Daylighting Module
   require_relative 'openstudio-standards/daylighting/space'
 
   # Schedules Module
   require_relative 'openstudio-standards/schedules/create'
   require_relative 'openstudio-standards/schedules/modify'
   require_relative 'openstudio-standards/schedules/information'
   require_relative 'openstudio-standards/schedules/parametric'
 
+  # ServiceWaterHeating Module
+  require_relative 'openstudio-standards/service_water_heating/component'
+
   # Space Module
   require_relative 'openstudio-standards/space/space'
 
   # Thermal Zone Module
   require_relative 'openstudio-standards/thermal_zone/thermal_zone'
@@ -224,21 +228,15 @@
   require_relative "#{stds}/cbes/cbes_t24_1992/cbes_t24_1992"
   require_relative "#{stds}/cbes/cbes_t24_2001/cbes_t24_2001"
   require_relative "#{stds}/cbes/cbes_t24_2005/cbes_t24_2005"
   require_relative "#{stds}/cbes/cbes_t24_2008/cbes_t24_2008"
 
-  # Files with modules
-  require_relative "#{stds}/Standards.Fan"
+  # Base Model Objects
   require_relative "#{stds}/Standards.CoilDX"
-  require_relative "#{stds}/Standards.Pump"
   require_relative "#{stds}/Standards.CoolingTower"
-  require_relative "#{stds}/ashrae_90_1/ashrae_90_1_2010/ashrae_90_1_2010.CoolingTower"
-  require_relative "#{stds}/ashrae_90_1/ashrae_90_1_2013/ashrae_90_1_2013.CoolingTower"
-  require_relative "#{stds}/ashrae_90_1/ashrae_90_1_2016/ashrae_90_1_2016.CoolingTower"
-  require_relative "#{stds}/ashrae_90_1/ashrae_90_1_2019/ashrae_90_1_2019.CoolingTower"
-  require_relative "#{stds}/ashrae_90_1/nrel_zne_ready_2017/nrel_zne_ready_2017.CoolingTower"
-  require_relative "#{stds}/ashrae_90_1/ze_aedg_multifamily/ze_aedg_multifamily.CoolingTower"
+  require_relative "#{stds}/Standards.Fan"
+  require_relative "#{stds}/Standards.Pump"
   require_relative "#{stds}/ashrae_90_1_prm/ashrae_90_1_prm.Fan"
 
   # Model Objects
   require_relative "#{stds}/Standards.AirLoopHVAC"
   require_relative "#{stds}/Standards.AirTerminalSingleDuctParallelPIUReheat"
@@ -247,21 +245,18 @@
   require_relative "#{stds}/Standards.ChillerElectricEIR"
   require_relative "#{stds}/Standards.CoilCoolingDXMultiSpeed"
   require_relative "#{stds}/Standards.CoilCoolingDXSingleSpeed"
   require_relative "#{stds}/Standards.CoilCoolingDXTwoSpeed"
   require_relative "#{stds}/Standards.CoilCoolingWaterToAirHeatPumpEquationFit"
-  require_relative "#{stds}/Standards.CoilDX"
   require_relative "#{stds}/Standards.CoilHeatingDXMultiSpeed"
   require_relative "#{stds}/Standards.CoilHeatingDXSingleSpeed"
   require_relative "#{stds}/Standards.CoilHeatingGasMultiStage"
   require_relative "#{stds}/Standards.CoilHeatingGas"
   require_relative "#{stds}/Standards.CoilHeatingWaterToAirHeatPumpEquationFit"
-  require_relative "#{stds}/Standards.CoolingTower"
   require_relative "#{stds}/Standards.CoolingTowerSingleSpeed"
   require_relative "#{stds}/Standards.CoolingTowerTwoSpeed"
   require_relative "#{stds}/Standards.CoolingTowerVariableSpeed"
-  require_relative "#{stds}/Standards.Fan"
   require_relative "#{stds}/Standards.FanConstantVolume"
   require_relative "#{stds}/Standards.FanOnOff"
   require_relative "#{stds}/Standards.FanVariableVolume"
   require_relative "#{stds}/Standards.FanZoneExhaust"
   require_relative "#{stds}/Standards.FluidCooler"
@@ -269,11 +264,10 @@
   require_relative "#{stds}/Standards.HeaderedPumpsVariableSpeed"
   require_relative "#{stds}/Standards.HeatExchangerSensLat"
   require_relative "#{stds}/Standards.Model"
   require_relative "#{stds}/Standards.PlanarSurface"
   require_relative "#{stds}/Standards.PlantLoop"
-  require_relative "#{stds}/Standards.Pump"
   require_relative "#{stds}/Standards.PumpConstantSpeed"
   require_relative "#{stds}/Standards.PumpVariableSpeed"
   require_relative "#{stds}/Standards.ScheduleRuleset"
   require_relative "#{stds}/Standards.Space"
   require_relative "#{stds}/Standards.SpaceType"
@@ -303,9 +297,10 @@
   # 90.1-2010
   require_relative "#{stds}/ashrae_90_1/ashrae_90_1_2010/ashrae_90_1_2010.AirLoopHVAC"
   require_relative "#{stds}/ashrae_90_1/ashrae_90_1_2010/ashrae_90_1_2010.BoilerHotWater"
   require_relative "#{stds}/ashrae_90_1/ashrae_90_1_2010/ashrae_90_1_2010.AirTerminalSingleDuctVAVReheat"
   require_relative "#{stds}/ashrae_90_1/ashrae_90_1_2010/ashrae_90_1_2010.ChillerElectricEIR"
+  require_relative "#{stds}/ashrae_90_1/ashrae_90_1_2010/ashrae_90_1_2010.CoolingTower"
   require_relative "#{stds}/ashrae_90_1/ashrae_90_1_2010/ashrae_90_1_2010.CoolingTowerSingleSpeed"
   require_relative "#{stds}/ashrae_90_1/ashrae_90_1_2010/ashrae_90_1_2010.CoolingTowerTwoSpeed"
   require_relative "#{stds}/ashrae_90_1/ashrae_90_1_2010/ashrae_90_1_2010.CoolingTowerVariableSpeed"
   require_relative "#{stds}/ashrae_90_1/ashrae_90_1_2010/ashrae_90_1_2010.FanVariableVolume"
   require_relative "#{stds}/ashrae_90_1/ashrae_90_1_2010/ashrae_90_1_2010.Model"