Only include rps module if scenario id is not null

staadecker · staadecker · commit b2c247861fec · 2021-07-27T18:33:16.000-07:00
diff --git a/switch_model/wecc/get_inputs/get_inputs.py b/switch_model/wecc/get_inputs/get_inputs.py
@@ -61,7 +61,6 @@ def write_csv(data: Iterable[List], fname, headers: List[str], log=True):
     "switch_model.transmission.transport.build",
     "switch_model.transmission.transport.dispatch",
     "switch_model.policies.carbon_policies",
-    "switch_model.policies.rps_unbundled",
     # "switch_model.reporting.basic_exports_wecc",
 ]
 
@@ -689,6 +688,7 @@ def query_db(full_config, skip_cf):
             order by 1, 2;
             """
         )
+        modules.append("switch_model.policies.rps_unbundled")
 
     ########################################################
     # BIO_SOLID SUPPLY CURVE

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,6 @@ def write_csv(data: Iterable[List], fname, headers: List[str], log=True):`
`61`	`61`	`"switch_model.transmission.transport.build",`
`62`	`62`	`"switch_model.transmission.transport.dispatch",`
`63`	`63`	`"switch_model.policies.carbon_policies",`
`64`		`- "switch_model.policies.rps_unbundled",`
`65`	`64`	`# "switch_model.reporting.basic_exports_wecc",`
`66`	`65`	`]`
`67`	`66`
`@@ -689,6 +688,7 @@ def query_db(full_config, skip_cf):`
`689`	`688`	`order by 1, 2;`
`690`	`689`	`"""`
`691`	`690`	`)`
	`691`	`+ modules.append("switch_model.policies.rps_unbundled")`
`692`	`692`
`693`	`693`	`########################################################`
`694`	`694`	`# BIO_SOLID SUPPLY CURVE`