Skip to content

Commit 75d18cd

Browse files
authored
Merge pull request #384 from kdere/master
mostly change of shape to Ip array
2 parents f8f6897 + 86ff461 commit 75d18cd

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

ChiantiPy/tools/io.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1326,7 +1326,7 @@ def ipRead(verbose=False):
13261326
if verbose:
13271327
print((' maxz = %5i'%(maxz)))
13281328
nip = nip-1
1329-
ip = np.zeros((maxz, maxz), np.float64)
1329+
ip = np.zeros((maxz, maxz + 1), np.float64)
13301330
for aline in data[0:nip]:
13311331
s2 = aline.split()
13321332
iz = int(s2[0])

docs/source/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ ChiantiPy v0.14.0 is released under the OSI approved ISC license. From `Wikipedi
1717
CHIANTI is developed and maintained by scientists at George Mason University (USA), the University of Michigan (USA), and the University of Cambridge (UK). The first version of CHIANTI was released in 1997 and version 10.0 in 2021.
1818

1919
.. toctree::
20-
:maxdepth: 3
20+
:maxdepth: 2
2121

2222
getting_started
2323
quick_start

docs/source/tutorial.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ Bring up a Python session, or better yet, an IPython session
167167
::
168168

169169
import ChiantiPy.core as ch
170-
fe14 = ch.ion('fe_14')
170+
fe14 = ch.ion('fe_14', setup=False)
171171

172172
The fe14 object is instantiated with a number of methods and data. Methods start with lowercase letters and attributes start with uppercase letters. It is best not to simply import ion as there is a method with the same name in matplotlib. A few examples:
173173

@@ -250,9 +250,9 @@ If the fe14 **ion** object had be instantiated (created) with a temperature and
250250
::
251251

252252
import numpy as np
253-
t = 10.**(5.8+0.1*np.arange(11))
253+
temp = 10.**(5.8+0.1*np.arange(11))
254254
dens = 1.e+9
255-
fe14 = ch.ion('fe_14')
255+
fe14 = ch.ion('fe_14', temp, dens)
256256
fe14.populate()
257257
fe14.Population.keys()
258258
>>['ci', 'protonDensity', 'popmat', 'eDensity', 'rec', 'population', 'temperature']

0 commit comments

Comments
 (0)