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

Continuing geometry restructure #2065

Merged
merged 6 commits into from
Jun 21, 2022
Merged

Continuing geometry restructure #2065

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cf3b7c6
I moved calculate_distances to a new folder, packet_transfer. Depende…
nolanbrown01 Jun 17, 2022
b85760e
I moved calculate_distances to a new folder, transport. Dependencies …
nolanbrown01 Jun 20, 2022
c712c24
I added myself to the .mailmap
nolanbrown01 Jun 20, 2022
a9eab0f
Moved r_packet_transport from montecarlo_numba to transport. Changed …
nolanbrown01 Jun 20, 2022
0f6fc27
Moved frame_transportations to transport from montecarlo_numba. Renam…
nolanbrown01 Jun 20, 2022
725fbb3
Merge remote-tracking branch 'upstream/master' into continuing-geomet…
nolanbrown01 Jun 21, 2022
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 tardis/montecarlo/montecarlo_numba/continuum/r_packet_transport_continuum.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
calculate_distance_line,
)
from tardis.montecarlo.montecarlo_numba.estimators import update_line_estimators
from tardis.montecarlo.montecarlo_numba.frame_transformations import (
from tardis.transport.frame_transformations import (
get_doppler_factor,
)

Expand Down
2 changes: 1 addition & 1 deletion tardis/montecarlo/montecarlo_numba/estimators.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
njit_dict_no_parallel,
)

from tardis.montecarlo.montecarlo_numba.frame_transformations import (
from tardis.transport.frame_transformations import (
calc_packet_energy,
calc_packet_energy_full_relativity,
)
Expand Down
2 changes: 1 addition & 1 deletion tardis/montecarlo/montecarlo_numba/interaction.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from tardis.montecarlo import (
montecarlo_configuration as montecarlo_configuration,
)
from tardis.montecarlo.montecarlo_numba.frame_transformations import (
from tardis.transport.frame_transformations import (
get_doppler_factor,
get_inverse_doppler_factor,
angle_aberration_CMF_to_LF,
Expand Down
2 changes: 1 addition & 1 deletion tardis/montecarlo/montecarlo_numba/r_packet.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from tardis.montecarlo.montecarlo_numba import (
njit_dict_no_parallel,
)
from tardis.montecarlo.montecarlo_numba.frame_transformations import (
from tardis.transport.frame_transformations import (
get_doppler_factor,
)
from tardis.montecarlo.montecarlo_numba import numba_config as nc
Expand Down
4 changes: 2 additions & 2 deletions tardis/montecarlo/montecarlo_numba/single_packet_loop.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from tardis.montecarlo.montecarlo_numba.r_packet import (
PacketStatus,
)
from tardis.montecarlo.montecarlo_numba.r_packet_transport import (
from tardis.transport.r_packet_transport import (
move_r_packet,
move_packet_across_shell_boundary,
)
Expand All @@ -12,7 +12,7 @@
)


from tardis.montecarlo.montecarlo_numba.frame_transformations import (
from tardis.transport.frame_transformations import (
get_inverse_doppler_factor,
get_doppler_factor,
)
Expand Down
4 changes: 2 additions & 2 deletions tardis/montecarlo/montecarlo_numba/tests/test_packet.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@

import tardis.montecarlo.montecarlo_numba.r_packet as r_packet
import tardis.transport.calculate_distances as calculate_distances
import tardis.montecarlo.montecarlo_numba.frame_transformations as frame_transformations
import tardis.transport.frame_transformations as frame_transformations
import tardis.montecarlo.montecarlo_numba.opacities as opacities
import tardis.montecarlo.montecarlo_numba.r_packet_transport as r_packet_transport
import tardis.transport.r_packet_transport as r_packet_transport
from tardis.montecarlo.montecarlo_numba.estimators import update_line_estimators
import tardis.montecarlo.montecarlo_numba.utils as utils

Expand Down
2 changes: 1 addition & 1 deletion tardis/montecarlo/montecarlo_numba/tests/test_vpacket.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from tardis import constants as const
from tardis.montecarlo.montecarlo_numba import macro_atom

from tardis.montecarlo.montecarlo_numba.frame_transformations import (
from tardis.transport.frame_transformations import (
get_doppler_factor,
)

Expand Down
4 changes: 2 additions & 2 deletions tardis/montecarlo/montecarlo_numba/vpacket.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
from tardis.montecarlo.montecarlo_numba.r_packet import (
PacketStatus,
)
from tardis.montecarlo.montecarlo_numba.r_packet_transport import (
from tardis.transport.r_packet_transport import (
move_packet_across_shell_boundary,
)

Expand All @@ -22,7 +22,7 @@
calculate_distance_line,
)

from tardis.montecarlo.montecarlo_numba.frame_transformations import (
from tardis.transport.frame_transformations import (
get_doppler_factor,
angle_aberration_LF_to_CMF,
angle_aberration_CMF_to_LF,
Expand Down
4 changes: 2 additions & 2 deletions tardis/montecarlo/tests/test_montecarlo.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,15 @@
import pandas as pd
import tardis.montecarlo.montecarlo_numba.formal_integral as formal_integral
import tardis.montecarlo.montecarlo_numba.r_packet as r_packet
import tardis.montecarlo.montecarlo_numba.r_packet_transport as r_packet_transport
import tardis.transport.r_packet_transport as r_packet_transport
import tardis.montecarlo.montecarlo_numba.utils as utils
import tardis.montecarlo.montecarlo_configuration as mc
from tardis import constants as const
from tardis.montecarlo.montecarlo_numba.numba_interface import Estimators
from tardis.montecarlo.montecarlo_numba.numba_interface import RPacketTracker


from tardis.montecarlo.montecarlo_numba.frame_transformations import (
from tardis.transport.frame_transformations import (
get_doppler_factor,
angle_aberration_LF_to_CMF,
angle_aberration_CMF_to_LF,
Expand Down
0 ...montecarlo_numba/frame_transformations.py → tardis/transport/frame_transformations.py
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...lo/montecarlo_numba/r_packet_transport.py → tardis/transport/r_packet_transport.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
update_line_estimators,
set_estimators,
)
from tardis.montecarlo.montecarlo_numba.frame_transformations import (
from tardis.transport.frame_transformations import (
get_doppler_factor,
)
from tardis.montecarlo.montecarlo_numba.numba_config import (
Expand Down Expand Up @@ -71,7 +71,7 @@ def trace_packet(r_packet, numba_model, numba_plasma, estimators):
)
comov_nu = r_packet.nu * doppler_factor

cur_line_id = start_line_id # initializing varibale for Numba
cur_line_id = start_line_id # initializing variable for Numba
# - do not remove
last_line_id = len(numba_plasma.line_list_nu) - 1

Expand Down