Existing transmission lines now have their sunk costs carried into the objective function. Update example expectations accordingly.

josiahjohnston · josiahjohnston · commit 5dcd2eb2349f · 2017-04-19T00:02:30.000-07:00
Ensure that executing `switch solve --help` outside of a project directory will not cause a crash.
Update outputs of the copperplate0 example (the only example that includes a full set of outputs).
Have setup.py use the version number from the switch_model package
Implement `switch --version` for getting the version number from the command-line tool.
diff --git a/examples/3zone_toy/outputs/total_cost.txt b/examples/3zone_toy/outputs/total_cost.txt
@@ -1 +1 @@
-112306455.975
+114415586.323
diff --git a/examples/carbon_cap/outputs/total_cost.txt b/examples/carbon_cap/outputs/total_cost.txt
@@ -1 +1 @@
-117115037.675
+119224168.023
diff --git a/examples/copperplate0/outputs/BuildGen.tab b/examples/copperplate0/outputs/BuildGen.tab
@@ -3,5 +3,5 @@ S-Geothermal	1998	1.0
 S-Central_PV-1	2020	0.0
 S-Central_PV-1	2000	1.0
 S-NG_CC	2000	5.0
-S-NG_CC	2020	1.84427579787234
+S-NG_CC	2020	2.34276595744681
 S-Geothermal	2020	0.0
diff --git a/examples/copperplate0/outputs/BuildMinGenCap.tab b/examples/copperplate0/outputs/BuildMinGenCap.tab
diff --git a/examples/copperplate0/outputs/DispatchBaseloadByPeriod.tab b/examples/copperplate0/outputs/DispatchBaseloadByPeriod.tab
@@ -1,2 +1,2 @@
 DispatchBaseloadByPeriod_index_1	DispatchBaseloadByPeriod_index_2	DispatchBaseloadByPeriod
-S-Geothermal	2020	0.96858075
+S-Geothermal	2020	0.5
diff --git a/examples/copperplate0/outputs/DispatchGen.tab b/examples/copperplate0/outputs/DispatchGen.tab
@@ -1,7 +1,7 @@
 GEN_TPS_1	GEN_TPS_2	DispatchGen
-S-Geothermal	2	0.96858075
-S-Geothermal	1	0.96858075
-S-NG_CC	1	6.43361925
+S-Geothermal	2	0.5
+S-Geothermal	1	0.5
+S-NG_CC	1	6.9022
 S-NG_CC	2	0.0
 S-Central_PV-1	2	0.0
 S-Central_PV-1	1	0.5978
diff --git a/examples/copperplate0/outputs/DumpPower.tab b/examples/copperplate0/outputs/DumpPower.tab
diff --git a/examples/copperplate0/outputs/GenFuelUseRate.tab b/examples/copperplate0/outputs/GenFuelUseRate.tab
@@ -1,3 +1,3 @@
 GEN_TP_FUELS_1	GEN_TP_FUELS_2	GEN_TP_FUELS_3	GenFuelUseRate
-S-NG_CC	1	NaturalGas	43.13741707125
+S-NG_CC	1	NaturalGas	46.279251
 S-NG_CC	2	NaturalGas	0.0
diff --git a/examples/copperplate0/outputs/dispatch.txt b/examples/copperplate0/outputs/dispatch.txt
@@ -1,3 +1,3 @@
-timestamp	S-Geothermal	S-NG_CC	S-Central_PV-1
-2025011512	0.96858075	6.43361925	0.5978
-2025011600	0.96858075	0.0	0.0
+timestamp	S-Central_PV-1	S-Geothermal	S-NG_CC
+2025011512	0.5978	0.5	6.9022
+2025011600	0	0.5	0
diff --git a/examples/copperplate0/outputs/gen_cap.txt b/examples/copperplate0/outputs/gen_cap.txt
@@ -0,0 +1,4 @@
+GENERATION_PROJECT	PERIOD	GenCapacity	GenCapitalCosts	GenFixedOMCosts
+S-Central_PV-1	2020	1	227410	41850
+S-NG_CC	2020	7.34277	832743	43089.6
+S-Geothermal	2020	1	455992	0
diff --git a/examples/copperplate0/outputs/load_balance.txt b/examples/copperplate0/outputs/load_balance.txt
@@ -1,3 +1,3 @@
-load_zone	timestamp	LZ_NetDispatch	lz_demand_mw	DumpPower
-South	2025011512	8.0	8	0.0
-South	2025011600	0.96858075	0.5	0.46858075
+load_zone	timestamp	ZoneTotalCentralDispatch	ZoneTotalDistributedDispatch	zone_demand_mw
+South	2025011512	8	0	8
+South	2025011600	0.5	0	0.5
diff --git a/examples/planning_reserves/outputs/total_cost.txt b/examples/planning_reserves/outputs/total_cost.txt
@@ -1 +1 @@
-113475282.655
+115584413.003
diff --git a/examples/rps_simple/outputs/total_cost.txt b/examples/rps_simple/outputs/total_cost.txt
@@ -1 +1 @@
-117916387.239
+120025517.587
diff --git a/setup.py b/setup.py
@@ -14,13 +14,14 @@
 
 import os
 from setuptools import setup, find_packages
