Merge remote-tracking branch 'rael/wecc' into make-mps

Author: staadecker

REAM Model Changelog.md

@@ -15,4 +15,5 @@ Changes are listed from oldest (first line) to newest (last line of table).
 | #36 | May 2021 | Correct inputs to only list transmission lines in one direction. |
 | #56 | June 2021 | Convert 2020 predetermined build years to 2019 in `get_inputs.py` to avoid conflicts with 2020 period. |
 | #57 | June 2021 | Specify predetermined storage energy capacity in inputs (previously left unspecified). |
-| #68 | June 2021 | Change financial params to 2018 dollars & 5% interest rate. Start using terrain multipliers (which now include the economic multiplier). |
+| #68 | June 2021 | Change financial params to 2018 dollars & 5% interest rate. Start using terrain multipliers (which now include the economic multiplier). |
+| #72 | July 2021 | Drop build and O&M costs of existing transmission lines. |

database/2021-06-15_add_generation_plants_groups.sql

@@ -0,0 +1,63 @@
+/*
+####################
+Add generation plants groups
+
+Date applied:
+Description:
+This script adds the option to specify generation plant groups.
+The generation groups are specified in the table generation_plant_group.
+Plants are assigned to a group by adding them to the many-to-many table generation_plant_group_member.
+Groups are assigned to a generation_plant_scenario_id by specifying them in generation_plant_scenario_group_member
+#################
+*/
+
+CREATE TABLE switch.generation_plant_group
+(
+    generation_plant_group_id serial                NOT NULL,
+    description               text                  NOT NULL,
+    name                      character varying(30) NOT NULL,
+    PRIMARY KEY (generation_plant_group_id)
+);
+
+COMMENT ON TABLE switch.generation_plant_group
+    IS 'This table specifies all the generation plant groups. Every group has a set of generation plants (see generation_plant_group_member). Groups can be assigned to a generation_plant_scenario (see generation_plant_scenario_group_member).';
+
+CREATE TABLE switch.generation_plant_group_member
+(
+    generation_plant_group_id integer,
+    generation_plant_id       integer,
+    PRIMARY KEY (generation_plant_group_id, generation_plant_id)
+);
+
+ALTER TABLE switch.generation_plant_group_member
+    ADD CONSTRAINT generation_plant_group_member_group_id_fkey
+        FOREIGN KEY (generation_plant_group_id)
+            REFERENCES switch.generation_plant_group (generation_plant_group_id);
+
+ALTER TABLE switch.generation_plant_group_member
+    ADD CONSTRAINT generation_plant_group_member_generation_plant_id_fkey
+        FOREIGN KEY (generation_plant_id)
+            REFERENCES switch.generation_plant (generation_plant_id);
+
+COMMENT ON TABLE switch.generation_plant_group_member
+    IS 'This table is a many-to-many table that specifies the generation plants that are associated with a generation group.';
+
+CREATE TABLE switch.generation_plant_scenario_group_member
+(
+    generation_plant_scenario_id integer,
+    generation_plant_group_id    integer,
+    PRIMARY KEY (generation_plant_scenario_id, generation_plant_group_id)
+);
+
+ALTER TABLE switch.generation_plant_scenario_group_member
+    ADD CONSTRAINT generation_plant_scenario_group_member_scenario_id_fkey
+        FOREIGN KEY (generation_plant_scenario_id)
+            REFERENCES switch.generation_plant_scenario (generation_plant_scenario_id);
+
+ALTER TABLE switch.generation_plant_scenario_group_member
+    ADD CONSTRAINT generation_plant_scenario_group_member_group_id_fkey
+        FOREIGN KEY (generation_plant_group_id)
+            REFERENCES switch.generation_plant_group (generation_plant_group_id);
+
+COMMENT ON TABLE switch.generation_plant_scenario_group_member
+    IS 'This table is a many-to-many table that specifies which generation plant groups belong to which generation plant scenarios';

database/2021-06-18_add_gen_store_energy_to_power_ratio.sql

@@ -0,0 +1,13 @@
+/*
+####################
+Add column gen_store_energy_to_power_ratio
+
+Date applied: 2021-06-18
+Description:
+This script adds a column to the generation_plant
+table called gen_storage_energy_to_power_ratio specifying
+the storage duration
+#################
+*/
+
+ALTER TABLE switch.generation_plant ADD COLUMN gen_storage_energy_to_power_ratio real;

