openstudio-standards 0.3.1.rc1 → 0.3.1.rc2

data/lib/openstudio-standards/btap/fileio.rb

@@ -833,6 +833,7 @@ module BTAP
 
           # Move to the next field if no difference was found
           next if true_value == compare_value
+          next if true_value.to_f.zero? && compare_value.to_f.zero?
 
           # Check numeric values if numeric
           if (compare_value.is_a? Numeric) && (true_value.is_a? Numeric)

data/lib/openstudio-standards/hvac_sizing/Siz.ThermalZone.rb

@@ -166,11 +166,16 @@ class OpenStudio::Model::ThermalZone
       sql = sql.get
 
       table_name = 'Zone Sizing Information'
+      if self.model.version < OpenStudio::VersionString.new('3.5.0')
+        report_name = 'Initialization Summary'
+      else
+        report_name = 'InitializationSummary'
+      end
 
       # Get zone row name
       query = "SELECT RowName
               FROM tabulardatawithstrings
-              WHERE ReportName='Initialization Summary'
+              WHERE ReportName='#{report_name}'
               AND ReportForString='Entire Facility'
               AND TableName='#{table_name}'
               AND ColumnName='Zone Name'
@@ -193,7 +198,7 @@ class OpenStudio::Model::ThermalZone
         # Get zone cooling design flow rate
         query = "SELECT Value
                 FROM tabulardatawithstrings
-                WHERE ReportName='Initialization Summary'
+                WHERE ReportName='#{report_name}'
                 AND ReportForString='Entire Facility'
                 AND TableName='#{table_name}'
                 AND ColumnName='User Des Air Flow Rate {m3/s}'
@@ -208,7 +213,7 @@ class OpenStudio::Model::ThermalZone
         # Get zone heating design flow rate
         query = "SELECT Value
                 FROM tabulardatawithstrings
-                WHERE ReportName='Initialization Summary'
+                WHERE ReportName='#{report_name}'
                 AND ReportForString='Entire Facility'
                 AND TableName='#{table_name}'
                 AND ColumnName='User Des Air Flow Rate {m3/s}'

data/lib/openstudio-standards/prototypes/ashrae_90_1/ashrae_90_1_2019/ashrae_90_1_2019.Pump.rb

@@ -56,16 +56,16 @@ class ASHRAE9012019 < ASHRAE901
     # Get flow rate (whether autosized or hard-sized)
     flow_m3_per_s = 0
     flow_m3_per_s = if pump.to_PumpVariableSpeed.is_initialized || pump.to_PumpConstantSpeed.is_initialized
-                      if pump.autosizedRatedFlowRate.is_initialized
-                        pump.autosizedRatedFlowRate.get
-                      else
+                      if pump.ratedFlowRate.is_initialized
                         pump.ratedFlowRate.get
+                      elsif pump.autosizedRatedFlowRate.is_initialized
+                        pump.autosizedRatedFlowRate.get
                       end
                     elsif pump.to_HeaderedPumpsVariableSpeed.is_initialized || pump.to_HeaderedPumpsConstantSpeed.is_initialized
-                      if pump.autosizedTotalRatedFlowRate.is_initialized
-                        pump.autosizedTotalRatedFlowRate.get / pump.numberofPumpsinBank
-                      else
+                      if pump.totalRatedFlowRate.is_initialized
                         pump.totalRatedFlowRate.get / pump.numberofPumpsinBank
+                      elsif pump.autosizedTotalRatedFlowRate.is_initialized
+                        pump.autosizedTotalRatedFlowRate.get / pump.numberofPumpsinBank
                       end
                     end
     flow_gpm = OpenStudio.convert(flow_m3_per_s, 'm^3/s', 'gal/min').get

data/lib/openstudio-standards/prototypes/common/buildings/Prototype.LargeOffice.rb

@@ -100,11 +100,13 @@ module LargeOffice
       end
     end
 
-    model.getPlantLoops.sort.each do |plant_loop|
-      if plant_loop.name.to_s == 'Heat Pump Loop'
-        plant_loop.setFluidType('EthyleneGlycol')
-        plant_loop.setGlycolConcentration(40)
-      end
+    hp_loop = model.getPlantLoopByName('Heat Pump Loop')
+    if hp_loop.is_initialized
+      hp_loop = hp_loop.get
+
+      # set working fluid to ethylene glycol
+      hp_loop.setFluidType('EthyleneGlycol')
+      hp_loop.setGlycolConcentration(40)
     end
 
     return true

data/lib/openstudio-standards/prototypes/common/objects/Prototype.Model.rb

@@ -507,7 +507,7 @@ Standard.class_eval do
 
     # loop through ceiling surfaces and assign the plenum acoustical tile construction if the adjacent surface is a plenum floor
     model.getSurfaces.each do |surface|
