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

@@ -128,11 +128,11 @@
     nominal_hp = motor_bhp
 
     # Don't attempt to look up motor efficiency
     # for zero-hp pumps (required for circulation-pump-free
     # service water heating systems).
-    return [1.0, 0] if motor_bhp == 0.0
+    return [1.0, 0] if motor_bhp < 0.0001 # under 1 watt
 
     # Lookup the minimum motor efficiency
     motors = standards_data['motors']
 
     # Assuming all pump motors are 4-pole ODP
@@ -180,11 +180,9 @@
     flow_m3_per_s = if pump.to_PumpVariableSpeed.is_initialized || pump.to_PumpConstantSpeed.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.totalRatedFlowRate.is_initialized
                         pump.totalRatedFlowRate.get
                       elsif pump.autosizedTotalRatedFlowRate.is_initialized