fix

AllenInstitute · Sep 11, 2024 · 159c543 · 159c543
1 parent 0b9c242
commit 159c543
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/bmtk/simulator/bionet/modules/iclamp.py b/bmtk/simulator/bionet/modules/iclamp.py
@@ -133,17 +133,9 @@ def __init__(self, input_type, **mod_args):
     def initialize(self, sim):
         # Get select node gids, but only for those nodes that are on the current rank (if running on multiple cores)
         select_gids = list(sim.net.get_node_set(self._node_set).gids())
-<<<<<<< HEAD
-<<<<<<< HEAD
         gids_on_rank = list(set(select_gids) & set(sim.local_gids))
-=======
         local_gids = sim.net.get_local_cells()
         gids_on_rank = list(set(select_gids) & set(local_gids))
->>>>>>> 0e3fef4e (mpi iclamp fix)
-=======
-        local_gids = sim.net.get_local_cells()
-        gids_on_rank = list(set(select_gids) & set(local_gids))
->>>>>>> 0e3fef4e7f387887f3746728ad202aa35d57ebac
 
         for gid in gids_on_rank:           
             cell = sim.net.get_cell_gid(gid)