-      next unless surface.surfaceType == 'RoofCeiling' && surface.outsideBoundaryCondition == 'Surface'
+      next unless surface.surfaceType == 'RoofCeiling' && surface.outsideBoundaryCondition == 'Surface' && surface.adjacentSurface.is_initialized
 
       adj_surface = surface.adjacentSurface.get
       adj_space = adj_surface.space.get

data/lib/openstudio-standards/prototypes/common/objects/Prototype.PumpVariableSpeed.rb

@@ -15,10 +15,10 @@ class Standard
     return false unless plant_loop_type == 'Heating' || plant_loop_type == 'Cooling'
 
     # Get rated pump power
-    if pump.autosizedRatedPowerConsumption.is_initialized
-      pump_rated_power_w = pump.autosizedRatedPowerConsumption.get
-    elsif pump.ratedPowerConsumption.is_initialized
+    if pump.ratedPowerConsumption.is_initialized
       pump_rated_power_w = pump.ratedPowerConsumption.get
+    elsif pump.autosizedRatedPowerConsumption.is_initialized
+      pump_rated_power_w = pump.autosizedRatedPowerConsumption.get
     else
       OpenStudio.logFree(OpenStudio::Error, 'openstudio.standards.Pump', "For #{pump.name}, could not find rated pump power consumption, cannot determine w per gpm correctly.")
       return false

data/lib/openstudio-standards/prototypes/common/objects/Prototype.ServiceWaterHeating.rb

@@ -624,15 +624,15 @@ class Standard
         OpenStudio.logFree(OpenStudio::Error, 'openstudio.Prototype.ServiceWaterHeating', "Unsupported schedule type for HPWH setpoint schedule #{swh_temp_sch.name}.")
         return false
       end
-      hpwhschedoverride_actuator = OpenStudio::Model::EnergyManagementSystemActuator.new(swh_temp_sch,schedule_type,'Schedule Value')
+      hpwhschedoverride_actuator = OpenStudio::Model::EnergyManagementSystemActuator.new(swh_temp_sch,schedule_type, 'Schedule Value')
       hpwhschedoverride_actuator.setName("#{hpwh_name_ems_friendly}_HPWHSchedOverride")
 
       # create actuator for lower heating element in water tank
-      leschedoverride_actuator = OpenStudio::Model::EnergyManagementSystemActuator.new(hpwh_bottom_element_sp,'Schedule:Constant','Schedule Value')
+      leschedoverride_actuator = OpenStudio::Model::EnergyManagementSystemActuator.new(hpwh_bottom_element_sp, 'Schedule:Constant', 'Schedule Value')
       leschedoverride_actuator.setName("#{hpwh_name_ems_friendly}_LESchedOverride")
 
       # create actuator for upper heating element in water tank
-      ueschedoverride_actuator = OpenStudio::Model::EnergyManagementSystemActuator.new(hpwh_top_element_sp,'Schedule:Constant','Schedule Value')
+      ueschedoverride_actuator = OpenStudio::Model::EnergyManagementSystemActuator.new(hpwh_top_element_sp, 'Schedule:Constant', 'Schedule Value')
       ueschedoverride_actuator.setName("#{hpwh_name_ems_friendly}_UESchedOverride")
 
       # create sensor for heat pump compressor
@@ -640,7 +640,7 @@ class Standard
       t_set_sensor.setName("#{hpwh_name_ems_friendly}_T_set")
       t_set_sensor.setKeyName(swh_temp_sch.name.to_s)
 
-      # define control configuration 
+      # define control configuration
       t_offset = 9.0 # deg-C
 
       # get tank specifications
@@ -663,7 +663,7 @@ class Standard
       hpwh_ctrl_program.addLine("SET #{leschedoverride_actuator.name} = 0")
       # lower element disabled
       hpwh_ctrl_program.addLine("SET #{leschedoverride_actuator.name}_cut_in = 0")
-      hpwh_ctrl_program.addLine('ENDIF')    
+      hpwh_ctrl_program.addLine('ENDIF')
 
       # create a program calling manager
       program_calling_manager = OpenStudio::Model::EnergyManagementSystemProgramCallingManager.new(model)

data/lib/openstudio-standards/prototypes/common/objects/Prototype.hvac_systems.rb

@@ -1777,7 +1777,7 @@ class Standard
         avail_mgr = avail_mgr.get
       else
         avail_mgr = nil
-      end 
+      end
     else 
       avail_mgr = air_loop.availabilityManagers[0]
     end
@@ -2141,7 +2141,7 @@ class Standard
         avail_mgr = avail_mgr.get
       else
         avail_mgr = nil
-      end 
+      end
     else 
       avail_mgr = air_loop.availabilityManagers[0]
     end
