Merge c712c24 into b67bcd3

tardis-sn · Jun 20, 2022 · 967aef9 · 967aef9
2 parents b67bcd3 + c712c24
commit 967aef9
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 4 deletions.
diff --git a/.mailmap b/.mailmap
@@ -141,6 +141,8 @@ Nathan Kowalski <[email protected]>
 
 Nilesh Patra <[email protected]>
 
+Nolan Brown <[email protected]>
+
 Pratik Patel <[email protected]>
 Pratik Patel <[email protected]> Pratik151 <[email protected]>
 

diff --git a/tardis/montecarlo/montecarlo_numba/continuum/r_packet_transport_continuum.py b/tardis/montecarlo/montecarlo_numba/continuum/r_packet_transport_continuum.py
@@ -3,7 +3,7 @@
 
 from tardis.montecarlo import montecarlo_configuration
 from tardis.montecarlo.montecarlo_numba import njit_dict_no_parallel
-from tardis.montecarlo.montecarlo_numba.calculate_distances import (
+from tardis.transport.calculate_distances import (
     calculate_distance_boundary,
     calculate_distance_line,
 )

diff --git a/tardis/montecarlo/montecarlo_numba/r_packet_transport.py b/tardis/montecarlo/montecarlo_numba/r_packet_transport.py
@@ -3,7 +3,7 @@
 
 from tardis.montecarlo import montecarlo_configuration
 from tardis.montecarlo.montecarlo_numba import njit_dict_no_parallel
-from tardis.montecarlo.montecarlo_numba.calculate_distances import (
+from tardis.transport.calculate_distances import (
     calculate_distance_boundary,
     calculate_distance_electron,
     calculate_distance_line,

diff --git a/tardis/montecarlo/montecarlo_numba/tests/test_packet.py b/tardis/montecarlo/montecarlo_numba/tests/test_packet.py
@@ -2,7 +2,7 @@
 import numpy as np
 
 import tardis.montecarlo.montecarlo_numba.r_packet as r_packet
-import tardis.montecarlo.montecarlo_numba.calculate_distances as calculate_distances
+import tardis.transport.calculate_distances as calculate_distances
 import tardis.montecarlo.montecarlo_numba.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

diff --git a/tardis/montecarlo/montecarlo_numba/vpacket.py b/tardis/montecarlo/montecarlo_numba/vpacket.py
@@ -17,7 +17,7 @@
     move_packet_across_shell_boundary,
 )
 
-from tardis.montecarlo.montecarlo_numba.calculate_distances import (
+from tardis.transport.calculate_distances import (
     calculate_distance_boundary,
     calculate_distance_line,
 )

diff --git a/...o/montecarlo_numba/calculate_distances.py → tardis/transport/calculate_distances.py b/...o/montecarlo_numba/calculate_distances.py → tardis/transport/calculate_distances.py