Skip to content

Commit b6da691

Browse files
authored
Merge pull request #1582 from GRIDAPPSD/releases/2021.11.0
Release of version 2021.11.0
2 parents 2ef505d + 2a8198f commit b6da691

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

gov.pnnl.goss.gridappsd/src/gov/pnnl/goss/gridappsd/configuration/GLDAllConfigurationHandler.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -468,7 +468,11 @@ protected void generateStartupFile(Properties parameters, String tempDataPath, P
468468
startupFileWriter.println(" eventgen_object external_event_handler;");
469469
startupFileWriter.println(" output_filename fault_check_output.txt;");
470470
startupFileWriter.println(" strictly_radial FALSE;");
471-
startupFileWriter.println(" grid_association TRUE;");
471+
//TODO: Remove if condition and set grid_association to TRUE once issue with GridLAB-D is resolved
472+
if(modelId.equals("_5DB4FA23-623B-4DBE-BA59-B99ECF44DABA"))
473+
startupFileWriter.println(" grid_association FALSE;");
474+
else
475+
startupFileWriter.println(" grid_association TRUE;");
472476
startupFileWriter.println("}");
473477
startupFileWriter.println("object eventgen {");
474478
startupFileWriter.println(" name external_event_handler;");

gov.pnnl.goss.gridappsd/src/gov/pnnl/goss/gridappsd/simulation/SimulationProcess.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ else if(simulationConfig.getSimulator().equals(gridlabdConstant)){
187187

188188
//Subscribe to fncs-goss-bridge output topic
189189
GossFncsResponseEvent gossFncsResponseEvent = new GossFncsResponseEvent(logManager, isInitialized, isFinished, simulationId);
190-
client.subscribe(GridAppsDConstants.topic_COSIM_output, gossFncsResponseEvent);
190+
client.subscribe("/topic/"+GridAppsDConstants.topic_COSIM_output, gossFncsResponseEvent);
191191

192192
logManager.info(ProcessStatus.RUNNING, simulationId, "Checking if co-simulation is initialized, currently "+isInitialized.isInited);
193193

services/helicsgossbridge/service/helics_goss_bridge.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ class HelicsGossBridge(object):
115115
_helics_configuration = {}
116116
_helics_federate = None
117117
_is_initialized = False
118-
_simulation_manager_input_topic = 'goss.gridappsd.cosim.output'
118+
_simulation_manager_input_topic = '/topic/goss.gridappsd.cosim.output'
119119
_simulation_command_queue = Queue()
120120
_start_simulation = False
121121
_filter_all_commands = False

0 commit comments

Comments
 (0)