@@ -2763,7 +2763,7 @@ class Standard
           avail_mgr = avail_mgr.get
         else
           avail_mgr = nil
-        end 
+        end
       else 
         avail_mgr = air_loop.availabilityManagers[0]
       end
@@ -4529,7 +4529,7 @@ class Standard
   #   Ending hour of building occupancy.
   # @param control_strategy [String] name of control strategy.  Options are 'proportional_control' and 'none'.
   #   If control strategy is 'proportional_control', the method will apply the CBE radiant control sequences
-  #   detailed in Raftery et al. (2017), “A new control strategy for high thermal mass radiant systems”.
+  #   detailed in Raftery et al. (2017), 'A new control strategy for high thermal mass radiant systems'.
   #   Otherwise no control strategy will be applied and the radiant system will assume the EnergyPlus default controls.
   # @param proportional_gain [Double] (Optional) Only applies if control_strategy is 'proportional_control'.
   #   Proportional gain constant (recommended 0.3 or less).

data/lib/openstudio-standards/standards/Standards.AirLoopHVAC.rb

@@ -244,14 +244,14 @@ class Standard
     # Get design supply air flow rate (whether autosized or hard-sized)
     dsn_air_flow_m3_per_s = 0
     dsn_air_flow_cfm = 0
-    if air_loop_hvac.autosizedDesignSupplyAirFlowRate.is_initialized
-      dsn_air_flow_m3_per_s = air_loop_hvac.autosizedDesignSupplyAirFlowRate.get
-      dsn_air_flow_cfm = OpenStudio.convert(dsn_air_flow_m3_per_s, 'm^3/s', 'cfm').get
-      OpenStudio.logFree(OpenStudio::Debug, 'openstudio.standards.AirLoopHVAC', "* #{dsn_air_flow_cfm.round} cfm = Autosized Design Supply Air Flow Rate.")
-    else
+    if air_loop_hvac.designSupplyAirFlowRate.is_initialized
       dsn_air_flow_m3_per_s = air_loop_hvac.designSupplyAirFlowRate.get
       dsn_air_flow_cfm = OpenStudio.convert(dsn_air_flow_m3_per_s, 'm^3/s', 'cfm').get
       OpenStudio.logFree(OpenStudio::Debug, 'openstudio.standards.AirLoopHVAC', "* #{dsn_air_flow_cfm.round} cfm = Hard sized Design Supply Air Flow Rate.")
+    elsif air_loop_hvac.autosizedDesignSupplyAirFlowRate.is_initialized
+      dsn_air_flow_m3_per_s = air_loop_hvac.autosizedDesignSupplyAirFlowRate.get
+      dsn_air_flow_cfm = OpenStudio.convert(dsn_air_flow_m3_per_s, 'm^3/s', 'cfm').get
+      OpenStudio.logFree(OpenStudio::Debug, 'openstudio.standards.AirLoopHVAC', "* #{dsn_air_flow_cfm.round} cfm = Autosized Design Supply Air Flow Rate.")
     end
     # Optimum start per 6.4.3.3.3, only required if > 10,000 cfm
     cfm_limit = 10_000
@@ -434,14 +434,14 @@ class Standard
     # Get design supply air flow rate (whether autosized or hard-sized)
     dsn_air_flow_m3_per_s = 0
     dsn_air_flow_cfm = 0
-    if air_loop_hvac.autosizedDesignSupplyAirFlowRate.is_initialized
-      dsn_air_flow_m3_per_s = air_loop_hvac.autosizedDesignSupplyAirFlowRate.get
-      dsn_air_flow_cfm = OpenStudio.convert(dsn_air_flow_m3_per_s, 'm^3/s', 'cfm').get
-      OpenStudio.logFree(OpenStudio::Debug, 'openstudio.standards.AirLoopHVAC', "* #{dsn_air_flow_cfm.round} cfm = Autosized Design Supply Air Flow Rate.")
-    else
+    if air_loop_hvac.designSupplyAirFlowRate.is_initialized
       dsn_air_flow_m3_per_s = air_loop_hvac.designSupplyAirFlowRate.get
       dsn_air_flow_cfm = OpenStudio.convert(dsn_air_flow_m3_per_s, 'm^3/s', 'cfm').get
       OpenStudio.logFree(OpenStudio::Debug, 'openstudio.standards.AirLoopHVAC', "* #{dsn_air_flow_cfm.round} cfm = Hard sized Design Supply Air Flow Rate.")
