Skip to content

Clean end simulation. #9

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

Merged
merged 2 commits into from
Jul 10, 2019
Merged

Clean end simulation. #9

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2248fe3
Merge branch 'develop'
giadarol Apr 5, 2019
4ede264
Clean end simulation
lmether Jul 10, 2019
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
15 changes: 11 additions & 4 deletions ring_of_CPUs_multiturn.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,9 @@ def __init__(self, sim_content, N_pieces_per_transfer=1, force_serial = False, c

if hasattr(sim_content, 'N_parellel_rings'):
self.N_parellel_rings = sim_content.N_parellel_rings

if int(np.mod(self.N_turns, self.N_parellel_rings)) != 0.:
raise ValueError('Sorry! N_turns needs to be a multiple of N_parellel_rings!')

if hasattr(sim_content, 'verbose'):
self.verbose = sim_content.verbose
Expand Down Expand Up @@ -222,11 +225,15 @@ def run(self):

self.sim_content.perform_bunch_operations_at_start_ring(next_bunch)

if next_bunch.slice_info['i_bunch'] == next_bunch.slice_info['N_bunches_tot_beam']-1:
if int(next_bunch.slice_info['i_turn']) >= self.N_turns:
orders_from_master.append('stop')
if self.I_am_a_worker:
raise ValueError('I cannot give orders to anybody :-(')

next_bunch.slice_info['i_turn']+=1
self.slices_to_be_treated = self.sim_content.slice_bunch_at_start_ring(next_bunch)

if next_bunch.slice_info['i_turn'] > self.N_turns:
orders_from_master.append('stop')
if next_bunch.slice_info['i_turn'] <= self.N_turns:
self.slices_to_be_treated = self.sim_content.slice_bunch_at_start_ring(next_bunch)

# Pop slices
slice_group = []
Expand Down