Skip to content

Commit 8b50539

Browse files
mfrippmfripp
authored
Merge pull request #94 from switch-model/pypi_setup
rename switch_mod to switch_model; prepare switch_model package for upload to pypi.
2 parents 0c55de1 + d71bdac commit 8b50539

File tree

146 files changed

+23520
-22825
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

146 files changed

+23520
-22825
lines changed

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
.idea
44
.DS_Store
55
gurobi.log
6-
SWITCH.egg-info/
6+
switch_model.egg-info/

‎README‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
This contains the Switch electricity planning model written in Pyomo.
1+
This contains version 2 of the Switch electricity planning model.
22
This optimization model is modular and can be used with varying levels
33
of complexity. Look in the examples directory for demonstrations of
44
using Switch for investment planning or production cost simulation. The

‎examples/3zone_toy/inputs/modules.txt‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
# Core Modules
2-
switch_mod
3-
switch_mod.timescales
4-
switch_mod.financials
5-
switch_mod.balancing.load_zones
6-
switch_mod.energy_sources.properties
7-
switch_mod.generators.core.build
8-
switch_mod.generators.core.dispatch
9-
switch_mod.reporting
2+
switch_model
3+
switch_model.timescales
4+
switch_model.financials
5+
switch_model.balancing.load_zones
6+
switch_model.energy_sources.properties
7+
switch_model.generators.core.build
8+
switch_model.generators.core.dispatch
9+
switch_model.reporting
1010
# Custom Modules
11-
switch_mod.transmission.local_td
12-
switch_mod.generators.core.no_commit
13-
switch_mod.energy_sources.fuel_costs.markets
14-
switch_mod.transmission.transport.build
15-
switch_mod.transmission.transport.dispatch
11+
switch_model.transmission.local_td
12+
switch_model.generators.core.no_commit
13+
switch_model.energy_sources.fuel_costs.markets
14+
switch_model.transmission.transport.build
15+
switch_model.transmission.transport.dispatch

‎examples/3zone_toy/inputs/switch_inputs_version.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.0.0b1
1+
2.0.0b2

‎examples/3zone_toy_stochastic_PySP/PySPInputGenerator.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,14 +65,14 @@
6565

6666
###########################################################
6767

68-
import switch_mod.utilities as utilities
69-
import switch_mod.solve
68+
import switch_model.utilities as utilities
69+
import switch_model.solve
7070
import sys, os
7171
from pyomo.environ import *
7272

7373
print "creating model for scenario input generation..."
7474

75-
module_list = switch_mod.solve.get_module_list(args=None)
75+
module_list = switch_model.solve.get_module_list(args=None)
7676
model = utilities.create_model(module_list)
7777

7878
print "model successfully created..."

‎examples/3zone_toy_stochastic_PySP/ReferenceModel.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,19 @@
2626

2727
###########################################################
2828

29-
import switch_mod.utilities as utilities
30-
import switch_mod.financials as financials
31-
import switch_mod.solve
29+
import switch_model.utilities as utilities
30+
import switch_model.financials as financials
31+
import switch_model.solve
3232
import sys, os
3333
from pyomo.environ import *
3434

3535
print "loading model..."
3636

3737
# Ideally, we would use the main codebase to generate the model, but the
3838
# mandatory switch argument parser is interferring with pysp's command line tools
39-
#model = switch_mod.solve.main(return_model=True)
39+
#model = switch_model.solve.main(return_model=True)
4040

41-
module_list = switch_mod.solve.get_module_list(args=None)
41+
module_list = switch_model.solve.get_module_list(args=None)
4242
model = utilities.create_model(module_list, args=[])
4343

4444
# The following code augments the model object with Expressions for the

‎examples/3zone_toy_stochastic_PySP/inputs/modules.txt‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
# Core Modules
2-
switch_mod
3-
switch_mod.timescales
4-
switch_mod.financials
5-
switch_mod.balancing.load_zones
6-
switch_mod.energy_sources.properties
7-
switch_mod.generators.core.build
8-
switch_mod.generators.core.dispatch
9-
switch_mod.reporting
2+
switch_model
3+
switch_model.timescales
4+
switch_model.financials
5+
switch_model.balancing.load_zones
6+
switch_model.energy_sources.properties
7+
switch_model.generators.core.build
8+
switch_model.generators.core.dispatch
9+
switch_model.reporting
1010
# Custom Modules
11-
switch_mod.transmission.local_td
12-
switch_mod.generators.core.no_commit
13-
switch_mod.energy_sources.fuel_costs.simple
14-
switch_mod.transmission.transport.build
15-
switch_mod.transmission.transport.dispatch
11+
switch_model.transmission.local_td
12+
switch_model.generators.core.no_commit
13+
switch_model.energy_sources.fuel_costs.simple
14+
switch_model.transmission.transport.build
15+
switch_model.transmission.transport.dispatch

‎examples/3zone_toy_stochastic_PySP/inputs/switch_inputs_version.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.0.0b1
1+
2.0.0b2

0 commit comments

Comments
 (0)