Skip to content
Merged
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
42 changes: 34 additions & 8 deletions gridappsd-field-bus-lib/gridappsd/field_interface/agents/agents.py
Original file line number Diff line number Diff line change
Expand Up @@ -229,9 +229,19 @@ def __init__(self,
self).__init__(upstream_message_bus_def,
downstream_message_bus_def, agent_config,
feeder_dict, simulation_id)

self.feeder_area = None
self.downstream_message_bus_def = downstream_message_bus_def
if self.agent_area_dict is not None:
feeder = cim.Feeder(mRID=downstream_message_bus_def.id)
feeder = cim.Feeder(mRID=self.downstream_message_bus_def.id)
self.feeder_area = DistributedModel(connection=self.connection,
feeder=feeder,
topology=self.agent_area_dict)


def connect(self):
super().connect()
if self.feeder_area is None:
feeder = cim.Feeder(mRID=self.downstream_message_bus_def.id)
self.feeder_area = DistributedModel(connection=self.connection,
feeder=feeder,
topology=self.agent_area_dict)
Expand All @@ -245,12 +255,20 @@ def __init__(self,
agent_config: Dict,
switch_area_dict=None,
simulation_id=None):

super().__init__(upstream_message_bus_def, downstream_message_bus_def,
agent_config, switch_area_dict, simulation_id)

self.switch_area = None
self.downstream_message_bus_def = downstream_message_bus_def
if self.agent_area_dict is not None:
self.switch_area = SwitchArea(downstream_message_bus_def.id,
self.switch_area = SwitchArea(self.downstream_message_bus_def.id,
self.connection)
self.switch_area.initialize_switch_area(self.agent_area_dict)


def connect(self):
super().connect()
if self.switch_area is None:
self.switch_area = SwitchArea(self.downstream_message_bus_def.id,
self.connection)
self.switch_area.initialize_switch_area(self.agent_area_dict)

Expand All @@ -263,12 +281,20 @@ def __init__(self,
agent_config: Dict,
secondary_area_dict=None,
simulation_id=None):

super().__init__(upstream_message_bus_def, downstream_message_bus_def,
agent_config, secondary_area_dict, simulation_id)

self.secondary_area = None
self.downstream_message_bus_def = downstream_message_bus_def
if self.agent_area_dict is not None:
self.secondary_area = SecondaryArea(downstream_message_bus_def.id,
self.secondary_area = SecondaryArea(self.downstream_message_bus_def.id,
self.connection)
self.secondary_area.initialize_secondary_area(self.agent_area_dict)


def connect(self):
super().connect()
if self.secondary_area is None:
self.secondary_area = SecondaryArea(self.downstream_message_bus_def.id,
self.connection)
self.secondary_area.initialize_secondary_area(self.agent_area_dict)

Expand Down