Skip to content

Commit

Permalink
Cleaned PR
Browse files Browse the repository at this point in the history
  • Loading branch information
Marc Williamson authored and Marc Williamson committed Jul 4, 2019
1 parent 87c9b39 commit 551d730
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 156 deletions.
1 change: 1 addition & 0 deletions docs/workflow/azure_links.inc
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,4 @@
.. |emdash| unicode:: U+02014

.. vim: ft=rstS

143 changes: 0 additions & 143 deletions tardis/model/tests/data/Untitled.ipynb

This file was deleted.

14 changes: 1 addition & 13 deletions tardis/plasma/tests/test_plasma_vboundary.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,6 @@

DATA_PATH = os.path.join(tardis.__path__[0], 'plasma', 'tests', 'data')

#@pytest.fixture(scope="session")
#def tardis_ref_path():
# tardis_ref_path = pytest.config.getvalue("tardis_refdata")
# if tardis_ref_path is None:
# pytest.skip('--tardis-refdata was not specified')
# else:
# return os.path.expandvars(os.path.expanduser(tardis_ref_path))

#@pytest.fixture
#def chianti_he_db_fpath(tardis_ref_path):
# return os.path.abspath(os.path.join(tardis_ref_path, 'atom_data', 'chianti_He.h5'))

@pytest.fixture
def config_init_trad_fname():
return os.path.join(DATA_PATH, 'config_init_trad.yml')
Expand All @@ -46,4 +34,4 @@ def test_plasma_vboundary(config_init_trad_fname, v_inner_boundary, v_outer_boun
tardis_config.atom_data = atomic_data_fname
tardis_config.model.structure.v_inner_boundary = v_inner_boundary * u.km / u.s
tardis_config.model.structure.v_outer_boundary = v_outer_boundary * u.km / u.s
simulation = Simulation.from_config(tardis_config)
simulation = Simulation.from_config(tardis_config)

0 comments on commit 551d730

Please sign in to comment.