Skip to content

Commit bcd082e

Browse files
authored
Merge pull request #309 from kdere/master
changes to release version 0.11.0
2 parents 0006297 + 1d5131b commit bcd082e

File tree

9 files changed

+27
-13
lines changed

9 files changed

+27
-13
lines changed

ChiantiPy/core/Continuum.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
"""
22
Continuum module
3+
34
"""
5+
46
import os
57

68
import numpy as np
@@ -370,10 +372,12 @@ def freeBoundLossMewe(self, **kwargs):
370372
self.FreeBoundLoss = {'rate':gaunt_factor*np.sqrt(self.Temperature)*prefactor, 'temperature':self.Temperature}
371373

372374
def freeBoundLossMao(self, includeAbund=False, includeIoneq=False):
373-
""" to calculate the radiative loss rate from the parameters of
374-
Mao J., Kaastra J., Badnell N.R.
375-
<Astron. Astrophys. 599, A10 (2017)>
376-
=2017A&A...599A..10M"""
375+
"""
376+
to calculate the radiative loss rate from the parameters of
377+
Mao J., Kaastra J., Badnell N.R.
378+
<Astron. Astrophys. 599, A10 (2017)>=2017A&A...599A..10M
379+
380+
"""
377381
pars = io.maoParsRead()
378382
nameDict = util.convertName(self.IonStr)
379383
Z = nameDict['Z']

ChiantiPy/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
'''
22
the current version of the ChiantiPy package
33
'''
4-
__version_info__ = ('0','10', '0')
4+
__version_info__ = ('0','11', '0')
55
__version__ = '.'.join(__version_info__)

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# ChiantiPy - Version 0.10.0
1+
# ChiantiPy - Version 0.11.0
22
[![Documentation Status](http://readthedocs.org/projects/chiantipy/badge/?version=latest)](http://chiantipy.readthedocs.io/en/latest/?badge=latest)
33
[![Coverage Status](https://coveralls.io/repos/github/chianti-atomic/ChiantiPy/badge.svg?branch=master)](https://coveralls.io/github/chianti-atomic/ChiantiPy?branch=master)
44
[![ascl:1308.017](https://img.shields.io/badge/ascl-1308.017-blue.svg?colorB=262255)](http://ascl.net/1308.017)

README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ChiantiPy - Version 0.9.4
1+
ChiantiPy - Version 0.11.0
22
=========================
33

44
|Documentation Status| |Coverage Status| |ascl:1308.017|

docs/source/changelog.rst

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,16 @@ Changelog
33
===========
44

55

6+
7+
8+
Changes from 0.10.0 to 0.11.0
9+
=============================
10+
11+
Calculations of the free-bound/radiative recombination continuum and radiation losses depend on a file that provides and LS description of the bound and singly excited energy levels. This file is called c_5.fblvl in the case of C V. Not all ions have an associated .fblvl files and is was necessary to revise ChiantiPy to ignore the free-bound calculation for these ions.
12+
13+
In addition, it was found that under extreme conditions, such as very low temperatures for highly ionized species, that bad values would arise (Nans and infinities). These are now detected and removed.
14+
15+
616
Changes from 0.9.5 to 0.10.0
717
============================
818

docs/source/conf.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,17 +59,17 @@
5959

6060
# General information about the project.
6161
project = 'ChiantiPy'
62-
copyright = '2020, Ken Dere'
62+
copyright = '2021, Ken Dere'
6363
author = 'Ken Dere'
6464

6565
# The version info for the project you're documenting, acts as replacement for
6666
# |version| and |release|, also used in various other places throughout the
6767
# built documents.
6868
#
6969
# The short X.Y version.
70-
version = '0.10.0'
70+
version = '0.11.0'
7171
# The full version, including alpha/beta/rc tags.
72-
release = '0.10.0'
72+
release = '0.11.0'
7373

7474
# The language for content autogenerated by Sphinx. Refer to documentation
7575
# for a list of supported languages.

docs/source/getting_started.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Prerequisites
3636

3737
* ipyparallel (required for multiprocessing with ipymspectrum)
3838

39-
* (not really a prerequisite but **extremely** useful) IPython_ version 7.2 and Jupyter_
39+
* (not really a prerequisite but **extremely** useful) IPython_ version 7.21 and Jupyter_
4040

4141
.. _IPython: http://ipython.org
4242

docs/source/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ChiantiPy Documentation
88

99
Welcome to the ChiantiPy documentation. ChiantiPy is a pure Python package for performing calculations of astrophysical spectra using the `CHIANTI atomic database <http://www.chiantidatabase.org/>`_.
1010

11-
The latest version of ChiantiPy is 0.10.0 and is compatible with CHIANTI database version 10.0. It is not compatible with previous versions
11+
The latest version of ChiantiPy is 0.11.0 and is compatible with CHIANTI database version 10.0. It is not compatible with previous versions
1212

1313
ChiantiPy v0.10.0 is released under the OSI approved ISC license. From `Wikipedia <https://en.wikipedia.org/w/index.php?title=ISC_license&oldid=664696993>`_: The ISC license is a permissive free software license written by the Internet Software Consortium (ISC). It is functionally equivalent to the simplified BSD and MIT/Expat licenses, ...
1414

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
setup(name = 'ChiantiPy',
1010
description = 'a Python interface to the CHIANTI atomic database for astrophysical spectroscopy',
1111
long_description = long_description,
12-
version = '0.10.0',
12+
version = '0.11.0',
1313
author = 'Ken Dere',
1414
author_email = '[email protected]',
1515
url = 'https://github.com/chianti-atomic/ChiantiPy',

0 commit comments

Comments
 (0)