freepaths 2.2.1__tar.gz → 2.2.2__tar.gz

{freepaths-2.2.1 → freepaths-2.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: freepaths
-Version: 2.2.1
+Version: 2.2.2
 Summary: Phonon Monte Carlo simulator
 Home-page: https://github.com/anufrievroman/freepaths
 Author: Roman Anufriev

{freepaths-2.2.1 → freepaths-2.2.2}/freepaths/__main__.py

@@ -6,7 +6,7 @@ from colorama import Fore, Style
 
 from freepaths.particle_types import ParticleType
 
-__version__ = "2.2.1"
+__version__ = "2.2.2"
 
 colorama.init()
 

{freepaths-2.2.1 → freepaths-2.2.2}/freepaths/run_particle.py

@@ -56,8 +56,6 @@ def run_particle(particle, flight, scatter_stats, places_stats, segment_stats, t
             flight.save_free_paths()
             flight.restart()
             particle.assign_internal_scattering_time(material)
-            if cf.is_two_dimensional_material:
-                particle.phi = 0.0
 
         # If hole scattering has occured, record it:
         if triangle_scattering_places.is_scattered:

{freepaths-2.2.1 → freepaths-2.2.2}/freepaths/scattering.py

@@ -12,12 +12,18 @@ from freepaths.move import move
 from freepaths.scattering_primitives import *
 
 
+def correction_for_two_dimensional_materials(pt):
+    """Bring phi back to zero if a scattering happened"""
+    if cf.is_two_dimensional_material:
+        pt.phi = 0.0
+
+
 def internal_scattering(pt, flight, scattering_types):
     """Check if the time passed since previous diffuse scattering event reached
     the time until an internal scattering event, and if yes, scatters randomly"""
     if flight.time_since_previous_scattering >= pt.time_of_internal_scattering:
         scattering_types.internal = random_scattering(pt)
-
+        correction_for_two_dimensional_materials(pt)
 
 def reinitialization(pt, scattering_types):
     """Re-thermalize (diffusely) particle when it comes back to one of the hot sides. Return true of particle was reinitialized"""
@@ -25,18 +31,22 @@ def reinitialization(pt, scattering_types):
 
     if cf.hot_side_position_bottom and y < 0:
         scattering_types.hot_side = horizontal_surface_up_scattering(pt, cf.side_wall_roughness, is_diffuse=True)
+        correction_for_two_dimensional_materials(pt)
         return True
 
     if cf.hot_side_position_top and y > cf.length:
         scattering_types.hot_side = horizontal_surface_down_scattering(pt, cf.side_wall_roughness, is_diffuse=True)
+        correction_for_two_dimensional_materials(pt)
         return True
 
     if cf.hot_side_position_right and x > cf.width / 2:
         scattering_types.hot_side = vertical_surface_left_scattering(pt, cf.side_wall_roughness, cf, is_diffuse=True)
+        correction_for_two_dimensional_materials(pt)
         return True
 
     if cf.hot_side_position_left and x < -cf.width / 2:
         scattering_types.hot_side = vertical_surface_right_scattering(pt, cf.side_wall_roughness, cf, is_diffuse=True)
+        correction_for_two_dimensional_materials(pt)
         return True
 
     return False
@@ -100,9 +110,13 @@ def surface_scattering(pt, scattering_types, triangle_scattering_places):
     # Preliminary move to see if particle would cross something:
     x, y, z = move(pt, cf.timestep)
 
-    # Scattering on top and bottom surfaces:
+    # Scattering on top surface:
     ceiling_scattering(pt, scattering_types, x, y, z)
+    correction_for_two_dimensional_materials(pt)
+
+    # Scattering on top surface:
     floor_scattering(pt, scattering_types, x, y, z)
+    correction_for_two_dimensional_materials(pt)
 
     # Scattering on sidewalls:
     if cf.include_right_sidewall:
@@ -113,6 +127,7 @@ def surface_scattering(pt, scattering_types, triangle_scattering_places):
         scattering_on_top_sidewall(pt, scattering_types, x, y, z)
     if cf.include_bottom_sidewall:
         scattering_on_bottom_sidewall(pt, scattering_types, x, y, z)
+    correction_for_two_dimensional_materials(pt)
 
     # Scattering on holes:
     if cf.holes:
@@ -120,6 +135,7 @@ def surface_scattering(pt, scattering_types, triangle_scattering_places):
         for hole in cf.holes:
             if hole.is_inside(x, y, z, cf):
                 hole.scatter(pt, scattering_types, x, y, z, cf)
+                correction_for_two_dimensional_materials(pt)
 
             # If there was any scattering, then no need to check rest of the holes:
             if scattering_types.holes is not None:
@@ -139,12 +155,14 @@ def surface_scattering(pt, scattering_types, triangle_scattering_places):
         for bulk in cf.bulks:
             if bulk.is_crossed(pt, x, y, z):
                 bulk.scatter(pt, scattering_types, x, y, z, cf)
+                correction_for_two_dimensional_materials(pt)
 
     # Scattering on interfaces (thin layers):
     if cf.interfaces:
         for interface in cf.interfaces:
             if interface.is_crossed(pt, x, y, z):
                 interface.scatter(pt, cf, scattering_types)
+                correction_for_two_dimensional_materials(pt)
 
             # If there was any scattering, then no need to check other interfaces:
             if scattering_types.interfaces is not None:

{freepaths-2.2.1 → freepaths-2.2.2}/freepaths.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: freepaths
-Version: 2.2.1
+Version: 2.2.2
 Summary: Phonon Monte Carlo simulator
 Home-page: https://github.com/anufrievroman/freepaths
 Author: Roman Anufriev