Skip to content
This repository has been archived by the owner on Mar 6, 2024. It is now read-only.

Commit

Permalink
allow lpg wall furnaces, no cap on wall R-value
Browse files Browse the repository at this point in the history
  • Loading branch information
nmerket committed May 19, 2017
1 parent f5413eb commit ce405d4
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions hescorehpxml/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ class RoundOutOfBounds(TranslationError):
def round_to_nearest(x, vals, tails_tolerance=None):
nearest = min(vals, key=lambda y: abs(x - y))
if tails_tolerance is not None:
if x < min(vals) or x > max(vals):
if x < min(vals):
if abs(x - nearest) > tails_tolerance:
raise RoundOutOfBounds()
return nearest
Expand Down Expand Up @@ -304,7 +304,7 @@ def _get_heating_system_type(self, htgsys):
allowed_fuel_types = {'heat_pump': ('electric',),
'mini_split': ('electric',),
'central_furnace': ('natural_gas', 'lpg', 'fuel_oil', 'electric'),
'wall_furnace': ('natural_gas',),
'wall_furnace': ('natural_gas', 'lpg'),
'baseboard': ('electric',),
'boiler': ('natural_gas', 'lpg', 'fuel_oil'),
'gchp': ('electric',),
Expand Down Expand Up @@ -1870,7 +1870,7 @@ def _get_generation(self, b):
if manufacture_years:
years.append(max(manufacture_years)) # Use the latest year of manufacture
else:
raise TranslationError('Either YearInverterManufactured or YearModulesManufactured is required foe every PVSystem.')
raise TranslationError('Either YearInverterManufactured or YearModulesManufactured is required for every PVSystem.')

azimuth = self.xpath(pvsystem, 'h:ArrayAzimuth/text()')
orientation = self.xpath(pvsystem, 'h:ArrayOrientation/text()')
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

setup(
name='hescore-hpxml',
version='3.0.0',
version='3.0.1',
description='HPXML Translator for the HEScore API',
long_description=long_description,
url='https://github.com/NREL/hescore-hpxml',
Expand Down

2 comments on commit ce405d4

@nmerket
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@GamalielL, this should fix the wall problem we discussed. I'm having them update the version on the server.

@lirainer
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@nmerket Do you have a test or expected result for the R-value change?

Please sign in to comment.