+    elsif air_loop_hvac.autosizedDesignSupplyAirFlowRate.is_initialized
+      dsn_air_flow_m3_per_s = air_loop_hvac.autosizedDesignSupplyAirFlowRate.get
+      dsn_air_flow_cfm = OpenStudio.convert(dsn_air_flow_m3_per_s, 'm^3/s', 'cfm').get
+      OpenStudio.logFree(OpenStudio::Debug, 'openstudio.standards.AirLoopHVAC', "* #{dsn_air_flow_cfm.round} cfm = Autosized Design Supply Air Flow Rate.")
     end
 
     # @todo determine the presence of MERV filters and other stuff
@@ -492,14 +492,14 @@ class Standard
     # Get design supply air flow rate (whether autosized or hard-sized)
     dsn_air_flow_m3_per_s = 0
     dsn_air_flow_cfm = 0
-    if air_loop_hvac.autosizedDesignSupplyAirFlowRate.is_initialized
-      dsn_air_flow_m3_per_s = air_loop_hvac.autosizedDesignSupplyAirFlowRate.get
-      dsn_air_flow_cfm = OpenStudio.convert(dsn_air_flow_m3_per_s, 'm^3/s', 'cfm').get
-      OpenStudio.logFree(OpenStudio::Debug, 'openstudio.standards.AirLoopHVAC', "* #{dsn_air_flow_cfm.round} cfm = Autosized Design Supply Air Flow Rate.")
-    else
+    if air_loop_hvac.designSupplyAirFlowRate.is_initialized
       dsn_air_flow_m3_per_s = air_loop_hvac.designSupplyAirFlowRate.get
       dsn_air_flow_cfm = OpenStudio.convert(dsn_air_flow_m3_per_s, 'm^3/s', 'cfm').get
       OpenStudio.logFree(OpenStudio::Debug, 'openstudio.standards.AirLoopHVAC', "* #{dsn_air_flow_cfm.round} cfm = Hard sized Design Supply Air Flow Rate.")
+    elsif air_loop_hvac.autosizedDesignSupplyAirFlowRate.is_initialized
+      dsn_air_flow_m3_per_s = air_loop_hvac.autosizedDesignSupplyAirFlowRate.get
+      dsn_air_flow_cfm = OpenStudio.convert(dsn_air_flow_m3_per_s, 'm^3/s', 'cfm').get
+      OpenStudio.logFree(OpenStudio::Debug, 'openstudio.standards.AirLoopHVAC', "* #{dsn_air_flow_cfm.round} cfm = Autosized Design Supply Air Flow Rate.")
     end
 
     # Get the fan limitation pressure drop adjustment bhp
@@ -720,14 +720,14 @@ class Standard
 
       # Get design supply air flow rate (whether autosized or hard-sized)
       dsn_air_flow_m3_per_s = 0
-      if fan.autosizedDesignSupplyAirFlowRate.is_initialized
-        dsn_air_flow_m3_per_s = fan.autosizedDesignSupplyAirFlowRate.get
-        dsn_air_flow_cfm = OpenStudio.convert(dsn_air_flow_m3_per_s, 'm^3/s', 'cfm').get
-        OpenStudio.logFree(OpenStudio::Debug, 'openstudio.standards.AirLoopHVAC', "* #{dsn_air_flow_cfm.round} cfm = Autosized Design Supply Air Flow Rate.")
-      else
+      if fan.designSupplyAirFlowRate.is_initialized
         dsn_air_flow_m3_per_s = fan.designSupplyAirFlowRate.get
         dsn_air_flow_cfm = OpenStudio.convert(dsn_air_flow_m3_per_s, 'm^3/s', 'cfm').get
         OpenStudio.logFree(OpenStudio::Debug, 'openstudio.standards.AirLoopHVAC', "* #{dsn_air_flow_cfm.round} cfm = User entered Design Supply Air Flow Rate.")
+      elsif fan.autosizedDesignSupplyAirFlowRate.is_initialized
+        dsn_air_flow_m3_per_s = fan.autosizedDesignSupplyAirFlowRate.get
+        dsn_air_flow_cfm = OpenStudio.convert(dsn_air_flow_m3_per_s, 'm^3/s', 'cfm').get
+        OpenStudio.logFree(OpenStudio::Debug, 'openstudio.standards.AirLoopHVAC', "* #{dsn_air_flow_cfm.round} cfm = Autosized Design Supply Air Flow Rate.")
       end
 
       # Determine the fan pressure rise that will result in the target bhp
@@ -2006,10 +2006,10 @@ class Standard
     # System primary airflow rate (whether autosized or hard-sized)
     v_ps = 0.0
 
-    v_ps = if air_loop_hvac.autosizedDesignSupplyAirFlowRate.is_initialized
-             air_loop_hvac.autosizedDesignSupplyAirFlowRate.get
-           else
+    v_ps = if air_loop_hvac.designSupplyAirFlowRate.is_initialized
              air_loop_hvac.designSupplyAirFlowRate.get
