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

Restructure the Simulation #645

Closed
wants to merge 10 commits into from
Closed

Restructure the Simulation #645

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7bdcf08
Implement the barebones of the restructured Simulation class.
ftsamis Aug 4, 2016
0820c63
Implement the Simulation.from_config classmethod.
ftsamis Aug 4, 2016
abc796d
Make Simulation take the Montecarlo runner as a parameter.
ftsamis Aug 5, 2016
e643d56
Simulation: Add the logic for the last iteration.
ftsamis Aug 13, 2016
fd8f1fc
Simulation: Log the plasma state when advancing the simulation.
ftsamis Aug 16, 2016
ceb2de3
Make sure all no_of_packets variables are passed as integers.
ftsamis Aug 16, 2016
9523cbf
Remove atom_data from the init arguments of Simulation.
ftsamis Aug 16, 2016
c073916
Move the luminosity_nu_[start|end] calculation from config_reader to …
ftsamis Aug 16, 2016
3282d76
Don't duplicate information from the MontecarloRunner to the Simulation.
ftsamis Aug 18, 2016
710a62b
Add convergence checking and hold_iterations logic.
ftsamis Aug 18, 2016
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
12 changes: 0 additions & 12 deletions tardis/io/config_reader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -806,22 +806,10 @@ def from_config_dict(cls, config_dict, atom_data=None, test_parser=False,


#Parsing supernova dictionary
validated_config_dict['supernova']['luminosity_nu_start'] = \
validated_config_dict['supernova']['luminosity_wavelength_end'].to(
u.Hz, u.spectral())
try:
validated_config_dict['supernova']['luminosity_nu_end'] = \
(validated_config_dict['supernova']
['luminosity_wavelength_start'].to(u.Hz, u.spectral()))
except ZeroDivisionError:
validated_config_dict['supernova']['luminosity_nu_end'] = (
np.inf * u.Hz)

validated_config_dict['supernova']['time_explosion'] = (
validated_config_dict['supernova']['time_explosion'].cgs)

validated_config_dict['supernova']['luminosity_requested'] = (
validated_config_dict['supernova']['luminosity_requested'].cgs)

#Parsing the model section

Expand Down
2 changes: 1 addition & 1 deletion tardis/simulation/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
from tardis.simulation.base import Simulation, run_radial1d
from tardis.simulation.base import Simulation
Loading