fixed ssl download issues; renamed WD to WeingartnerDraine

birnstiel · Oct 25, 2018 · 5f0bff9 · 5f0bff9
1 parent bac3097
commit 5f0bff9
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/dsharp_opac/__init__.py b/dsharp_opac/__init__.py
@@ -13,7 +13,7 @@
     diel_preibisch93, \
     diel_pollack1994, \
     diel_draine2003, \
-    diel_WD2001_astrosil, \
+    diel_WeingartnerDraine2001_astrosil, \
     diel_drainelee84_astrosil, \
     diel_vacuum, \
     diel_zubko96, \
@@ -50,7 +50,7 @@
     'diel_preibisch93',
     'diel_pollack1994',
     'diel_draine2003',
-    'diel_WD2001_astrosil',
+    'diel_WeingartnerDraine2001_astrosil',
     'diel_drainelee84_astrosil',
     'diel_vacuum',
     'diel_zubko96',

diff --git a/dsharp_opac/dsharp_opac.py b/dsharp_opac/dsharp_opac.py
@@ -142,8 +142,11 @@ def download(packagedir):
     """
     import json
     import os
+    import ssl
     from urllib.request import urlretrieve
 
+    ssl._create_default_https_context = ssl._create_unverified_context
+
     if not os.path.isdir(packagedir):
         packagedir = os.path.dirname(packagedir)
 
@@ -799,7 +802,7 @@ def __init__(self, species, **kwargs):
         self.print_reference()
 
 
-class diel_WD2001_astrosil(diel_const):
+class diel_WeingartnerDraine2001_astrosil(diel_const):
     """
     Returns the dielectric constants for astronomical silicates from
     Weingartner & Draine 2001. The data comes from file `eps_suvSil`

diff --git a/tests/default_opacities.ipynb b/tests/default_opacities.ipynb
@@ -1553,7 +1553,7 @@
     "\n",
     "# get the silicates and extrapolate\n",
     "\n",
-    "draine_sil = opacity.diel_WD2001_astrosil()\n",
+    "draine_sil = opacity.diel_WeingartnerDraine2001_astrosil()\n",
     "draine_sil.extrapolate_constants_up(0.05,1,kind='linear')\n",
     "\n",
     "# mix the graphite grains\n",

diff --git a/tests/opacity_package_tests.ipynb b/tests/opacity_package_tests.ipynb
@@ -56,7 +56,7 @@
    ],
    "source": [
     "r = opacity.diel_luca('silicate', extrapol=True)\n",
-    "c1 = opacity.diel_WD2001_astrosil()\n",
+    "c1 = opacity.diel_WeingartnerDraine2001_astrosil()\n",
     "c2 = opacity.diel_draine2003_astrosil()\n",
     "opacity.compare_nk([c1, c2, r], orig_data=True);"
    ]