+           elsif air_loop_hvac.autosizedDesignSupplyAirFlowRate.is_initialized
+             air_loop_hvac.autosizedDesignSupplyAirFlowRate.get
            end
     v_ps_cfm = OpenStudio.convert(v_ps, 'm^3/s', 'cfm').get
 

data/lib/openstudio-standards/standards/Standards.AirTerminalSingleDuctParallelPIUReheat.rb

@@ -25,10 +25,10 @@ class Standard
 
     # Get the maximum flow rate through the terminal
     max_primary_air_flow_rate = nil
-    if air_terminal_single_duct_parallel_piu_reheat.autosizedMaximumPrimaryAirFlowRate.is_initialized
-      max_primary_air_flow_rate = air_terminal_single_duct_parallel_piu_reheat.autosizedMaximumPrimaryAirFlowRate.get
-    elsif air_terminal_single_duct_parallel_piu_reheat.maximumPrimaryAirFlowRate.is_initialized
+    if air_terminal_single_duct_parallel_piu_reheat.maximumPrimaryAirFlowRate.is_initialized
       max_primary_air_flow_rate = air_terminal_single_duct_parallel_piu_reheat.maximumPrimaryAirFlowRate.get
+    elsif air_terminal_single_duct_parallel_piu_reheat.autosizedMaximumPrimaryAirFlowRate.is_initialized
+      max_primary_air_flow_rate = air_terminal_single_duct_parallel_piu_reheat.autosizedMaximumPrimaryAirFlowRate.get
     end
 
     # Set the max secondary air flow rate

data/lib/openstudio-standards/standards/Standards.Fan.rb

@@ -43,10 +43,10 @@ module Fan
   def fan_adjust_pressure_rise_to_meet_fan_power(fan, target_fan_power)
     # Get design supply air flow rate (whether autosized or hard-sized)
     dsn_air_flow_m3_per_s = 0
-    dsn_air_flow_m3_per_s = if fan.autosizedMaximumFlowRate.is_initialized
-                              fan.autosizedMaximumFlowRate.get
-                            else
+    dsn_air_flow_m3_per_s = if fan.maximumFlowRate.is_initialized
                               fan.maximumFlowRate.get
+                            elsif fan.autosizedMaximumFlowRate.is_initialized
+                              fan.autosizedMaximumFlowRate.get
                             end
 
     # Get the current fan power
@@ -356,10 +356,10 @@ module Fan
       OpenStudio.logFree(OpenStudio::Warn, 'openstudio.standards.Fan', "For #{fan.name}, could not find rated fan power from Equipment Summary. Will calculate it based on current pressure rise and total fan efficiency")
     end
 
-    if fan.autosizedMaximumFlowRate.is_initialized
-      max_m3_per_s = fan.autosizedMaximumFlowRate.get
-    elsif fan.maximumFlowRate.is_initialized
+    if fan.maximumFlowRate.is_initialized
       max_m3_per_s = fan.ratedFlowRate.get
+    elsif fan.autosizedMaximumFlowRate.is_initialized
+      max_m3_per_s = fan.autosizedMaximumFlowRate.get
     else
       OpenStudio.logFree(OpenStudio::Error, 'openstudio.standards.Fan', "For #{fan.name}, could not find fan Maximum Flow Rate, cannot determine w per cfm correctly.")
       return false

data/lib/openstudio-standards/standards/Standards.Model.rb

@@ -75,8 +75,8 @@ class Standard
           raise "Proposed model unmet load hours exceed 300. Baseline model(s) won't be created."
         end
       else
-        OpenStudio.logFree(OpenStudio::Error, 'prm.log', "Simulation failed. Check the model to make sure no severe errors.")
-        raise "Simulation on proposed model failed. Baseline generation is stopped."
+        OpenStudio.logFree(OpenStudio::Error, 'prm.log', 'Simulation failed. Check the model to make sure no severe errors.')
+        raise 'Simulation on proposed model failed. Baseline generation is stopped.'
       end
     end
 
@@ -3237,16 +3237,19 @@ class Standard
           skylights_frame_added = 0
           model.getSubSurfaces.each do |sub_surface|
             next unless sub_surface.outsideBoundaryCondition == 'Outdoors' && sub_surface.subSurfaceType == 'Skylight'
