Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Transfer classes for eigendata, NEI simulations, and simulation results to this repo #20

Merged
merged 53 commits into from
Jun 4, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
371d0ff
Include HDF5 files in MANIFEST.in
namurphy Apr 30, 2020
d707616
Transfer EigenData2 class and tests from NEI-modeling/NEI
namurphy Apr 30, 2020
085ea58
Add h5py dependency and update test configuration
namurphy Apr 30, 2020
e3adaa7
Reformat transferred files with black
namurphy Apr 30, 2020
2dd31fa
Skip doctests and mark that copied over tests will fail
namurphy Apr 30, 2020
83c5226
Set include_package_data to True in setup.py
namurphy Apr 30, 2020
bb18e39
Add EigenData class and tests
namurphy May 1, 2020
d94ad98
Delete old EigenData2 class and tests
namurphy May 1, 2020
672ec00
Copy NEI class and tests from NEI-modeling/NEI
namurphy May 1, 2020
2d246f3
Remove nearly empty test file in eigen
namurphy May 1, 2020
a889b88
Remove example subpackage left over from templating
namurphy May 1, 2020
7df4d97
Adapt NEI class & tests to this repository
namurphy May 1, 2020
13eb41d
Use black to clean up code
namurphy May 1, 2020
eae0d55
Rename Simulation, add docstrings, etc.
namurphy May 1, 2020
b1dd5c7
Create minimal docs for nei & eigen subpackages
namurphy May 1, 2020
7511e41
Update ReST formatting
namurphy May 1, 2020
f4ffc66
Update type hint annotations
namurphy May 1, 2020
0dd70a7
Temporarily stop building docstrings from nei subpackage
namurphy May 1, 2020
6f89b13
Update ReST formatting
namurphy May 1, 2020
693603e
Update intersphinx_mapping from PlasmaPy
namurphy May 1, 2020
74f464b
Begin adding parameters to docstring for EigenData
namurphy May 1, 2020
b4eee78
Fix capitalization error
namurphy May 1, 2020
ba3edbc
Clarify conditional statement
namurphy May 1, 2020
89ee09a
Add PlasmaPy to intersphinx mapping
namurphy May 1, 2020
3133cff
Use `size` attribute instead of calling `len`
namurphy May 1, 2020
c3e49fb
Specify minimum package versions
namurphy May 1, 2020
1b7460e
Be more specific in a conditional
namurphy May 1, 2020
8bb9cab
Remove install_requires in setup.py
namurphy May 1, 2020
87415c1
Limit sphinx to 2.4.4 until automodapi fix is released
namurphy May 1, 2020
e5686f2
Merge branch 'eigen' of github.com:namurphy/PlasmaPy-NEI into eigen
namurphy May 1, 2020
a56591c
Minor updates to __init__.py
namurphy May 1, 2020
34c2db7
Reformat code with black
namurphy May 4, 2020
9494144
Formatting changes
namurphy May 4, 2020
add4eea
Make code safe from atomic -> particles transition
StanczakDominik May 8, 2020
3dce3f6
Initialize _results with None by default
StanczakDominik May 8, 2020
9f484a1
Raise __init__ NEIError from the original exception
StanczakDominik May 8, 2020
b87cb89
Rewrite test_nei using fixtures
StanczakDominik May 8, 2020
b5acd1c
Refactor: use numpy to simplify comparison
StanczakDominik May 8, 2020
bb8cc02
Refactor: remove uninformative exception
StanczakDominik May 8, 2020
7be59d8
Refactor: a silly autoreplace bug
StanczakDominik May 8, 2020
ef34433
Remove unnecessary import
StanczakDominik May 8, 2020
ff1bde4
Merge pull request #1 from StanczakDominik/eigen
namurphy May 8, 2020
00bf381
Use slightly faster way of constructing a Quantity
namurphy May 9, 2020
e9ec8a9
Shorten calculations for equilibrium
namurphy May 9, 2020
2b60c4f
Merge branch 'master' of github.com:PlasmaPy/PlasmaPy-NEI into eigen
namurphy Jun 1, 2020
44701ea
Merge branch 'eigen' of github.com:namurphy/PlasmaPy-NEI into eigen
namurphy Jun 1, 2020
c790de3
Change around imports for PlasmaPy 0.3.1 and after
namurphy Jun 1, 2020
31818e0
Add exception handling directly to EigenData.__init__
namurphy Jun 2, 2020
9c7fef9
Add TODOs to eigenclass.py plus minor changes
namurphy Jun 3, 2020
0d7d442
Handle exceptions resulting from missing data file
namurphy Jun 3, 2020
7ce0957
Clean up nei.py and tests
namurphy Jun 3, 2020
cb6378c
Improve conditional statements for T_e & T_e_index
namurphy Jun 3, 2020
293d319
Update plasmapy_nei/nei/nei.py
namurphy Jun 3, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ include setup.cfg
include LICENSE.md
include pyproject.toml

recursive-include plasmapy_nei *.pyx *.c *.pxd
recursive-include plasmapy_nei *.pyx *.c *.pxd *.h5
recursive-include docs *
recursive-include licenses *
recursive-include cextern *
Expand Down
9 changes: 8 additions & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,14 @@
# -- Options for intersphinx extension ---------------------------------------

# Example configuration for intersphinx: refer to the Python standard library.
intersphinx_mapping = {"https://docs.python.org/": None}
intersphinx_mapping = {
"python": ("https://docs.python.org/3", None),
"numpy": ("https://docs.scipy.org/doc/numpy", None),
"scipy": ("https://docs.scipy.org/doc/scipy/reference/", None),
"pandas": ("http://pandas.pydata.org/pandas-docs/stable/", None),
"astropy": ("http://docs.astropy.org/en/stable/", None),
"plasmapy": ("http://docs.plasmapy.org/en/latest/", None),
}

# -- Options for HTML output -------------------------------------------------

Expand Down
10 changes: 10 additions & 0 deletions docs/eigen/index.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
.. _eigen:

**********************
``plasmapy_nei.eigen``
**********************

.. py:currentmodule:: plasmapy_nei.eigen

.. automodapi:: plasmapy_nei.eigen
:no-heading:
3 changes: 3 additions & 0 deletions docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ The early versions of this package will account for collisional ionization, radi
:maxdepth: 2
:caption: Contents:

``plasmapy_nei.eigen`` <eigen/index>
``plasmapy_nei.nei`` <nei/index>

Indices and tables
==================

Expand Down
10 changes: 10 additions & 0 deletions docs/nei/index.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
.. _nei:

****************
``plasmapy.nei``
****************

.. py:currentmodule:: plasmapy_nei.nei

.. automodapi:: plasmapy_nei.nei
:no-heading:
7 changes: 2 additions & 5 deletions plasmapy_nei/__init__.py
Original file line number Diff line number Diff line change
@@ -1,18 +1,15 @@
"""A Python package for non-equilibrium ionization modelingg of plasma."""

__all__ = ["eigen", "nei"]

import warnings

try:
from .version import __version__
except Exception as exc:
warnings.warn("Unable to import __version__")
else:
del version
finally:
del warnings

from . import eigen
from . import nei

# Then you can be explicit to control what ends up in the namespace,
__all__ = ["eigen"]
2 changes: 2 additions & 0 deletions plasmapy_nei/eigen/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
"""Classes for accessing eigentables for ionization and recombination rates."""

from .eigenclass import EigenData
Loading