Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix continuum freeBound* methods #205

Merged
merged 14 commits into from
Jul 16, 2018
Merged

fix continuum freeBound* methods #205

merged 14 commits into from
Jul 16, 2018

Conversation

kdere
Copy link
Contributor

@kdere kdere commented Jul 16, 2018

also moved .ioneqOne into base/_IoneqOne.py

kdere and others added 14 commits July 15, 2018 16:04
@kdere
moving to Python 3.6
95c3125
@kdere
minor fixes
2a8eeda
@kdere
added import of ioneqOne
de6cee4
@kdere
moved back in various continuum constants
6b5a224 
 added charge as stat-couloumbs
 a bit more text here and there
@kdere
removed some commented out lines
3613ab4
@kdere
note move of .ioneqOne to base/_IoneqOne
5812593
@kdere
updated numpy version to 1.14
0728bfa
@kdere
removed .ioneqOne
3666b04 
 changed interpolate import to only splev and splrep
@kdere
fixed up .freeBound, removed .ioneqOne
915d915
@kdere
new file under base, contains only .ioneqOne
17777cb
@kdere
Update rtd_environment.yml
fff7ec1
@kdere
specifiying PYQT_VERSION='5.5.0'
645c7e9 
removing pyqt from CONDA_DEPENDENCIES
together they set up a travis conflict
@kdere
revised freeBoundEmiss
1155211
@kdere
Merge branch 'master' of https://github.com/kdere/ChiantiPy
79b034b 
 not sure, probably in travis or rtd stuff
@coveralls
Copy link

coveralls commented Jul 16, 2018 •
edited
Loading

Coverage Status

Coverage decreased (-0.3%) to 39.021% when pulling 79b034b on kdere:master into ce1723f on chianti-atomic:master.

@kdere kdere merged commit f95a818 into chianti-atomic:master Jul 16, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@kdere @coveralls