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

Fix the Plasma tests #1150

Merged
merged 6 commits into from
Jun 2, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 0 deletions azure-pipelines/simple_test_framework.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ variables:

ref.data.github.url: "https://github.com/tardis-sn/tardis-refdata.git"
tardis.build.dir: $(Build.Repository.LocalPath)
codecov.token: "a876d307-9ed5-4f5d-a6c4-e58291ac4111"


jobs:
- job: "Test"
Expand Down
53 changes: 0 additions & 53 deletions tardis/plasma/tests/data/plasma_test_config_lte.yml

This file was deleted.

55 changes: 0 additions & 55 deletions tardis/plasma/tests/data/plasma_test_config_nlte.yml

This file was deleted.

22 changes: 14 additions & 8 deletions tardis/plasma/tests/test_hdf_plasma.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,24 @@
from tardis.plasma.properties import property_collections

###
# Save and Load
# saving and loading of plasma properties in the HDF file
###


@pytest.fixture(scope="module", autouse=True)
def to_hdf_buffer(hdf_file_path, simulation_verysimple):
simulation_verysimple.plasma.to_hdf(hdf_file_path)


plasma_properties_list = ['number_density', 'beta_rad', 'general_level_boltzmann_factor', 'level_boltzmann_factor',
'stimulated_emission_factor', 't_electrons', 'wavelength_cm', 'lines_lower_level_index',
'ionization_data', 'density', 'atomic_mass', 'level_number_density', 'lines_upper_level_index',
'nu', 'beta_sobolev', 'transition_probabilities', 'phi',
'electron_densities', 't_rad', 'selected_atoms', 'ion_number_density', 'partition_function',
'abundance', 'g_electron', 'g', 'lines', 'f_lu', 'tau_sobolevs', 'j_blues',
'metastability', 'w', 'excitation_energy']
plasma_properties_list = [
'number_density', 'beta_rad', 'general_level_boltzmann_factor',
'level_boltzmann_factor', 'stimulated_emission_factor', 't_electrons',
'wavelength_cm', 'lines_lower_level_index', 'ionization_data', 'density',
'atomic_mass', 'level_number_density', 'lines_upper_level_index', 'nu',
'beta_sobolev', 'transition_probabilities', 'phi', 'electron_densities',
't_rad', 'selected_atoms', 'ion_number_density', 'partition_function',
'abundance', 'g_electron', 'g', 'lines', 'f_lu', 'tau_sobolevs',
'j_blues', 'metastability', 'w', 'excitation_energy']


@pytest.mark.parametrize("attr", plasma_properties_list)
Expand Down Expand Up @@ -69,13 +72,16 @@ def test_atomic_data_uuid(hdf_file_path, simulation_verysimple):
expected = pd.read_hdf(hdf_file_path, path)['atom_data_uuid']
assert actual == expected


@pytest.fixture(scope="module", autouse=True)
def to_hdf_collection_buffer(hdf_file_path, simulation_verysimple):
simulation_verysimple.plasma.to_hdf(
hdf_file_path, name='collection', collection=property_collections.basic_inputs)


collection_properties = ['t_rad', 'w', 'density']


@pytest.mark.parametrize("attr", collection_properties)
def test_collection(hdf_file_path, simulation_verysimple, attr):
actual = getattr(simulation_verysimple.plasma, attr)
Expand Down
13 changes: 8 additions & 5 deletions tardis/plasma/tests/test_plasma_vboundary.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@
from tardis.io.atom_data.base import AtomData
from tardis.simulation import Simulation



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


@pytest.fixture
def config_init_trad_fname():
return os.path.join(DATA_PATH, 'config_init_trad.yml')


@pytest.mark.parametrize("v_inner_boundary, v_outer_boundary",
[(3350, 3650),
(2900, 3750),
Expand All @@ -29,9 +29,12 @@ def config_init_trad_fname():
(3150, 3750),
(3150, 3850),
(3150, 3900)])
def test_plasma_vboundary(config_init_trad_fname, v_inner_boundary, v_outer_boundary, atomic_data_fname):
def test_plasma_vboundary(config_init_trad_fname, v_inner_boundary,
v_outer_boundary, atomic_data_fname):
tardis_config = Configuration.from_yaml(config_init_trad_fname)
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
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)
77 changes: 0 additions & 77 deletions tardis/plasma/tests/test_plasmas_full.py

This file was deleted.