Skip to content

Commit f66511a

Browse files
committed
Fix bug when populating element_idx for >2 iters
1 parent 47e91c5 commit f66511a

File tree

1 file changed

+13
-8
lines changed

1 file changed

+13
-8
lines changed

matflow/models/construction.py

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1294,18 +1294,23 @@ def get_element_idx(task_lst, dep_idx, num_iterations, iterate):
12941294

12951295
element_idx.append(elem_idx_i)
12961296

1297-
# Add iterations:
1298-
for task_idx, elem_idx_i in enumerate(element_idx):
1297+
# First iteration is in place, add additional iterations (if they exist for this
1298+
# task):
1299+
max_num_iter = max([i['num_iterations'] for i in element_idx])
1300+
for iter_idx in range(1, max_num_iter):
12991301

1300-
num_iterations_i = elem_idx_i['num_iterations']
1302+
# print(f'Adding elements for iteration {iter_idx}')
13011303

1302-
# print(f'Considering task {task_idx}, with num_iterations_i: {num_iterations_i}')
1304+
# Add iterations:
1305+
for task_idx, elem_idx_i in enumerate(element_idx):
13031306

1304-
# First iteration is in place, add additional iterations (if they exist for this
1305-
# task):
1306-
for iter_idx in range(1, num_iterations_i):
1307+
num_iterations_i = elem_idx_i['num_iterations']
13071308

1308-
# print(f'\tAdding elements for iteration {iter_idx}')
1309+
if iter_idx >= num_iterations_i:
1310+
continue
1311+
1312+
# print(f'\tConsidering task {task_idx}, with num_iterations_i: '
1313+
# f'{num_iterations_i}')
13091314

13101315
elem_iter_idx = np.array(elem_idx_i['iteration_idx'])
13111316
elems_per_iter = elem_idx_i['num_elements_per_iteration']

0 commit comments

Comments
 (0)