database/2021-06-24_add_transmission_options.sql

@@ -0,0 +1,19 @@
+/*
+####################
+Add transmission options
+
+Date applied: 2021-06-23
+Description:
+Adds two rows to table transmission_base_capital_cost_scenario_id
+1. A scenario where transmission costs are zero.
+2. A scenario where transmission costs are infinity (building not allowed).
+#################
+*/
+
+INSERT INTO switch.transmission_base_capital_cost (transmission_base_capital_cost_scenario_id,
+                                                   trans_capital_cost_per_mw_km, description)
+VALUES (3, 'Infinity', 'For scenarios where building transmission is forbidden.');
+
+INSERT INTO switch.transmission_base_capital_cost (transmission_base_capital_cost_scenario_id,
+                                                   trans_capital_cost_per_mw_km, description)
+VALUES (4, 0, 'For scenarios where transmission is unlimited.');

database/2021-06-29_add_transmission_options_v2.sql

@@ -0,0 +1,13 @@
+/*
+####################
+Add transmission options
+
+Date applied: 2021-06-29
+Description:
+Adds an extra scenario to the database for a 10x increase in transmission costs.
+#################
+*/
+
+INSERT INTO switch.transmission_base_capital_cost (transmission_base_capital_cost_scenario_id,
+                                                   trans_capital_cost_per_mw_km, description)
+VALUES (5, 9600, '10x the costs of scenario #2. Approximates the no TX case.');

switch_model/__main__.py

@@ -4,75 +4,81 @@
 """Script to handle switch <cmd> calls from the command line."""
 from __future__ import print_function
 
-import sys, os
+import argparse
+import importlib
+import sys
 import switch_model
+from switch_model.utilities import get_git_branch
+
+
+def version():
+    print("Switch model version " + switch_model.__version__)
+    branch = get_git_branch()
+    if branch is not None:
+        print(f"Switch Git branch: {branch}")
+    return 0
+
+
+def help_text():
+    print(
+        f"Must specifiy one of the following commands: {list(cmds.keys())}.\nE.g. Run 'switch solve' or 'switch get_inputs'."
+    )
+
+
+def get_module_runner(module):
+    def runner():
+        importlib.import_module(module).main()
+
+    return runner
+
+
+cmds = {
+    "solve": get_module_runner("switch_model.solve"),
+    "solve-scenarios": get_module_runner("switch_model.solve_scenarios"),
+    "test": get_module_runner("switch_model.test"),
+    "upgrade": get_module_runner("switch_model.upgrade"),
+    "get_inputs": get_module_runner("switch_model.wecc.get_inputs"),
+    "drop": get_module_runner("switch_model.tools.drop"),
+    "new": get_module_runner("switch_model.tools.new"),
+    "graph": get_module_runner("switch_model.tools.graph.cli_graph"),
+    "compare": get_module_runner("switch_model.tools.graph.cli_compare"),
+    "db": get_module_runner("switch_model.wecc.__main__"),
+    "help": help_text,
+}
 
 
 def main():
-    # TODO make a proper command line tool with help information for each option
-    cmds = [
-        "solve",
-        "solve-scenarios",
-        "test",
-        "upgrade",
-        "get_inputs",
-        "--version",
-        "drop",
-        "new",
-        "graph",
-        "compare",
-        "sampling",
-    ]
-    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
-        # command line then an empty entry gets added to the start of the path,
-        # indicating the current working directory. This module is often called
-        # from a command-line script, but we want the current working
-        # directory in the path because users may try to load local modules via
-        # the configuration files, so we make sure that's always in the path.
-        sys.path[0] = ""
-
-        # adjust the argument list to make it look like someone ran "python -m <module>" directly
-        cmd = sys.argv[1]
-        sys.argv[0] += " " + cmd
+    parser = argparse.ArgumentParser(add_help=False)
+    parser.add_argument(
+        "--version", default=False, action="store_true", help="Get version info"
+    )
+    parser.add_argument(
+        "subcommand",
+        choices=cmds.keys(),
+        help="The possible switch subcommands",
+        nargs="?",
+        default="help",
+    )
+
+    # 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
+    # command line then an empty entry gets added to the start of the path,
+    # indicating the current working directory. This module is often called
+    # from a command-line script, but we want the current working
+    # directory in the path because users may try to load local modules via
+    # the configuration files, so we make sure that's always in the path.
+    sys.path[0] = ""
+
+    args, remaining_args = parser.parse_known_args()
+
+    if args.version:
+        return version()
+
+    # adjust the argument list to make it look like someone ran "python -m <module>" directly
+    if len(sys.argv) > 1:
+        sys.argv[0] += " " + sys.argv[1]
         del sys.argv[1]
