Merge branch 'master' into cache_LFS_bridge

.github/workflows/tests.yml

@@ -23,9 +23,11 @@ env:
   CHIANTI_DB_VER: CHIANTI_v9.0.1_database.tar.gz
   PYTEST_FLAGS: --remote-data --runslow --test-db=carsus-db/test_databases/test.db
                 --refdata=carsus-refdata --cov=carsus --cov-report=xml
-                --cov-report=html
+                --cov-report=html --arraydiff --arraydiff-reference-path=carsus-refdata/arraydiff  
   NBCONVERT_CMD: jupyter nbconvert --execute --ExecutePreprocessor.timeout=600 --to html
   CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+  CMFGEN_DL_URL: http://kookaburra.phyast.pitt.edu/hillier/cmfgen_files
+  CMFGEN_DB_VER: atomic_data_15nov16.tar.gz
 
 jobs:
   build:
@@ -77,6 +79,18 @@ jobs:
             wget -q ${{ env.CHIANTI_DL_URL }}/${{ env.CHIANTI_DB_VER }} -O ${{ env.XUVTOP }}/chianti.tar.gz
             tar -zxf ${{ env.XUVTOP }}/chianti.tar.gz -C ${{ env.XUVTOP }}
         if: steps.chianti-cache.outputs.cache-hit != 'true'
+
+      - uses: actions/cache@v2
+        with:
+          path: /tmp/atomic
+          key: ${{ env.CMFGEN_DB_VER }}
+        id: cmfgen-cache
+
+      - name: Download CMFGEN database
+        run: |
+            wget -q -U "Mozilla/4.0" ${{ env.CMFGEN_DL_URL }}/${{ env.CMFGEN_DB_VER }} -O /tmp/atomic.tar.gz
+            tar -zxf /tmp/atomic.tar.gz -C /tmp
+        if: steps.cmfgen-cache.outputs.cache-hit != 'true'
 
       - name: Setup environment
         uses: conda-incubator/setup-miniconda@v2

README.rst

@@ -17,8 +17,8 @@ sources and output them to file formats readable by radiative transfer codes.
     :target: https://tardis-sn.github.io/carsus
     :alt: docs
 
-.. image:: https://github.com/tardis-sn/carsus/actions/workflows/unit-tests.yml/badge.svg
-    :target: https://github.com/tardis-sn/carsus/actions/workflows/unit-tests.yml
+.. image:: https://github.com/tardis-sn/carsus/actions/workflows/tests.yml/badge.svg
+    :target: https://github.com/tardis-sn/carsus/actions/workflows/tests.yml
     :alt: tests
 
 .. image:: https://badges.gitter.im/Join%20Chat.svg

carsus/data/cmfgen_config.yml

@@ -89,7 +89,7 @@ atom:
   Co:
     ion_charge:
       1:
-        date: 30oct12
+        date: 15nov11
         osc: fin_osc_bound
         col: Co2_COL_DATA
         pho:
@@ -113,7 +113,7 @@ atom:
           - niphot_c.dat
           - niphot_d.dat
       1:
-        date: 12sep12
+        date: 23jan06
         osc: fin_osc
         col: n2col.dat
         pho:

carsus/io/__init__.py

@@ -1,6 +1,10 @@
+import os
 from carsus.io.nist import NISTIonizationEnergiesParser, NISTIonizationEnergiesIngester,\
     NISTWeightsCompPyparser, NISTWeightsCompIngester
-from carsus.io.chianti_ import ChiantiIonReader, ChiantiIngester
 from carsus.io.kurucz import GFALLReader, GFALLIngester
 from carsus.io.output import AtomData
 from carsus.io.zeta import KnoxLongZetaIngester
+from carsus.io.atom_data_compare import AtomDataCompare
+
+if "XUVTOP" in os.environ:
+    from carsus.io.chianti_ import ChiantiIonReader, ChiantiIngester