Skip to content

Commit

Permalink
Merge branch 'master' of github.com:dpinney/omf
Browse files Browse the repository at this point in the history
  • Loading branch information
ASC95 committed Mar 5, 2024
2 parents f68ea56 + 5e46fca commit 612b8f6
Show file tree
Hide file tree
Showing 19 changed files with 773 additions and 222 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ omf/scratch/disaggDataGeneration/regression/workingDir/*
__pycache__/
.vscode/
*.code-workspace
omf/solvers/PowerModelsONM/julia-1.7.0/*
omf/solvers/reopt_jl/testFiles/Scenario_test_POST.json
omf/solvers/reopt_jl/testFiles/resultsResilience.json
omf/solvers/reopt_jl/testFiles/results.json
Expand Down
6 changes: 3 additions & 3 deletions omf/models/restoration.html
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,9 @@
<div class="shortInput">
<label class="tooltip">Solution Fidelity<span class="classic">Select an option for the level of fidelity of the results.</span></label>
<select id="solFidelity" name="solFidelity" value="{{allInputDataDict.solFidelity}}" />
<option value='0.10' {% if allInputDataDict.solFidelity == '0.10%' %}selected{% endif %}>Low</option>
<option value='0.05' {% if allInputDataDict.solFidelity == '0.05%' %}selected{% endif %}>Medium</option>
<option value='0.02' {% if allInputDataDict.solFidelity == '0.02%' %}selected{% endif %}>High</option>
<option value='0.10' {% if allInputDataDict.solFidelity == '0.10' %}selected{% endif %}>Low</option>
<option value='0.05' {% if allInputDataDict.solFidelity == '0.05' %}selected{% endif %}>Medium</option>
<option value='0.02' {% if allInputDataDict.solFidelity == '0.02' %}selected{% endif %}>High</option>
</select>
</div>
<div class="shortInput">
Expand Down
354 changes: 188 additions & 166 deletions omf/models/restoration.py

Large diffs are not rendered by default.

51 changes: 0 additions & 51 deletions omf/static/testFiles/iowa240_dwp_22_no_show_voltage.dss.omd
Original file line number Diff line number Diff line change
Expand Up @@ -5463,23 +5463,6 @@
"c1": "0",
"c0": "0"
},
"460": {
"object": "line",
"name": "cb_102",
"from": "bus1010",
"to": "bus2057",
"!FROCODE": ".1.2.3",
"!TOCODE": ".1.2.3",
"phases": "3",
"switch": "y",
"r1": "1e-4",
"r0": "1e-4",
"x1": "0",
"x0": "0",
"c1": "0",
"c0": "0",
"enabled": "n"
},
"461": {
"object": "line",
"name": "cb_201",
Expand Down Expand Up @@ -5528,23 +5511,6 @@
"c1": "0",
"c0": "0"
},
"464": {
"object": "line",
"name": "cb_204",
"from": "bus2013",
"to": "bus3005",
"!FROCODE": ".1.2.3",
"!TOCODE": ".1.2.3",
"phases": "3",
"switch": "y",
"r1": "1e-4",
"r0": "1e-4",
"x1": "0",
"x0": "0",
"c1": "0",
"c0": "0",
"enabled": "n"
},
"465": {
"object": "line",
"name": "cb_301",
Expand Down Expand Up @@ -5577,23 +5543,6 @@
"c1": "0",
"c0": "0"
},
"467": {
"object": "line",
"name": "cb_303",
"from": "bus3081",
"to": "bus2016",
"!FROCODE": ".1.2.3",
"!TOCODE": ".1.2.3",
"phases": "3",
"switch": "y",
"r1": "1e-4",
"r0": "1e-4",
"x1": "0",
"x0": "0",
"c1": "0",
"c0": "0",
"enabled": "n"
},
"468": {
"object": "loadshape",
"name": "1003_loadcurve",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@
[
{
"event_data": {
"status": 1,
"dispatchable": false,
"type": "breaker",
"state": "open"
},
"timestep": 1,
"affected_asset": "line.cb_102",
"event_type": "switch"
},
{
"event_data": {
"status": 1,
"dispatchable": false,
"type": "breaker",
"state": "open"
},
"timestep": 1,
"affected_asset": "line.cb_302",
"event_type": "switch"
},
{
"event_data": {
"status": 1,
"dispatchable": false,
"type": "breaker",
"state": "open"
},
"timestep": 1,
"affected_asset": "line.cb_303",
"event_type": "switch"
},
{
"event_data": {
"status": 1,
"dispatchable": false,
"type": "breaker",
"state": "open"
},
"timestep": 1,
"affected_asset": "line.cb_202",
"event_type": "switch"
},
{
"event_data": {
"status": 1,
"dispatchable": false,
"type": "breaker",
"state": "open"
},
"timestep": 1,
"affected_asset": "line.cb_203",
"event_type": "switch"
},
{
"event_data": {
"status": 1,
"dispatchable": false,
"type": "breaker",
"state": "open"
},
"timestep": 1,
"affected_asset": "line.cb_204",
"event_type": "switch"
},
{
"event_data": {
"dispatchable": true
},
"timestep": 2,
"affected_asset": "line.cb_102",
"event_type": "switch"
},
{
"event_data": {
"dispatchable": true
},
"timestep": 2,
"affected_asset": "line.cb_202",
"event_type": "switch"
},
{
"event_data": {
"dispatchable": true
},
"timestep": 2,
"affected_asset": "line.cb_203",
"event_type": "switch"
},
{
"event_data": {
"dispatchable": true
},
"timestep": 2,
"affected_asset": "line.cb_204",
"event_type": "switch"
},
{
"event_data": {
"dispatchable": true
},
"timestep": 2,
"affected_asset": "line.cb_302",
"event_type": "switch"
},
{
"event_data": {
"dispatchable": true
},
"timestep": 2,
"affected_asset": "line.cb_303",
"event_type": "switch"
}
]
21 changes: 21 additions & 0 deletions omf/static/testFiles/restoration/iowa240_dwp_22.eventsONLY101.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
[
{
"event_data": {
"status": 1,
"dispatchable": false,
"type": "breaker",
"state": "open"
},
"timestep": 1,
"affected_asset": "line.cb_101",
"event_type": "switch"
},
{
"event_data": {
"dispatchable": true
},
"timestep": 6,
"affected_asset": "line.cb_101",
"event_type": "switch"
}
]
21 changes: 21 additions & 0 deletions omf/static/testFiles/restoration/iowa240_dwp_22.eventsONLY201.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
[
{
"event_data": {
"status": 1,
"dispatchable": false,
"type": "breaker",
"state": "open"
},
"timestep": 1,
"affected_asset": "line.cb_201",
"event_type": "switch"
},
{
"event_data": {
"dispatchable": true
},
"timestep": 12,
"affected_asset": "line.cb_201",
"event_type": "switch"
}
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{

}
Loading

0 comments on commit 612b8f6

Please sign in to comment.