Skip to content

Commit

Permalink
fix pyflake errors
Browse files Browse the repository at this point in the history
  • Loading branch information
BrianMarre committed Nov 28, 2022
1 parent 773f3a3 commit 29605f0
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 20 deletions.
32 changes: 22 additions & 10 deletions lib/python/picongpu/picmi/grid.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,26 +59,35 @@ def get_as_pypicongpu(self):
"periodic": grid.BoundaryCondition.PERIODIC,
}

assert self.lower_boundary_conditions[0] in picongpu_boundary_condition_by_picmi_id, \
assert self.lower_boundary_conditions[0] in \
picongpu_boundary_condition_by_picmi_id, \
"X: boundary condition not supported"
assert self.lower_boundary_conditions[1] in picongpu_boundary_condition_by_picmi_id, \
assert self.lower_boundary_conditions[1] in \
picongpu_boundary_condition_by_picmi_id, \
"Y: boundary condition not supported"
assert self.lower_boundary_conditions[2] in picongpu_boundary_condition_by_picmi_id, \
assert self.lower_boundary_conditions[2] in \
picongpu_boundary_condition_by_picmi_id, \
"Z: boundary condition not supported"

g = grid.Grid3D()
g.cell_size_x_si = (self.upper_bound[0] - self.lower_bound[0]) / self.number_of_cells[0]
g.cell_size_y_si = (self.upper_bound[1] - self.lower_bound[1]) / self.number_of_cells[1]
g.cell_size_z_si = (self.upper_bound[2] - self.lower_bound[2]) / self.number_of_cells[2]
g.cell_size_x_si = (self.upper_bound[0] - self.lower_bound[0]) \
/ self.number_of_cells[0]
g.cell_size_y_si = (self.upper_bound[1] - self.lower_bound[1]) \
/ self.number_of_cells[1]
g.cell_size_z_si = (self.upper_bound[2] - self.lower_bound[2]) \
/ self.number_of_cells[2]
g.cell_cnt_x = self.number_of_cells[0]
g.cell_cnt_y = self.number_of_cells[1]
g.cell_cnt_z = self.number_of_cells[2]
g.boundary_condition_x = \
picongpu_boundary_condition_by_picmi_id[self.lower_boundary_conditions[0]]
picongpu_boundary_condition_by_picmi_id[
self.lower_boundary_conditions[0]]
g.boundary_condition_y = \
picongpu_boundary_condition_by_picmi_id[self.lower_boundary_conditions[1]]
picongpu_boundary_condition_by_picmi_id[
self.lower_boundary_conditions[1]]
g.boundary_condition_z = \
picongpu_boundary_condition_by_picmi_id[self.lower_boundary_conditions[2]]
picongpu_boundary_condition_by_picmi_id[
self.lower_boundary_conditions[2]]

# gpu distribution
# convert input to 3 integer list
Expand All @@ -100,7 +109,10 @@ def get_as_pypicongpu(self):
# check if gpu distribution fits grid
# TODO: super_cell_size still hard coded
super_cell_size = [8, 8, 4]
cells = [self.number_of_cells[0], self.number_of_cells[1], self.number_of_cells[2]]
cells = [
self.number_of_cells[0],
self.number_of_cells[1],
self.number_of_cells[2]]
dim_name = ["x", "y", "z"]
for dim in range(3):
assert (((cells[dim] // g.n_gpus[dim]) // super_cell_size[dim])
Expand Down
15 changes: 9 additions & 6 deletions lib/python/picongpu/picmi/simulation.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,15 @@ def __yee_compute_cfl_or_delta_t(self) -> None:
assert "Yee" == self.solver.method
assert isinstance(self.solver.grid, Cartesian3DGrid)

delta_x = (self.solver.grid.upper_bound[0] - self.solver.grid.lower_bound[0]) \
/ self.solver.grid.number_of_cells[0]
delta_y = (self.solver.grid.upper_bound[1] - self.solver.grid.lower_bound[1]) \
/ self.solver.grid.number_of_cells[1]
delta_z = (self.solver.grid.upper_bound[2] - self.solver.grid.lower_bound[2]) \
/ self.solver.grid.number_of_cells[2]
delta_x = (self.solver.grid.upper_bound[0]
- self.solver.grid.lower_bound[0]) \
/ self.solver.grid.number_of_cells[0]
delta_y = (self.solver.grid.upper_bound[1]
- self.solver.grid.lower_bound[1]) \
/ self.solver.grid.number_of_cells[1]
delta_z = (self.solver.grid.upper_bound[2]
- self.solver.grid.lower_bound[2]) \
/ self.solver.grid.number_of_cells[2]

if self.time_step_size is not None and \
self.solver.cfl is not None:
Expand Down
2 changes: 1 addition & 1 deletion test/python/picongpu/compiling/species.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ def setUp(self):
laser = picmi.GaussianLaser(0.8e-6, 5.0e-6 / 1.17741, 5.0e-15,
a0=8,
propagation_direction=[0, 1, 0],
polarization_Driection=[1, 0, 0],
polarization_direction=[1, 0, 0],
centroid_position=[
0.5*grid.upper_bound[0],
0,
Expand Down
6 changes: 3 additions & 3 deletions test/python/picongpu/quick/picmi/gaussian_laser.py
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ def test_minimal(self):
focal_position=[0, 0, 0],
centroid_position=[0, 0, 0],
propagation_direction=[0, 1, 0],
polarization_direction=[1,0,0],
polarization_direction=[1, 0, 0],
E0=1)
pypic_laser = picmi_laser.get_as_pypicongpu()
self.assertNotEqual({}, pypic_laser.get_rendering_context())
Expand Down Expand Up @@ -231,7 +231,7 @@ def test_laguerre_modes_optional(self):
centroid_position=[0, 0, 0],
E0=5,
propagation_direction=[0, 1, 0],
polarization_direction=[1 ,0, 0])
polarization_direction=[1, 0, 0])
pypic_laser = picmi_laser.get_as_pypicongpu()
self.assertEqual([1.0], pypic_laser.laguerre_modes)
self.assertEqual([0.0], pypic_laser.laguerre_phases)
Expand All @@ -245,7 +245,7 @@ def test_laguerre_modes_optional(self):
centroid_position=[0, 0, 0],
E0=5,
propagation_direction=[0, 1, 0],
polarization_direction=[1 ,0, 0],
polarization_direction=[1, 0, 0],
picongpu_laguerre_modes=None,
picongpu_laguerre_phases=None)
pypic_laser = picmi_laser.get_as_pypicongpu()
Expand Down

0 comments on commit 29605f0

Please sign in to comment.