Merge pull request #1250 from GRIDAPPSD/releases/2020.03.0

Release of version 2020.03.0
GRIDAPPSD · Apr 6, 2020 · 000f4c7 · 000f4c7
2 parents 627b01e + 8baa6dd
commit 000f4c7
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 19 deletions.
diff --git a/....goss.gridappsd/src/gov/pnnl/goss/gridappsd/configuration/DSSAllConfigurationHandler.java b/....goss.gridappsd/src/gov/pnnl/goss/gridappsd/configuration/DSSAllConfigurationHandler.java
@@ -161,7 +161,7 @@ public void generateConfig(Properties parameters, PrintWriter out, String proces
 		double loadScale = GridAppsDConstants.getDoubleProperty(parameters, LOADSCALINGFACTOR, 1);
 
 		String scheduleName = GridAppsDConstants.getStringProperty(parameters, SCHEDULENAME, null);
-		if(scheduleName!=null){
+		if(scheduleName!=null && scheduleName.trim().length()>0){
 			bWantSched = true;
 		}
 		String directory = GridAppsDConstants.getStringProperty(parameters, DIRECTORY, null);

diff --git a/...goss.gridappsd/src/gov/pnnl/goss/gridappsd/configuration/DSSBaseConfigurationHandler.java b/...goss.gridappsd/src/gov/pnnl/goss/gridappsd/configuration/DSSBaseConfigurationHandler.java
@@ -169,7 +169,7 @@ public void generateConfig(Properties parameters, PrintWriter out, String proces
 		double loadScale = GridAppsDConstants.getDoubleProperty(parameters, LOADSCALINGFACTOR, 0);
 
 		String scheduleName = GridAppsDConstants.getStringProperty(parameters, SCHEDULENAME, null);
-		if(scheduleName!=null){
+		if(scheduleName!=null && scheduleName.trim().length()>0){
 			bWantSched = true;
 		}
 

diff --git a/....goss.gridappsd/src/gov/pnnl/goss/gridappsd/configuration/GLDAllConfigurationHandler.java b/....goss.gridappsd/src/gov/pnnl/goss/gridappsd/configuration/GLDAllConfigurationHandler.java
@@ -177,7 +177,7 @@ public void generateConfig(Properties parameters, PrintWriter out, String proces
 		double loadScale = GridAppsDConstants.getDoubleProperty(parameters, LOADSCALINGFACTOR, 1);
 
 		String scheduleName = GridAppsDConstants.getStringProperty(parameters, SCHEDULENAME, null);
-		if(scheduleName!=null){
+		if(scheduleName!=null && scheduleName.trim().length()>0){
 			bWantSched = true;
 		}
 		String directory = GridAppsDConstants.getStringProperty(parameters, DIRECTORY, null);

diff --git a/...goss.gridappsd/src/gov/pnnl/goss/gridappsd/configuration/GLDBaseConfigurationHandler.java b/...goss.gridappsd/src/gov/pnnl/goss/gridappsd/configuration/GLDBaseConfigurationHandler.java
@@ -156,7 +156,7 @@ public void generateConfig(Properties parameters, PrintWriter out, String proces
 		double loadScale = GridAppsDConstants.getDoubleProperty(parameters, LOADSCALINGFACTOR, 1);
 
 		String scheduleName = GridAppsDConstants.getStringProperty(parameters, SCHEDULENAME, null);
-		if(scheduleName!=null){
+		if(scheduleName!=null && scheduleName.trim().length()>0){
 			bWantSched = true;
 		}
 

diff --git a/gov.pnnl.goss.gridappsd/src/gov/pnnl/goss/gridappsd/process/ProcessNewSimulationRequest.java b/gov.pnnl.goss.gridappsd/src/gov/pnnl/goss/gridappsd/process/ProcessNewSimulationRequest.java
@@ -376,7 +376,11 @@ Properties generateSimulationParameters(RequestSimulation requestSimulation){
 		params.put(GLDAllConfigurationHandler.RANDOMIZEFRACTIONS, modelConfig.randomize_zipload_fractions);
 		params.put(GLDAllConfigurationHandler.USEHOUSES, modelConfig.use_houses);
 
-		params.put(GLDAllConfigurationHandler.SCHEDULENAME, modelConfig.schedule_name);
+		if(modelConfig.schedule_name!=null){
+			params.put(GLDAllConfigurationHandler.SCHEDULENAME, modelConfig.schedule_name);
+		} else {
+			 params.put(GLDAllConfigurationHandler.SCHEDULENAME, "");
+		}
 		params.put(GLDAllConfigurationHandler.SIMULATIONNAME, requestSimulation.getSimulation_config().simulation_name);
 		params.put(GLDAllConfigurationHandler.SOLVERMETHOD, requestSimulation.getSimulation_config().power_flow_solver_method);
 

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
@@ -87,21 +87,21 @@ public void run() {
         SimulationTracker isFinished = new SimulationTracker();
         try{
 
-        	File simulationFile = new File(simContext.getStartupFile());
-
-            if(simulationConfig!=null && simulationConfig.model_creation_config!=null && simulationConfig.model_creation_config.schedule_name!=null && simulationConfig.model_creation_config.schedule_name.trim().length()>0){
-                File serviceDir = serviceManager.getServiceConfigDirectory();
-                /*try{
-                    RunCommandLine.runCommand("cp "+serviceDir.getAbsolutePath()+File.separator+"etc"+File.separator+"zipload_schedule.player "+simulationFile.getParentFile().getAbsolutePath()+File.separator+simulationConfig.model_creation_config.schedule_name+".player");
-                }catch(Exception e){
-                    log.warn("Could not copy player file to working directory");
-                }*/
-                try{
-                    RunCommandLine.runCommand("cp "+serviceDir.getAbsolutePath()+File.separator+"etc"+File.separator+"appliance_schedules.glm "+simulationFile.getParentFile().getAbsolutePath()+File.separator+GLDAllConfigurationHandler.SCHEDULES_FILENAME);
-                }catch(Exception e){
-                    log.warn("Could not copy schedules file to working directory");
-                }
+            File simulationFile = new File(simContext.getStartupFile());
+
+            //if(simulationConfig!=null && simulationConfig.model_creation_config!=null && simulationConfig.model_creation_config.schedule_name!=null && simulationConfig.model_creation_config.schedule_name.trim().length()>0){
+            File serviceDir = serviceManager.getServiceConfigDirectory();
+            /*try{
+                RunCommandLine.runCommand("cp "+serviceDir.getAbsolutePath()+File.separator+"etc"+File.separator+"zipload_schedule.player "+simulationFile.getParentFile().getAbsolutePath()+File.separator+simulationConfig.model_creation_config.schedule_name+".player");
+            }catch(Exception e){
+               log.warn("Could not copy player file to working directory");
+            }*/
+            try{
+                RunCommandLine.runCommand("cp "+serviceDir.getAbsolutePath()+File.separator+"etc"+File.separator+"appliance_schedules.glm "+simulationFile.getParentFile().getAbsolutePath()+File.separator+GLDAllConfigurationHandler.SCHEDULES_FILENAME);
+            }catch(Exception e){
+                log.warn("Could not copy schedules file to working directory");
             }
+            //}
 
             //Start GridLAB-D
             logManager.log(new LogMessage(this.getClass().getSimpleName(),