-
-            # @todo enable proper window frame setting after https://github.com/NREL/OpenStudio/issues/2895 is fixed
-            sub_surface.setString(8, frame.name.get.to_s)
-            skylights_frame_added += 1
-            # if sub_surface.allowWindowPropertyFrameAndDivider
-            #   sub_surface.setWindowPropertyFrameAndDivider(frame)
-            #   skylights_frame_added += 1
-            # else
-            #   OpenStudio.logFree(OpenStudio::Warn, 'openstudio.standards.Model', "For #{sub_surface.name}: cannot add a frame to this skylight.")
-            # end
+            
+            if model.version < OpenStudio::VersionString.new('3.1.0')
+              # window frame setting before https://github.com/NREL/OpenStudio/issues/2895 was fixed
+              sub_surface.setString(8, frame.name.get.to_s)
+              skylights_frame_added += 1
+            else
+              if sub_surface.allowWindowPropertyFrameAndDivider
+                sub_surface.setWindowPropertyFrameAndDivider(frame)
+                skylights_frame_added += 1
+              else
+                OpenStudio.logFree(OpenStudio::Warn, 'openstudio.standards.Model', "For #{sub_surface.name}: cannot add a frame to this skylight.")
+              end
+            end
           end
           OpenStudio.logFree(OpenStudio::Info, 'openstudio.standards.Model', "Adding #{frame.name} to #{skylights_frame_added} skylights.") if skylights_frame_added > 0
         else
@@ -4674,8 +4677,11 @@ class Standard
       vals['wwr_res'] *= vals['mult_res_red']
       vals['wwr_sh'] *= vals['mult_sh_red']
       wwrs = [vals['wwr_nr'], vals['wwr_res'], vals['wwr_sh']]
-      wwrs = wwrs.reject! &:nan?
-      base_wwr[bat] = wwrs.max
+      max_wwrs = []
+      wwrs.each do |w|
+        max_wwrs << w unless w.nan?
+      end
+      base_wwr[bat] = max_wwrs.max
 
       # Reduce the window area if any of the categories necessary
       model.getSpaces.sort.each do |space|

data/lib/openstudio-standards/standards/Standards.Pump.rb

@@ -22,16 +22,16 @@ module Pump
     # Get flow rate (whether autosized or hard-sized)
     flow_m3_per_s = 0
     flow_m3_per_s = if pump.to_PumpVariableSpeed.is_initialized || pump.to_PumpConstantSpeed.is_initialized
-                      if pump.autosizedRatedFlowRate.is_initialized
-                        pump.autosizedRatedFlowRate.get
-                      else
+                      if pump.ratedFlowRate.is_initialized
                         pump.ratedFlowRate.get
+                      elsif pump.autosizedRatedFlowRate.is_initialized
+                        pump.autosizedRatedFlowRate.get
                       end
                     elsif pump.to_HeaderedPumpsVariableSpeed.is_initialized || pump.to_HeaderedPumpsConstantSpeed.is_initialized
-                      if pump.autosizedTotalRatedFlowRate.is_initialized
-                        pump.autosizedTotalRatedFlowRate.get / pump.numberofPumpsinBank
-                      else
+                      if pump.totalRatedFlowRate.is_initialized
                         pump.totalRatedFlowRate.get / pump.numberofPumpsinBank
+                      elsif pump.autosizedTotalRatedFlowRate.is_initialized
+                        pump.autosizedTotalRatedFlowRate.get / pump.numberofPumpsinBank
                       end
                     end
 
@@ -178,16 +178,18 @@ module Pump
     # Get flow rate (whether autosized or hard-sized)
     flow_m3_per_s = 0
     flow_m3_per_s = if pump.to_PumpVariableSpeed.is_initialized || pump.to_PumpConstantSpeed.is_initialized
-                      if pump.autosizedRatedFlowRate.is_initialized
+                      if pump.ratedFlowRate.is_initialized
+                        pump.ratedFlowRate.get
+                      elsif pump.autosizedRatedFlowRate.is_initialized
                         pump.autosizedRatedFlowRate.get
                       else
                         pump.ratedFlowRate.get
                       end
                     elsif pump.to_HeaderedPumpsVariableSpeed.is_initialized || pump.to_HeaderedPumpsConstantSpeed.is_initialized
-                      if pump.autosizedTotalRatedFlowRate.is_initialized
-                        pump.autosizedTotalRatedFlowRate.get
-                      else
+                      if pump.totalRatedFlowRate.is_initialized
                         pump.totalRatedFlowRate.get
+                      elsif pump.autosizedTotalRatedFlowRate.is_initialized
+                        pump.autosizedTotalRatedFlowRate.get
                       end
                     end
 
@@ -223,16 +225,16 @@ module Pump
     # Get flow rate (whether autosized or hard-sized)
     flow_m3_per_s = 0
     flow_m3_per_s = if pump.to_PumpVariableSpeed.is_initialized || pump.to_PumpConstantSpeed.is_initialized
-                      if pump.autosizedRatedFlowRate.is_initialized
-                        pump.autosizedRatedFlowRate.get
-                      else
+                      if pump.ratedFlowRate.is_initialized
                         pump.ratedFlowRate.get
