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.

Sign up for GitHub

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

fixing run_tardis #219

Merged
merged 1 commit into from
Feb 22, 2015
Merged

fixing run_tardis #219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions tardis/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
from ._astropy_init import *
# ----------------------------------------------------------------------------

from tardis.base import run_tardis

logger = logging.getLogger('tardis')
logger.setLevel(logging.INFO)
Expand Down
10 changes: 4 additions & 6 deletions tardis/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
#functions that are important for the general usage of TARDIS

import yaml

from tardis.io import config_reader
from tardis import model, simulation, atomic


def run_tardis(config, atom_data=None):
"""
This function is one of the core functions to run TARDIS from a given
Expand All @@ -25,6 +19,10 @@ def run_tardis(config, atom_data=None):
atomic data will be loaded according to keywords set in the configuration
[default=None]
"""
import yaml

from tardis.io import config_reader
from tardis import model, simulation, atomic

try:
config_dict = yaml.load(open(config))
Expand Down