Merge pull request #1564 from GRIDAPPSD/releases/2021.09.0

Release of version 2021.09.0

Author: tonya1

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

@@ -433,14 +433,10 @@ protected void generateStartupFile(Properties parameters, String tempDataPath, P
 		if(GridAppsDConstants.GRIDLABD_INTERFACE_HELICS.equals(gldInterface)){
 			startupFileWriter.println("object helics_msg {");
 			startupFileWriter.println("      name "+simulationID+";");
-			if(simulator.equals("GridLAB-D")){
+			if(simulator.equalsIgnoreCase("gridlab-d"))
 				startupFileWriter.println("      message_type JSON;");
-				startupFileWriter.println("      configure model_outputs.json;");
-			}
-			else if(simulator.equals("OCHRE")){
-				startupFileWriter.println("      publish_period 3;");
-				startupFileWriter.println("      configure gld_helics_config.json;");
-			}
+			startupFileWriter.println("      publish_period 3;");
+			startupFileWriter.println("      configure model_outputs.json;");
 			startupFileWriter.println("}");
 
 		} else {

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

@@ -106,12 +106,20 @@ public class GLDSimulationOutputConfigurationHandler extends BaseConfigurationHa
 	public static final String SIMULATIONBROKERPORT = "simulation_broker_port";
 
 
-	public static final String HELICS_PREFIX = "{\"name\": \"PROCESS_ID\",\"log_level\": 3,"
-			+ "\"period\": 1.0,\"broker\": \"BROKER_LOCATION:BROKER_PORT\",\"endpoints\": [{\"name\": \"helics_input\","
-			+ "\"global\": false,\"type\": \"string\",	"
-			+ "\"info\": \"This is the endpoint which recieves CIM commands from the HELICS GOSS bridge.\"},"
-			+ "{\"name\": \"helics_output\",\"global\": false,\"type\": \"string\",	"
-			+ "\"destination\": \"HELICS_GOSS_Bridge_PROCESS_ID/helics_output\",	\"info\": \"";
+	public static final String HELICS_PREFIX = "{\"name\": \"PROCESS_ID\","
+											  + "\"log_level\": 3,"
+											  + "\"period\": 1.0,"
+											  + "\"broker\": \"BROKER_LOCATION:BROKER_PORT\","
+											  + "\"endpoints\": [{"
+											  + "				  \"name\": \"helics_input\","
+											  + "				  \"global\": false,\"type\": \"string\",	"
+											  + 				  "\"info\": \"This is the endpoint which recieves CIM commands from the HELICS GOSS bridge.\""
+											  + "				 },"
+											  + "				 {"
+											  + "				  \"name\": \"helics_output\","
+											  + "				  \"global\": false,"
+											  + "				  \"type\": \"string\",	"
+											  + "				  \"destination\": \"HELICS_GOSS_Bridge_PROCESS_ID/helics_output\",	\"info\": \"";
 	public static final String HELICS_SUFFIX = "\"}]}";
 
 	public GLDSimulationOutputConfigurationHandler() {

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

@@ -42,6 +42,7 @@
 import java.io.File;
 import java.io.FileWriter;
 import java.io.PrintWriter;
+import java.util.Date;
 import java.util.Properties;
 
 import org.apache.felix.dm.annotation.api.Component;
@@ -144,12 +145,13 @@ public void generateConfig(Properties parameters, PrintWriter out, String proces
 		if(model_id==null || model_id.trim().length()==0){
 			logManager.error(ProcessStatus.ERROR,processId,"No "+MODEL_ID+" parameter provided");
 			throw new Exception("Missing parameter "+MODEL_ID);
-		}				
+		}
 
 		try{
 			File tmpDir = new File(tempDataPath);
 			RunCommandLine.runCommand("cp -r /gridappsd/services/gridappsd-ochre/inputs/ "+tempDataPath);
 			RunCommandLine.runCommand("cp -r /gridappsd/services/gridappsd-ochre/agents/ "+tempDataPath);
+			
 			simulationBrokerHost = "localhost";
 
             RunCommandLine.runCommand("python /gridappsd/services/gridappsd-ochre/bin/make_config_file.py "+
@@ -167,8 +169,6 @@ public void generateConfig(Properties parameters, PrintWriter out, String proces
 					processId+" "+
 					model_id);
 
-			RunCommandLine.runCommand("cp "+tempDataPath+"/inputs/gridlabd/IEEE-13/gld_helics_config.json "+tempDataPath);
-
 		}catch(Exception e){
             log.warn("Could not create OCHRE HELICS config file");
         }

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

@@ -121,13 +121,8 @@ public void run() {
 
             	//Start gridlabd
 //				simulationContext.put("simulationFile",tempDataPathDir.getAbsolutePath()+File.separator+"model_startup.glm");
-	            //TODO: Change this hard coded startup files
-	            File gldStartupFile = null;
-	            RequestSimulation simRequest = (RequestSimulation)simContext.getRequest();
-	            if (simRequest.power_system_config.Line_name.contains("_13AD8E07-3BF9-A4E2-CB8F-C3722F837B62"))
-	            	gldStartupFile = new File(simContext.simulationDir+File.separator+"inputs"+File.separator+"gridlabd"+File.separator+"IEEE-13"+File.separator+"IEEE-13_Houses.glm");
-	            else
-	            	gldStartupFile = new File(simContext.getSimulationDir()+File.separator+"model_startup.glm");
+				//File gldStartupFile = new File(simContext.simulationDir+File.separator+"inputs"+File.separator+"gridlabd"+File.separator+"IEEE-13"+File.separator+"IEEE-13_Houses.glm");
+	            File gldStartupFile = new File(simContext.simulationDir+File.separator+"model_startup.glm");
 				String gldSimulatorPath = serviceManager.getService(gridlabdConstant).getExecution_path();
 //            	commands.add(simContext.getSimulatorPath());
 				commands.add(gldSimulatorPath);