Skip to content

Commit

Permalink
Update appveyor.yml
Browse files Browse the repository at this point in the history
  • Loading branch information
danehkar committed Jan 28, 2018
1 parent 7196fd9 commit 08f1567
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 13 deletions.
3 changes: 2 additions & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ environment:
matrix:
- PYTHON_VERSION: 2.7
MINICONDA: C:\Miniconda
- PYTHON_VERSION: 3.4
- PYTHON_VERSION: 3.6
MINICONDA: C:\Miniconda3

matrix:
Expand All @@ -19,6 +19,7 @@ install:
- conda config --set always_yes yes --set changeps1 no
- conda update -q conda
- conda info -a
- pip install numpy scipy nose
- "conda create -q -n test-environment python=%PYTHON_VERSION% numpy scipy nose"
- activate test-environment
- pip install coverage
Expand Down
2 changes: 1 addition & 1 deletion pyequib/atomic-data/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## Atomic Data

The atomic data are **Chianti52** from the [CHIANTI atomic database](http://www.chiantidatabase.org/) version 5.2, and have been used in MOCASSIN v2.0.
The atomic data are from the [CHIANTI atomic database](http://www.chiantidatabase.org/) version 5.2, and have been used in [MOCASSIN v2.0](https://github.com/mocassin/MOCASSIN-2.0).

22 changes: 11 additions & 11 deletions pyequibtests/cel_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,22 @@
import pyequib

ion='o_iii'
tempi=10000.0
densi=5000.0
temperature=10000.0
density=5000.0
levels5007='3,4/'
iobs5007=1200.0
Abb5007=pyequib.cel.calc_abundance(temperature=tempi, density=densi, line_flux=iobs5007, ion=ion, atomic_levels=levels5007)
Abb5007=pyequib.cel.calc_abundance(temperature=temperature, density=density, line_flux=iobs5007, ion=ion, atomic_levels=levels5007)

ion='s_ii'
levu='1,2,1,3/'
levl='1,5/'
dens = 2550.0
upper_levels='1,2,1,3/'
lower_levels='1,5/'
density = 2550.0
niiTratio=10.753
temp=pyequib.cel.calc_temperature(line_flux_ratio=niiTratio, density=dens, ion=ion, upper_levels=levu, lower_levels=levl)
temp=pyequib.cel.calc_temperature(line_flux_ratio=niiTratio, density=density, ion=ion, upper_levels=upper_levels, lower_levels=lower_levels)

ion='s_ii'
levu='1,2/'
levl='1,3/'
temp = 7000.0
upper_levels='1,2/'
lower_levels='1,3/'
temperature = 7000.0
siiNratio=1.506
dens=pyequib.cel.calc_density(line_flux_ratio=siiNratio, temperature=temp, ion=ion, upper_levels=levu, lower_levels=levl)
dens=pyequib.cel.calc_density(line_flux_ratio=siiNratio, temperature=temperature, ion=ion, upper_levels=upper_levels, lower_levels=lower_levels)

0 comments on commit 08f1567

Please sign in to comment.