Skip to content

Commit 433542c

Browse files
authored
Merge pull request #1676 from GRIDAPPSD/releases/2022.10.0
Release of version 2022.10.0
2 parents a0e168c + f1e0c39 commit 433542c

File tree

2 files changed

+15
-3
lines changed

2 files changed

+15
-3
lines changed

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

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,8 @@ public class GLDAllConfigurationHandler extends BaseConfigurationHandler impleme
133133
public static final String SIMULATOR = "simulator";
134134
public static final String SEPARATED_LOADS_FILE = "separated_loads_file";
135135
public static final int TIMEFILTER_YEAR = 2013;
136+
public static final String RUN_REALTIME = "run_realtime";
137+
public static final String TIMESTEP = "timestep";
136138

137139
// public static final String CONFIGTARGET = "glm";
138140
public static final String CONFIGTARGET = "both"; //will build files for both glm and dss
@@ -387,7 +389,9 @@ protected void generateStartupFile(Properties parameters, String tempDataPath, P
387389
throw new Exception("Missing parameter "+SIMULATIONID);
388390
}
389391
String scheduleName = GridAppsDConstants.getStringProperty(parameters, SCHEDULENAME, null);
390-
392+
393+
boolean run_realtime = GridAppsDConstants.getBooleanProperty(parameters, RUN_REALTIME, true);
394+
391395
double nominalv = 0;
392396

393397
try{
@@ -460,7 +464,10 @@ protected void generateStartupFile(Properties parameters, String tempDataPath, P
460464
startupFileWriter.println(" name "+simulationID+";");
461465
if(simulator.equalsIgnoreCase("gridlab-d"))
462466
startupFileWriter.println(" message_type JSON;");
463-
startupFileWriter.println(" publish_period 3;");
467+
if(run_realtime)
468+
startupFileWriter.println(" publish_period 3;");
469+
else
470+
startupFileWriter.println(" publish_period 60;");
464471
startupFileWriter.println(" configure model_outputs.json;");
465472
startupFileWriter.println("}");
466473

@@ -477,7 +484,10 @@ protected void generateStartupFile(Properties parameters, String tempDataPath, P
477484
startupFileWriter.println(" parent "+simulationID+";");
478485
startupFileWriter.println(" property message_type;");
479486
startupFileWriter.println(" file "+simulationID+".csv;");
480-
startupFileWriter.println(" interval 1;");
487+
if(run_realtime)
488+
startupFileWriter.println(" interval 1;");
489+
else
490+
startupFileWriter.println(" interval 60;");
481491
startupFileWriter.println("}");
482492
/*startupFileWriter.println("object multi_recorder {");
483493
startupFileWriter.println(" parent "+simulationName+";");

gov.pnnl.goss.gridappsd/src/gov/pnnl/goss/gridappsd/process/ProcessNewSimulationRequest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -389,6 +389,8 @@ Properties generateSimulationParameters(RequestSimulation requestSimulation){
389389
}
390390

391391
params.put(GLDAllConfigurationHandler.SIMULATOR, requestSimulation.getSimulation_config().getSimulator());
392+
params.put(GLDAllConfigurationHandler.RUN_REALTIME, requestSimulation.getSimulation_config().run_realtime);
393+
392394
if(modelConfig.separated_loads_file!=null){
393395
params.put(GLDAllConfigurationHandler.SEPARATED_LOADS_FILE, modelConfig.separated_loads_file);
394396
} else {

0 commit comments

Comments
 (0)