From 08f1567e4a206afa9b0a7df36040d2a41ba799ea Mon Sep 17 00:00:00 2001 From: Ashkbiz Danehkar Date: Sun, 28 Jan 2018 15:29:58 -0500 Subject: [PATCH] Update appveyor.yml --- appveyor.yml | 3 ++- pyequib/atomic-data/README.md | 2 +- pyequibtests/cel_test.py | 22 +++++++++++----------- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 97f83ca..62f9834 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -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: @@ -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 diff --git a/pyequib/atomic-data/README.md b/pyequib/atomic-data/README.md index 455212e..6b9a996 100644 --- a/pyequib/atomic-data/README.md +++ b/pyequib/atomic-data/README.md @@ -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). diff --git a/pyequibtests/cel_test.py b/pyequibtests/cel_test.py index f6b36fe..7c84d5b 100644 --- a/pyequibtests/cel_test.py +++ b/pyequibtests/cel_test.py @@ -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)