Merge pull request #1582 from GRIDAPPSD/releases/2021.11.0

Release of version 2021.11.0
GRIDAPPSD · Dec 7, 2021 · b6da691 · b6da691
2 parents 2ef505d + 2a8198f
commit b6da691
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/....goss.gridappsd/src/gov/pnnl/goss/gridappsd/configuration/GLDAllConfigurationHandler.java b/....goss.gridappsd/src/gov/pnnl/goss/gridappsd/configuration/GLDAllConfigurationHandler.java
@@ -468,7 +468,11 @@ protected void generateStartupFile(Properties parameters, String tempDataPath, P
 		startupFileWriter.println("     eventgen_object external_event_handler;");
 		startupFileWriter.println("     output_filename fault_check_output.txt;");
 		startupFileWriter.println("     strictly_radial FALSE;");
-		startupFileWriter.println("     grid_association TRUE;");
+		//TODO: Remove if condition and set grid_association to TRUE once issue with GridLAB-D is resolved
+		if(modelId.equals("_5DB4FA23-623B-4DBE-BA59-B99ECF44DABA"))
+			startupFileWriter.println("     grid_association FALSE;");
+		else
+			startupFileWriter.println("     grid_association TRUE;");
 		startupFileWriter.println("}");
 		startupFileWriter.println("object eventgen {");
 		startupFileWriter.println("     name external_event_handler;");

diff --git a/gov.pnnl.goss.gridappsd/src/gov/pnnl/goss/gridappsd/simulation/SimulationProcess.java b/gov.pnnl.goss.gridappsd/src/gov/pnnl/goss/gridappsd/simulation/SimulationProcess.java
@@ -187,7 +187,7 @@ else if(simulationConfig.getSimulator().equals(gridlabdConstant)){
 
             //Subscribe to fncs-goss-bridge output topic
             GossFncsResponseEvent gossFncsResponseEvent = new GossFncsResponseEvent(logManager, isInitialized, isFinished, simulationId);
-            client.subscribe(GridAppsDConstants.topic_COSIM_output, gossFncsResponseEvent);
+            client.subscribe("/topic/"+GridAppsDConstants.topic_COSIM_output, gossFncsResponseEvent);
 
             logManager.info(ProcessStatus.RUNNING, simulationId, "Checking if co-simulation is initialized, currently "+isInitialized.isInited);
 

diff --git a/services/helicsgossbridge/service/helics_goss_bridge.py b/services/helicsgossbridge/service/helics_goss_bridge.py
@@ -115,7 +115,7 @@ class HelicsGossBridge(object):
     _helics_configuration = {}
     _helics_federate = None
     _is_initialized = False
-    _simulation_manager_input_topic = 'goss.gridappsd.cosim.output'
+    _simulation_manager_input_topic = '/topic/goss.gridappsd.cosim.output'
     _simulation_command_queue = Queue()
     _start_simulation = False
     _filter_all_commands = False