-        if cmd == "--version":
-            print("Switch model version " + switch_model.__version__)
-            from switch_model.utilities import get_git_branch
-
-            branch = get_git_branch()
-            if branch is not None:
-                print(f"Switch Git branch: {branch}")
-            return 0
-        if cmd == "solve":
-            from switch_model.solve import main
-        elif cmd == "solve-scenarios":
-            from switch_model.solve_scenarios import main
-        elif cmd == "test":
-            from switch_model.test import main
-        elif cmd == "upgrade":
-            from switch_model.upgrade import main
-        elif cmd == "get_inputs":
-            from switch_model.wecc.get_inputs import main
-        elif cmd == "sampling":
-            from switch_model.wecc.sampling import main
-        elif cmd == "drop":
-            from switch_model.tools.drop import main
-        elif cmd == "new":
-            from switch_model.tools.new import main
-        elif cmd == "graph":
-            from switch_model.tools.graph.cli_graph import main
-        elif cmd == "compare":
-            from switch_model.tools.graph.cli_compare import main
-        main()
-    else:
-        print(
-            "Usage: {} {{{}}} ...".format(
-                os.path.basename(sys.argv[0]), ", ".join(cmds)
-            )
-        )
-        print("Use one of these commands with --help for more information.")
+    cmds[args.subcommand]()
 
 
 if __name__ == "__main__":

switch_model/energy_sources/fuel_costs/markets.py

@@ -209,6 +209,10 @@ def define_components(mod):
     become non-linear.
 
     """
+    # When this variable is True we only allow positive fuel costs
+    # This simplifies the model since we can set some of our constraints
+    # as greater than instead of equals.
+    ONLY_POSITIVE_RFM_COSTS = False
 
     mod.REGIONAL_FUEL_MARKETS = Set(dimen=1)
     mod.rfm_fuel = Param(mod.REGIONAL_FUEL_MARKETS, within=mod.FUELS)
@@ -244,7 +248,9 @@ def zone_rfm_init(m, load_zone, fuel):
         dimen=3,
         validate=lambda m, r, p, st: (r in m.REGIONAL_FUEL_MARKETS and p in m.PERIODS),
     )
-    mod.rfm_supply_tier_cost = Param(mod.RFM_SUPPLY_TIERS, within=Reals)
+    mod.rfm_supply_tier_cost = Param(
+        mod.RFM_SUPPLY_TIERS, within=PositiveReals if ONLY_POSITIVE_RFM_COSTS else Reals
+    )
     mod.rfm_supply_tier_limit = Param(
         mod.RFM_SUPPLY_TIERS, within=NonNegativeReals, default=float("inf")
     )
@@ -365,13 +371,20 @@ def GENS_FOR_RFM_PERIOD_rule(m, rfm, p):
     enforce_fuel_consumption_scaling_factor = 1e-2
 
     def Enforce_Fuel_Consumption_rule(m, rfm, p):
-        return m.FuelConsumptionInMarket[
-            rfm, p
-        ] * enforce_fuel_consumption_scaling_factor == enforce_fuel_consumption_scaling_factor * sum(
+        lhs = (
+            m.FuelConsumptionInMarket[rfm, p] * enforce_fuel_consumption_scaling_factor
+        )
+        rhs = enforce_fuel_consumption_scaling_factor * sum(
             m.GenFuelUseRate[g, t, m.rfm_fuel[rfm]] * m.tp_weight_in_year[t]
             for g in m.GENS_FOR_RFM_PERIOD[rfm, p]
             for t in m.TPS_IN_PERIOD[p]
         )
+        # If we have only positive costs, FuelConsumptionInMarket will automatically
+        # try to be minimized in which case we can use a one-sided constraint
+        if ONLY_POSITIVE_RFM_COSTS:
+            return lhs >= rhs
+        else:
+            return lhs == rhs
 
     mod.Enforce_Fuel_Consumption = Constraint(
         mod.REGIONAL_FUEL_MARKETS, mod.PERIODS, rule=Enforce_Fuel_Consumption_rule