+                      elsif pump.autosizedRatedFlowRate.is_initialized
+                        pump.autosizedRatedFlowRate.get
                       end
                     elsif pump.to_HeaderedPumpsVariableSpeed.is_initialized || pump.to_HeaderedPumpsConstantSpeed.is_initialized
-                      if pump.autosizedTotalRatedFlowRate.is_initialized
-                        pump.autosizedTotalRatedFlowRate.get
-                      else
+                      if pump.totalRatedFlowRate.is_initialized
                         pump.totalRatedFlowRate.get
+                      elsif pump.autosizedTotalRatedFlowRate.is_initialized
+                        pump.autosizedTotalRatedFlowRate.get
                       end
                     end
 
@@ -275,10 +277,10 @@ module Pump
   def pump_rated_w_per_gpm(pump)
     # Get design power (whether autosized or hard-sized)
     rated_power_w = 0
-    if pump.autosizedRatedPowerConsumption.is_initialized
-      rated_power_w = pump.autosizedRatedPowerConsumption.get
-    elsif pump.ratedPowerConsumption.is_initialized
+    if pump.ratedPowerConsumption.is_initialized
       rated_power_w = pump.ratedPowerConsumption.get
+    elsif pump.autosizedRatedPowerConsumption.is_initialized
+      rated_power_w = pump.autosizedRatedPowerConsumption.get
     else
       OpenStudio.logFree(OpenStudio::Error, 'openstudio.standards.Pump', "For #{pump.name}, could not find rated pump power consumption, cannot determine w per gpm correctly.")
       return 0.0

data/lib/openstudio-standards/standards/Standards.Space.rb

@@ -1002,24 +1002,31 @@ class Standard
       OpenStudio.logFree(OpenStudio::Warn, 'openstudio.standards.Space', "Space #{space_type} is an unknown space type, assuming #{daylight_stpt_lux} Lux daylight setpoint")
     else
       space_type = space_type.get
-      standards_building_type = if space_type.standardsBuildingType.is_initialized
-                                  space_type.standardsBuildingType.get
-                                end
-      standards_space_type = if space_type.standardsSpaceType.is_initialized
-                               space_type.standardsSpaceType.get
-                             end
-
-      # use the building type (standards_building_type) and space type (standards_space_type)
-      # as well as template to locate the space type data
-      search_criteria = {
-        'template' => template,
-        'building_type' => standards_building_type,
-        'space_type' => standards_space_type
-      }
-
-      data = model_find_object(standards_data['space_types'], search_criteria)
-      if data.nil?
-        OpenStudio.logFree(OpenStudio::Warn, 'openstudio.standards.Space', "No data available for #{space_type.name}: #{standards_space_type} of #{standards_building_type} at #{template}, assuming a #{daylight_stpt_lux} Lux daylight setpoint!")
+      standards_building_type = nil
+      standards_space_type = nil
+      data = nil
+      if space_type.standardsBuildingType.is_initialized
+        standards_building_type = space_type.standardsBuildingType.get
+      end
+      if space_type.standardsSpaceType.is_initialized
+        standards_space_type = space_type.standardsSpaceType.get
+      end
+
+      unless standards_building_type.nil? || standards_space_type.nil?
+        # use the building type (standards_building_type) and space type (standards_space_type)
+        # as well as template to locate the space type data
+        search_criteria = {
+          'template' => template,
+          'building_type' => standards_building_type,
+          'space_type' => standards_space_type
+        }
+        data = model_find_object(standards_data['space_types'], search_criteria)
+      end
+
+      if standards_building_type.nil? || standards_space_type.nil?
+        OpenStudio.logFree(OpenStudio::Warn, 'openstudio.standards.Space', "Unable to determine standards building type and standards space type for space '#{space.name}' with space type '#{space_type.name}'. Assign a standards building type and standards space type to the space type object. Defaulting to a #{daylight_stpt_lux} Lux daylight setpoint.")
+      elsif data.nil?
+        OpenStudio.logFree(OpenStudio::Warn, 'openstudio.standards.Space', "Unable to find target illuminance setpoint data for space type '#{space_type.name}' with #{template} space type '#{standards_space_type}' in building type '#{standards_building_type}'. Defaulting to a #{daylight_stpt_lux} Lux daylight setpoint.")
       else
         # Read the illuminance setpoint value
         # If 'na', daylighting is not appropriate for this space type for some reason

data/lib/openstudio-standards/standards/Standards.SpaceType.rb

@@ -437,7 +437,6 @@ class Standard
     end
 
     if set_infiltration && infiltration_have_info
-
       # Remove all but the first instance
       instances = space_type.spaceInfiltrationDesignFlowRates.sort
       if instances.size.zero?
@@ -470,8 +469,9 @@ class Standard
           OpenStudio.logFree(OpenStudio::Info, 'openstudio.standards.SpaceType', "#{space_type.name} set infiltration to #{ventilation_ach} ACH.")
         end
       end
