From 3622e4f0f4de09333d26a49e7630995d8c27d4ab Mon Sep 17 00:00:00 2001
From: Chunxiao Li <lcx366@126.com>
Date: Fri, 27 Mar 2020 17:37:51 +0800
Subject: [PATCH] update

---
 .DS_Store                                     | Bin 6148 -> 6148 bytes
 pyatmos/.DS_Store                             | Bin 8196 -> 8196 bytes
 .../StandardAtmosphere/StandardAtmosphere.py  |   2 +-
 pyatmos/__init__.py                           |   6 +++++-
 pyatmos/msise/nrlmsise00.py                   |   4 +++-
 5 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/.DS_Store b/.DS_Store
index 52224acabe18ac2777112d2a19c51e3f9bdfb51f..bf7aa0e6fe37af631f8e187bc87a17c55e8f71bc 100644
GIT binary patch
delta 70
zcmZoMXffCj&ct|fas*R@rbKnMsey@(f|0RVt&T#qxw(Okf(eja%gG_GYG~`3kXu<*
ZT~k{(a}u*W<E+gJ%+FXhvvd6A2LRn;6;S{H

delta 70
zcmZoMXffCj&ct|Pas*R@hIn<gv9XSVp^-_gjzYD$xq*&?iLqI2EhmS#s-dlCLT+VM
abxm#EjLD45@{BV#D>6T0+04fAj~@WsVigzw

diff --git a/pyatmos/.DS_Store b/pyatmos/.DS_Store
index 480070ac6d99dfd18bc18d831aa9d5c4c5117c9b..da76f7d05c0c99390a9c9a14e4fd457fe3eb4f74 100644
GIT binary patch
delta 86
zcmZp1XmQxEUy$+S<O6~Y+!EE*rUoWD3P#3elOG7nGR~a*PgtID*5nSMvj`PNrlvp@
Yrl!a$Hp_`TXWq;%@r`BkZxME805&!rG5`Po

delta 34
ocmZp1XmQxEUvRRrz?sQCLZ?9VW@V8l%$r#yez0u*FT&0Y0Q!Xul>h($

diff --git a/pyatmos/StandardAtmosphere/StandardAtmosphere.py b/pyatmos/StandardAtmosphere/StandardAtmosphere.py
index f49c896..0244f30 100644
--- a/pyatmos/StandardAtmosphere/StandardAtmosphere.py
+++ b/pyatmos/StandardAtmosphere/StandardAtmosphere.py
@@ -100,4 +100,4 @@ def isa(altitude,altitude_type='geometric'):
             h0 = geopotential_alt[i+1]
 
     density = pressure / (R * temperature)
-    return {'temperature':temperature,'pressure':pressure,'density':density}
\ No newline at end of file
+    return {'temperature[K]':temperature,'pressure[Pa]':pressure,'density[kg/m^3]':density}
\ No newline at end of file
diff --git a/pyatmos/__init__.py b/pyatmos/__init__.py
index 395a39d..438f062 100644
--- a/pyatmos/__init__.py
+++ b/pyatmos/__init__.py
@@ -2,4 +2,8 @@
 pyatmos package
 
 This package is an archive of scientific routines that implements the estimation of atmospheric properties for various atmosphere models.  
-'''    
\ No newline at end of file
+'''    
+
+from .StandardAtmosphere.StandardAtmosphere import isa
+from .msise.spaceweather import download_sw,read_sw
+from .msise.nrlmsise00 import nrlmsise00
\ No newline at end of file
diff --git a/pyatmos/msise/nrlmsise00.py b/pyatmos/msise/nrlmsise00.py
index 57888c5..eba99b8 100644
--- a/pyatmos/msise/nrlmsise00.py
+++ b/pyatmos/msise/nrlmsise00.py
@@ -49,6 +49,7 @@ nrlmsise00
 '''
 
 import numpy as np
+from astropy.time import Time
 from scipy.interpolate import CubicSpline
 from pyshtools.legendre import PLegendreA,PlmIndex
 import pkg_resources
@@ -1021,7 +1022,8 @@ def gts7(inputp,flags,gsurf,re):
 
 # ============================ nrlmsise00 =========================== #
 
-def nrlmsise00(t,lat,lon,alt,SW_OBS_PRE,omode,aphmode):
+def nrlmsise00(t,lat,lon,alt,SW_OBS_PRE,omode='Oxygen',aphmode='NoAph'):
+    t = Time(t)
     lon_wrap = wraplon(lon)
     t_yday = t.yday.split(':')
     t_ymd = t.iso.split()[0].split('-')