Merge pull request #12 from amisr/develop

[MNT]: Release v2021.2.2
amisr · Nov 23, 2021 · e151fe4 · e151fe4
2 parents aa81806 + 6482646
commit e151fe4
Show file tree

Hide file tree

Showing 18 changed files with 1,028 additions and 30 deletions.
diff --git a/docs/conf.py b/docs/conf.py
@@ -79,7 +79,7 @@
 
 # General information about the project.
 project = u'AMISR'
-copyright = u'2020, asreimer'
+copyright = u'2021, asreimer'
 author = u'asreimer'
 
 # The version info for the project you're documenting, acts as replacement for

diff --git a/docs/installation/installation.linux.rst b/docs/installation/installation.linux.rst
@@ -26,7 +26,7 @@ Installing flipchem
 
 Now you can install flipchem to the same python environment using `pip`::
 
-    pip install git+https://github.com/amisr/flipchem.git@v2020.2.1
+    pip install git+https://github.com/amisr/flipchem.git@v2021.2.2
 
 
 That's it! Easy peasy.
diff --git a/docs/installation/installation.macos.rst b/docs/installation/installation.macos.rst
@@ -26,7 +26,7 @@ Installing flipchem
 
 Now you can install flipchem to the same python environment using `pip`::
 
-    pip install git+https://github.com/amisr/flipchem.git@v2020.2.1
+    pip install git+https://github.com/amisr/flipchem.git@v2021.2.2
 
 
 That's it! Easy peasy.
diff --git a/docs/installation/installation.windows.rst b/docs/installation/installation.windows.rst
@@ -45,7 +45,7 @@ Installing flipchem
 
 Now you can install flipchem to the same python environment using `pip`::
 
-    pip install git+https://github.com/amisr/flipchem.git@v2020.2.1
+    pip install git+https://github.com/amisr/flipchem.git@v2021.2.2
 
 If `pip` isn't installed, you can install it using `conda`::
 

diff --git a/docs/usage.rst b/docs/usage.rst
@@ -91,14 +91,14 @@ And there is code available with the MSIS wrapper that provides ion-neutral and
     ion_masses = [14.0,16.0,28.0,30.0,32.0]
     Te = Ti = 1000.0
     nu_in = list()
-    neutral_densities = (H,He,N,O,N2,O2)
+    neutral_densities = (H,He,N,O,N2,O2,Ar)
     for mass in ion_masses:
         nu_in.append(compute_ion_neutral_collfreq(neutral_densities, Tn, mass, Ti))
     nu_en = compute_electron_neutral_collfreq(neutral_densities, Te)
 
 Example Jupyter Notebook
 -------------------------
 
-Do you prefer working in jupyter notebooks? `Here you can find an example notebook that shows how to get altitude profiles of ion densities <https://nbviewer.jupyter.org/github/amisr/flipchem/blob/v2020.2.2/notebooks/usage_examples.ipynb>`_.
+Do you prefer working in jupyter notebooks? `Here you can find an example notebook that shows how to get altitude profiles of ion densities <https://nbviewer.jupyter.org/github/amisr/flipchem/blob/v2021.2.2/notebooks/usage_examples.ipynb>`_.
 
 Is there an example missing that you would like to see? Feel free to suggest one!
diff --git a/flipchem/__init__.py b/flipchem/__init__.py
@@ -8,7 +8,7 @@
 from .msis import compute_electron_neutral_collfreq
 from .flipchem import Flipchem
 
