Skip to content

Commit

Permalink
Merge 8878d05 into 1d02e7b
Browse files Browse the repository at this point in the history
  • Loading branch information
jnsebgosselin committed Jul 9, 2018
2 parents 1d02e7b + 8878d05 commit f060c57
Show file tree
Hide file tree
Showing 5 changed files with 292 additions and 192 deletions.
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ install:
- pip install pytest-cov
- pip install pytest-ordering
- pip install coveralls
- pip install codecov
- pip install matplotlib
- pip install scipy

Expand All @@ -18,3 +19,4 @@ script:

after_success:
- coveralls
- codecov
28 changes: 28 additions & 0 deletions codecov.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
codecov:
notify:
require_ci_to_pass: no

codecov:
branch: master

coverage:
precision: 2
round: down
range: "70...100"

status:
project:
default:
threshold: 1%
patch: no
changes: no

parsers:
gcov:
branch_detection:
conditional: yes
loop: yes
method: no
macro: no

comment: false
5 changes: 3 additions & 2 deletions pygld/fluidproperties.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
from scipy import interpolate
import os

FLUIDS = ['prop_glycol', 'ethyl_glycol', 'water']


class HeatCarrierFluid(object):
"""
Expand Down Expand Up @@ -84,8 +86,7 @@ def fluid(self, x):
self.__fluid = 'water'
filename = 'proptables_purewater.npy'
else:
raise ValueError('Supported fluid value are',
['water', 'prop_glycol', 'ethyl_glycol'])
raise ValueError('Supported fluid value are', FLUIDS)

dirname = os.path.dirname(os.path.realpath(__file__))
pathname = os.path.join(dirname, 'tables', filename)
Expand Down

0 comments on commit f060c57

Please sign in to comment.