Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

## latest

- Fixed naming of variables tracking active simulations in the `MicroManager` [#273](https://github.com/precice/micro-manager/pull/273)
- Improved load balancing of inactive simulations by tracking a small amount of time [#272](https://github.com/precice/micro-manager/pull/272)
- Added the exported field `model_resolution` when using model adaptivity [#271](https://github.com/precice/micro-manager/pull/271)
- Fixed model adaptivity active simulation mask generation for 0 local simulations [#270](https://github.com/precice/micro-manager/pull/270)
Expand Down
17 changes: 10 additions & 7 deletions micro_manager/micro_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -212,8 +212,11 @@ def solve(self) -> None:
# Write a checkpoint if a simulation is just activated.
# This checkpoint will be asynchronous to the checkpoints written at the start of the time window.
if self._is_model_adaptivity_on:
active_sim_lids = (
self._adaptivity_controller.get_active_sim_local_ids()
)
self._model_adaptivity_controller.update_states(
self._micro_sims, active_sim_gids
self._micro_sims, active_sim_lids
)
for i in range(self._local_number_of_sims):
if sim_states_cp[i] is None and self._micro_sims[i]:
Expand Down Expand Up @@ -244,13 +247,13 @@ def solve(self) -> None:
# Write a checkpoint
if self._participant.requires_writing_checkpoint() or performed_lb:
if self._is_model_adaptivity_on:
active_sim_gids = None
active_sim_lids = None
if self._is_adaptivity_on:
active_sim_gids = (
active_sim_lids = (
self._adaptivity_controller.get_active_sim_local_ids()
)
self._model_adaptivity_controller.update_states(
self._micro_sims, active_sim_gids
self._micro_sims, active_sim_lids
)
for i in range(self._local_number_of_sims):
sim_states_cp[i] = (
Expand Down Expand Up @@ -308,13 +311,13 @@ def solve(self) -> None:
self.state_setter(self._micro_sims[i], sim_states_cp[i])

if self._is_model_adaptivity_on:
active_sim_gids = None
active_sim_lids = None
if self._is_adaptivity_on:
active_sim_gids = (
active_sim_lids = (
self._adaptivity_controller.get_active_sim_local_ids()
)
self._model_adaptivity_controller.write_back_states(
self._micro_sims, active_sim_gids
self._micro_sims, active_sim_lids
)

first_iteration = False
Expand Down
Loading