-__version__ = '2020.2.1'
+__version__ = '2021.2.1'
 __doc__ = """
 This package contains the a python wrapper of the flipchem ionospheric
 photochemistry model developed by Phil Richards:

diff --git a/flipchem/dat/2004 b/flipchem/dat/2004
@@ -348,11 +348,11 @@
 0412132339 643372713 710 3 3143 32 22 12  5  3  4  2  2 100.63 16087.00
 0412142339 7 310232323132320140  2  4  9  9  9  5  9  7  70.31 14086.50
 0412152339 8232020 0 7231320127  9  7  7  0  3  9  5  7  60.31  8086.50
-0412162339 9203323 327233740207  7 18  9  2 12  9 22 27 130.84 1000nan0
-0412172339103340333023332333250 18 27 18 15  9 18  9 18 160.94 2400nan0
-04121823391143372320302020 7200 32 22  9  7 15  7  7  3 130.73 2100nan0
-04121923391213 710 7 0 0 7 7 50  5  3  4  3  0  0  3  3  30.00 1200nan0
-04122023391323 7101010 3 713 83  9  3  4  4  4  2  3  5  40.10 1100nan0
+0412162339 9203323 327233740207  7 18  9  2 12  9 22 27 130.84 10088.40
+0412172339103340333023332333250 18 27 18 15  9 18  9 18 160.94 24090.20
+04121823391143372320302020 7200 32 22  9  7 15  7  7  3 130.73 21092.10
+04121923391213 710 7 0 0 7 7 50  5  3  4  3  0  0  3  3  30.00 12094.00
+04122023391323 7101010 3 713 83  9  3  4  4  4  2  3  5  40.10 11095.80
 04122123391420 7304317272727197  7  3 15 32  6 12 12 12 120.73 15097.70
 0412222339153343434330272023263 18 32 32 32 15 12  7  9 201.05 26095.60
 0412232339162313131013231723137  9  5  5  4  5  9  6  9  60.31 18093.20

diff --git a/flipchem/dat/2005 b/flipchem/dat/2005
@@ -178,7 +178,7 @@
 05062723461310 3 0 313 71713 67  4  2  0  2  5  3  6  5  30.10  8080.00
 050628234614 71010 3131013 7 73  3  4  4  2  5  4  5  3  40.10  9082.60
 05062923461517 713131717 7 7 97  6  3  5  5  6  6  3  3  50.21 28091.20
-0506302346161010131313202020120  4  4  5  5  5  7  7  7  60.21 6700nan0
+0506302346161010131313202020120  4  4  5  5  5  7  7  7  60.21 67104.80
 050701234617231713 720434337203  9  6  5  3  7 32 32 22 140.84 78118.50
 0507022346184020232317232733207 27  7  9  9  6  9 12 18 120.73 95128.00
 0507032346193020172020101023150 15  7  6  7  7  4  4  9  70.42101134.10

diff --git a/flipchem/dat/2007 b/flipchem/dat/2007
@@ -154,8 +154,8 @@
 0706032372171717101017334027170  6  6  4  4  6 18 27 12 100.63 31089.50
 07060423721827201013202727 7150 12  7  4  5  7 12 12  3  80.42 34088.20
 070605237219 3 3 3 3 7 7 3 7 37  2  2  2  2  3  3  2  3  20.00 35083.60
-070606237220 0 3 3 3 710 3 3 33  0  2  2  2  3  4  2  2  20.00 3300nan0
-070607237221 7 3 3 3 7 7 7 7 43  3  2  2  2  3  3  3  3  30.00 3700nan0
+070606237220 0 3 3 3 710 3 3 33  0  2  2  2  3  4  2  2  20.00 33084.70
+070607237221 7 3 3 3 7 7 7 7 43  3  2  2  2  3  3  3  3  30.00 37085.70
 070608237222272017 720201723150 12  7  6  3  7  7  6  9  70.42 34086.80
 0706092372231013201720131320127  4  5  7  6  7  5  5  7  60.31 12081.00
 0706102372243017271710 713 7127 15  6 12  6  4  3  5  3  70.31  9078.20

diff --git a/flipchem/dat/2008 b/flipchem/dat/2008
@@ -31,7 +31,7 @@
 080131238116 0 0 0 7 7233027 93  0  0  0  3  3  9 15 12  50.21  8069.90
 0802012381173323332717334343253 18  9 18 12  6 18 32 32 181.05 11069.00
 0802022381184347302033233330260 32 39 15  7 18  9 18 15 191.05  9068.10
-0802032381193030333323333733253 15 15 18 18  9 18 22 18 170.94  900nan0
+0802032381193030333323333733253 15 15 18 18  9 18 22 18 170.94  9068.70
 0802042381202727202010132320160 12 12  7  7  4  5  9  7  80.42  8069.30
 0802052381212020 0 3101313 3 83  7  7  0  2  4  5  5  2  40.10  0068.50
 080206238122 0 3 7 310132320 80  0  2  3  2  4  5  9  7  40.10  0069.60
@@ -353,7 +353,7 @@
 081218239314 0 3 0 0 3 7 7 7 27  0  2  0  0  2  3  3  3  20.00  0066.20
 081219239315 7 7 3131313 710 73  3  3  2  5  5  5  3  4  40.10  0067.00
 081220239316 3 0 7 7 7 7 3 0 33  2  0  3  3  3  3  2  0  20.00  0066.90
-081221239317 310 7 3 0 0 0 0 23  2  4  3  2  0  0  0  0  10.00  000nan0
+081221239317 310 7 3 0 0 0 0 23  2  4  3  2  0  0  0  0  10.00  0066.20
 081222239318 0 3 0 0 3332317 80  0  2  0  0  2 18  9  6  50.21  0065.50
 0812232393192327172020273037200  9 12  6  7  7 12 15 22 110.63  0066.30
 0812242393202723172010172010143 12  9  6  7  4  6  7  4  70.31  0067.10

diff --git a/flipchem/dat/2011 b/flipchem/dat/2011
@@ -1,4 +1,4 @@
-1101012421 213 7 0 71013 720 77  5  3  0  3  4  5  3  7  40.10 3700nan0
+1101012421 213 7 0 71013 720 77  5  3  0  3  4  5  3  7  40.10 37088.00
 1101022421 31317 3 7 7131713 90  5  6  2  3  3  5  6  5  40.21 33088.10
 1101032421 4 7 7 31010202023100  3  3  2  4  4  7  7  9  50.21 32089.10
 1101042421 513271010131717 7113  5 12  4  4  5  6  6  3  60.31 33087.60

diff --git a/flipchem/dat/2012 b/flipchem/dat/2012
@@ -1,4 +1,4 @@
-1201012434161710 7 317171310 93  6  4  3  2  6  6  5  4  40.21 4400nan0
+1201012434161710 7 317171310 93  6  4  3  2  6  6  5  4  40.21 44129.40
 120102243417 0 0 3 013102323 73  0  0  2  0  5  4  9  9  40.10 57130.30
 1201032434183337171313171010150 18 22  6  5  5  6  4  4  90.52 74130.20
 12010424341917 0 0 0 7 3 3 7 37  6  0  0  0  3  2  2  3  20.00 78131.60

diff --git a/flipchem/dat/2015 b/flipchem/dat/2015
@@ -10,7 +10,7 @@
 15011024751423331320233310 7163  9 18  5  7  9 18  4  3  90.52---146.90
 1501112475153023302023102027183 15  9 15  7  9  4  7 12 100.52---148.60
 150112247516 313131727232320140  2  5  5  6 12  9  9  7  70.31---153.40
-1501132475171717101327272020150  6  6  4  5 12 12  7  7  70.42---00nan0
+1501132475171717101327272020150  6  6  4  5 12 12  7  7  70.42---144.40
 15011424751820 7101727131710120  7  3  4  6 12  5  6  4  60.31---135.30
 150115247519 3 713133017 3 3 90  2  3  5  5 15  6  2  2  50.21---127.10
 1501162475201330201320101710133  5 15  7  5  7  4  6  4  70.31---120.70