Skip to content

Commit d24d969

Browse files
committed
moved power_flow_solver_method key from the simulation_config object to simulator_config object; simulation seems to work just fine
1 parent 0ca5fe3 commit d24d969

4 files changed

Lines changed: 37 additions & 32 deletions

File tree

client/src/app/common/simulation/SimulationConfiguration.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ interface PowerSystemConfig {
4545
simulator_config: {
4646
simulator: string;
4747
simulation_output: object;
48+
power_flow_solver_method: string;
4849
model_creation_config: {
4950
load_scaling_factor: string;
5051
schedule_name: string;
@@ -72,7 +73,6 @@ export interface SimulationConfiguration {
7273
timestep_frequency: string;
7374
timestep_increment: string;
7475
simulation_name: string;
75-
power_flow_solver_method: string;
7676
};
7777
application_config: {
7878
applications: Array<{ name: string; config_string: string }>;
@@ -81,5 +81,6 @@ export interface SimulationConfiguration {
8181
test_config: {
8282
events: Array<any>;
8383
appId: string;
84+
compareWithSimId?: number;
8485
};
8586
}

client/src/app/common/simulation/default-simulation-configuration.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ export const DEFAULT_SIMULATION_CONFIGURATION: SimulationConfiguration = {
4545
simulator_config: {
4646
simulator: 'GridLAB-D',
4747
simulation_output: {},
48+
power_flow_solver_method: 'NR',
4849
model_creation_config: {
4950
load_scaling_factor: '1.0',
5051
schedule_name: 'ieeezipload',
@@ -70,7 +71,6 @@ export const DEFAULT_SIMULATION_CONFIGURATION: SimulationConfiguration = {
7071
timestep_increment: '1000',
7172
run_realtime: true,
7273
simulation_name: '',
73-
power_flow_solver_method: 'NR'
7474
},
7575
application_config: {
7676
applications: []

client/src/app/expected-result-comparison/models/SimulationVsExpectedRequest.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ export class SimulationVsExpectedRequest implements MessageRequest {
1515
simulator_config: {
1616
simulation_output: {},
1717
simulator: 'GridLAB-D',
18+
power_flow_solver_method: 'NR',
1819
model_creation_config: {
1920
load_scaling_factor: '1.0',
2021
schedule_name: 'ieeezipload',
@@ -34,7 +35,6 @@ export class SimulationVsExpectedRequest implements MessageRequest {
3435
}
3536
],
3637
simulation_config: {
37-
power_flow_solver_method: 'NR',
3838
duration: '60',
3939
simulation_name: 'ieee123',
4040
start_time: '1248202800',

client/src/app/expected-result-comparison/models/SimulationVsTimeSeriesRequest.ts

Lines changed: 33 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -6,36 +6,40 @@ export class SimulationVsTimeSeriesRequest implements MessageRequest {
66
readonly url = 'goss.gridappsd.process.request.simulation';
77

88
readonly requestBody = {
9-
power_system_config: {
10-
SubGeographicalRegion_name: '_1CD7D2EE-3C91-3248-5662-A43EFEFAC224',
11-
GeographicalRegion_name: '_24809814-4EC6-29D2-B509-7F8BFB646437',
12-
Line_name: '_C1C3E687-6FFD-C753-582B-632A27E28507' // IEEE123
13-
},
9+
power_system_config: [
10+
{
11+
SubGeographicalRegion_name: '_1CD7D2EE-3C91-3248-5662-A43EFEFAC224',
12+
GeographicalRegion_name: '_24809814-4EC6-29D2-B509-7F8BFB646437',
13+
Line_name: '_C1C3E687-6FFD-C753-582B-632A27E28507', // IEEE123
14+
simulator_config: {
15+
simulator: 'GridLAB-D',
16+
power_flow_solver_method: 'NR',
17+
simulation_output: {},
18+
model_creation_config: {
19+
load_scaling_factor: '1.0',
20+
triplex: 'y',
21+
encoding: 'u',
22+
system_frequency: '60',
23+
voltage_multiplier: '1.0',
24+
power_unit_conversion: '1.0',
25+
unique_names: 'y',
26+
schedule_name: 'ieeezipload',
27+
z_fraction: '0.0',
28+
i_fraction: '1.0',
29+
p_fraction: '0.0',
30+
randomize_zipload_fractions: false,
31+
use_houses: false
32+
}
33+
}
34+
}
35+
],
1436
simulation_config: {
15-
power_flow_solver_method: 'NR',
16-
duration: 60,
17-
simulation_name: 'ieee123',
18-
simulator: 'GridLAB-D',
19-
start_time: 1248156000,
20-
run_realtime: true,
21-
simulation_output: {},
22-
model_creation_config: {
23-
load_scaling_factor: 1.0,
24-
triplex: 'y',
25-
encoding: 'u',
26-
system_frequency: 60,
27-
voltage_multiplier: 1.0,
28-
power_unit_conversion: 1.0,
29-
unique_names: 'y',
30-
schedule_name: 'ieeezipload',
31-
z_fraction: 0.0,
32-
i_fraction: 1.0,
33-
p_fraction: 0.0,
34-
randomize_zipload_fractions: false,
35-
use_houses: false
36-
},
37-
simulation_broker_port: 52798,
38-
simulation_broker_location: '127.0.0.1'
37+
start_time: '1248156000',
38+
duration: '60',
39+
simulation_broker_port: '52798',
40+
simulation_broker_location: '127.0.0.1',
41+
run_realtime: true,
42+
simulation_name: 'ieee123'
3943
},
4044
application_config: {
4145
applications: [

0 commit comments

Comments
 (0)