+import switch_model
 
 def read(*rnames):
     return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
 
 setup(
     name='switch_model',
-    version='2.0.0b2',
+    version=switch_model.__version__,
     maintainer='Switch Authors',
     maintainer_email='authors@switch-model.org',
     url='http://switch-model.org',
diff --git a/switch_model/__init__.py b/switch_model/__init__.py
@@ -17,7 +17,7 @@
 Most applications of Switch will also benefit from optional modules such as 
 transmission, local_td, reserves, etc.
 """
-__version__='2.0.0b2'
+__version__='2.0.0b3'
 core_modules = [
     'switch_model.timescales',
     'switch_model.financials',
diff --git a/switch_model/main.py b/switch_model/main.py
@@ -4,11 +4,12 @@
 """Script to handle switch <cmd> calls from the command line."""
 
 import sys, os
+import switch_model
 
 # print "running {} as {}.".format(__file__, __name__)
 
 def main():
-    cmds = ["solve", "solve-scenarios", "test", "upgrade"]
+    cmds = ["solve", "solve-scenarios", "test", "upgrade", "--version"]
     if len(sys.argv) >= 2 and sys.argv[1] in cmds:
         # If users run a script from the command line, the location of the script
         # gets added to the start of sys.path; if they call a module from the 
@@ -23,6 +24,9 @@ def main():
         cmd = sys.argv[1]
         sys.argv[0] += " " + cmd
         del sys.argv[1]
+        if cmd == "--version":
+            print "Switch model version " + switch_model.__version__
+            return 0
         if cmd == "solve":
             from .solve import main
         elif cmd == "solve-scenarios":
diff --git a/switch_model/solve.py b/switch_model/solve.py
@@ -46,7 +46,8 @@ def debug(type, value, tb):
     parser = _ArgumentParser(allow_abbrev=False, add_help=False)
     add_module_args(parser)
     module_options = parser.parse_known_args(args=args)[0]
-    if do_inputs_need_upgrade(module_options.inputs_dir):
+    if(os.path.exists(module_options.inputs_dir) and
+       do_inputs_need_upgrade(module_options.inputs_dir)):
         do_upgrade = query_yes_no(
             ("Warning! Your inputs directory needs to be upgraded. "
              "Do you want to auto-upgrade now? We'll keep a backup of "
diff --git a/switch_model/transmission/transport/build.py b/switch_model/transmission/transport/build.py
@@ -205,7 +205,7 @@ def define_components(mod):
         within=mod.BLD_YRS_FOR_TX,
         initialize=lambda m, p: set(
             (tx, bld_yr) for (tx, bld_yr) in m.BLD_YRS_FOR_TX
-            if bld_yr <= p))
+            if bld_yr == 'Legacy' or bld_yr <= p))
 
     def bounds_BuildTx(model, tx, bld_yr):
         if((tx, bld_yr) in model.BLD_YRS_FOR_EXISTING_TX):
diff --git a/tests/upgrade_dat/3zone_toy/outputs/total_cost.txt b/tests/upgrade_dat/3zone_toy/outputs/total_cost.txt
@@ -1 +1 @@
-112306455.975
+114415586.323

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`DispatchBaseloadByPeriod_index_1 DispatchBaseloadByPeriod_index_2 DispatchBaseloadByPeriod`
`2`		`-S-Geothermal 2020 0.96858075`
	`2`	`+S-Geothermal 2020 0.5`