-
     end
+
+    return true
   end
 
   # Sets the internal loads for Appendix G PRM for 2016 and later

data/lib/openstudio-standards/standards/Standards.ZoneHVACComponent.rb

@@ -58,10 +58,10 @@ class Standard
 
     # Get the maximum flow rate through the fan
     max_air_flow_rate = nil
-    if fan.autosizedMaximumFlowRate.is_initialized
-      max_air_flow_rate = fan.autosizedMaximumFlowRate.get
-    elsif fan.maximumFlowRate.is_initialized
+    if fan.maximumFlowRate.is_initialized
       max_air_flow_rate = fan.maximumFlowRate.get
+    elsif fan.autosizedMaximumFlowRate.is_initialized
+      max_air_flow_rate = fan.autosizedMaximumFlowRate.get
     end
     max_air_flow_rate_cfm = OpenStudio.convert(max_air_flow_rate, 'm^3/s', 'ft^3/min').get
 

data/lib/openstudio-standards/standards/ashrae_90_1_prm/ashrae_90_1_prm.AirLoopHVAC.rb

@@ -303,10 +303,10 @@ class ASHRAE901PRM < Standard
     if supply_fan.nil?
       OpenStudio.logFree(OpenStudio::Error, 'openstudio.ashrae_90_1_prm.AirLoopHVAC', "Supply not found on #{airloop.name}.")
     end
-    supply_fan_max_flow = if supply_fan.autosizedMaximumFlowRate.is_initialized
-                            supply_fan.autosizedMaximumFlowRate.get
-                          else
+    supply_fan_max_flow = if supply_fan.maximumFlowRate.is_initialized
                             supply_fan.maximumFlowRate.get
+                          elsif supply_fan.autosizedMaximumFlowRate.is_initialized
+                            supply_fan.autosizedMaximumFlowRate.get
                           end
 
     # Check that baseline system has the same

data/lib/openstudio-standards/standards/ashrae_90_1_prm/ashrae_90_1_prm.Model.rb

@@ -3032,10 +3032,10 @@ class ASHRAE901PRM < Standard
 
         # Get the maximum flow rate through the terminal
         max_primary_air_flow_rate = nil
-        if pfp_term.autosizedMaximumPrimaryAirFlowRate.is_initialized
-          max_primary_air_flow_rate = pfp_term.autosizedMaximumPrimaryAirFlowRate.get
-        elsif pfp_term.maximumPrimaryAirFlowRate.is_initialized
+        if pfp_term.maximumPrimaryAirFlowRate.is_initialized
           max_primary_air_flow_rate = pfp_term.maximumPrimaryAirFlowRate.get
+        elsif pfp_term.autosizedMaximumPrimaryAirFlowRate.is_initialized
+          max_primary_air_flow_rate = pfp_term.autosizedMaximumPrimaryAirFlowRate.get
         end
 
         max_sec_flow_rate_m3_per_s = max_primary_air_flow_rate * sec_flow_frac

data/lib/openstudio-standards/standards/ashrae_90_1_prm/ashrae_90_1_prm.ZoneHVACComponent.rb

@@ -56,10 +56,10 @@ class ASHRAE901PRM < Standard
       # Get design supply air flow rate (whether autosized or hard-sized)
       dsn_air_flow_m3_per_s = 0
       dsn_air_flow_cfm = 0
-      if fan.isMaximumFlowRateAutosized
-        dsn_air_flow_m3_per_s = fan.autosizedMaximumFlowRate.get
-      else
+      if fan.maximumFlowRate.is_initialized
         dsn_air_flow_m3_per_s = fan.maximumFlowRate.get
+      elsif fan.isMaximumFlowRateAutosized
+        dsn_air_flow_m3_per_s = fan.autosizedMaximumFlowRate.get
       end
       dsn_air_flow_cfm = OpenStudio.convert(dsn_air_flow_m3_per_s, 'm^3/s', 'cfm').get
 
@@ -91,10 +91,10 @@ class ASHRAE901PRM < Standard
 
       # Get the maximum flow rate through the fan
       max_air_flow_rate = nil
-      if fan.autosizedMaximumFlowRate.is_initialized
-        max_air_flow_rate = fan.autosizedMaximumFlowRate.get
-      elsif fan.maximumFlowRate.is_initialized
+      if fan.maximumFlowRate.is_initialized
         max_air_flow_rate = fan.maximumFlowRate.get
+      elsif fan.autosizedMaximumFlowRate.is_initialized
+        max_air_flow_rate = fan.autosizedMaximumFlowRate.get
       end
       max_air_flow_rate_cfm = OpenStudio.convert(max_air_flow_rate, 'm^3/s', 'ft^3/min').get