Merge remote-tracking branch 'rael/wecc' into improv_hydro

Author: staadecker

switch_model/solve.py

@@ -529,7 +529,7 @@ def define_arguments(argparser):
     # whether that does the same thing as --solver-options-string so we don't reuse the same name.
     argparser.add_argument(
         "--solver-options-string",
-        default=None,
+        default="",
         help="A quoted string of options to pass to the model solver. Each option must be of the form option=value. "
         "(e.g., --solver-options-string \"mipgap=0.001 primalopt='' advance=2 threads=1\")",
     )
@@ -717,6 +717,14 @@ def define_arguments(argparser):
         " that all variables must be the same between the previous and current scenario.",
     )
 
+    argparser.add_argument(
+        "--gurobi-make-mps",
+        default=False,
+        action="store_true",
+        help="Instead of solving just output a Gurobi .mps file that can be used for debugging numerical properties."
+        " See https://github.com/staadecker/lp-analyzer/ for details.",
+    )
+
 
 def add_recommended_args(argparser):
     """
@@ -900,27 +908,25 @@ def solve(model):
         # Note previously solver was saved in model however this is very memory inefficient.
         solver = SolverFactory(model.options.solver, solver_io=model.options.solver_io)
 
-        # If this option is enabled, gurobi will output an IIS to outputs\iis.ilp.
-        if model.options.gurobi_find_iis:
-            # Enable symbolic labels since otherwise we can't debug the .ilp file.
-            model.options.symbolic_solver_labels = True
+        if model.options.gurobi_find_iis and model.options.gurobi_make_mps:
+            raise Exception("Can't use --gurobi-find-iis with --gurobi-make-mps.")
 
-            # If no string is passed make the string empty so we can add to it
-            if model.options.solver_options_string is None:
-                model.options.solver_options_string = ""
+        if model.options.gurobi_find_iis or model.options.gurobi_make_mps:
+            # If we are outputting a file we want to enable symbolic labels to help debugging
+            model.options.symbolic_solver_labels = True
 
+        # If this option is enabled, gurobi will output an IIS to outputs\iis.ilp.
+        if model.options.gurobi_find_iis:
             # Add to the solver options 'ResultFile=iis.ilp'
             # https://stackoverflow.com/a/51994135/5864903
-            iis_file_path = os.path.join(model.options.outputs_dir, "iis.ilp")
-            model.options.solver_options_string += " ResultFile={}".format(
-                iis_file_path
+            model.options.solver_options_string += " ResultFile=iis.ilp"
+        if model.options.gurobi_make_mps:
+            # Output the input file and set time limit to zero to ensure it doesn't actually solve
+            model.options.solver_options_string += (
+                f" ResultFile=problem.mps TimeLimit=0"
             )
 
         if model.options.threads:
-            # If no string is passed make the string empty so we can add to it
-            if model.options.solver_options_string is None:
-                model.options.solver_options_string = ""
-
             model.options.solver_options_string += f" Threads={model.options.threads}"
 
         if model.options.solver_method is not None:

switch_model/tools/graph/main.py

@@ -21,33 +21,18 @@
 import plotnine
 
 # Local imports
-from switch_model.utilities import StepTimer, get_module_list, query_yes_no
+from switch_model.utilities import (
+    StepTimer,
+    get_module_list,
+    query_yes_no,
+    catch_exceptions,
+)
 
 # When True exceptions that are thrown while graphing will be caught
 # and outputted to console as a warning instead of an error
 CATCH_EXCEPTIONS = True
 
 
-def catch_exceptions(func):
-    """
-    Decorator that wraps a function such that exceptions are caught and outputted as warnings instead.
-    """
-
-    @functools.wraps(func)
-    def wrapper(*args, **kwargs):
-        if not CATCH_EXCEPTIONS:
-            return func(*args, **kwargs)
-        try:
-            return func(*args, **kwargs)
-        except:
-            warnings.warn(
-                f"The following error was caught and we are moving on."
-                f"{traceback.format_exc()}"
-            )
-
-    return wrapper
-
-
 # List of graphing functions. Every time a function uses the @graph() decorator,
 # the function gets registered here.
 registered_graphs = {}
@@ -77,7 +62,9 @@ def graph(
 
     def decorator(func):
         @functools.wraps(func)
-        @catch_exceptions
+        @catch_exceptions(
+            "Failed to run a graphing function.", should_catch=CATCH_EXCEPTIONS
+        )
         def wrapper(tools: GraphTools):
             if tools.skip_long and is_long:
                 return

switch_model/utilities/__init__.py

@@ -801,7 +801,9 @@ def query_yes_no(question, default="yes"):
             sys.stdout.write("Please respond with 'yes' or 'no' " "(or 'y' or 'n').\n")
 
 
-def catch_exceptions(warning_msg=None, should_catch=True):
+def catch_exceptions(
+    warning_msg="An exception was caught and ignored.", should_catch=True
+):
     """Decorator that catches exceptions."""
 
     def decorator(func):
@@ -813,8 +815,9 @@ def wrapper(*args, **kwargs):
             try:
                 return func(*args, **kwargs)
             except:
-                if warning_msg is not None:
-                    warnings.warn(warning_msg)
+                warnings.warn(
+                    warning_msg + "\nDetailed error log: " + traceback.format_exc()
+                )
 
         return wrapper
 

switch_model/utilities/gurobi_aug.py

@@ -22,7 +22,7 @@
 from pyomo.solvers.plugins.solvers.gurobi_direct import GurobiDirect
 from pyomo.environ import *
 
-from switch_model.utilities import StepTimer
+from switch_model.utilities import StepTimer, catch_exceptions
 
 
 class PicklableData:
@@ -222,6 +222,7 @@ def _postsolve(self):
                 print(f"Created warm start pickle file in {timer.step_time_as_str()}")
         return results
 
+    @catch_exceptions(warning_msg="Failed to save warm start information.")
     def _save_warm_start(self, save_c_v_basis):
         """Create a pickle file containing the CBasis/VBasis information."""
         # Setup our data objects

switch_model/wecc/get_inputs/get_inputs.py

@@ -68,7 +68,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.policies.min_per_tech",  # Always include since it provides useful outputs even when unused
     # "switch_model.reporting.basic_exports_wecc",
     # Always include since by default it does nothing except output useful data
@@ -747,6 +746,7 @@ def query_db(full_config, skip_cf):
             order by 1, 2;
             """
         )
+        modules.append("switch_model.policies.rps_unbundled")
 
     ########################################################
     # BIO_SOLID SUPPLY CURVE

switch_model/wecc/get_inputs/post_process_steps/add_storage.py

@@ -123,6 +123,7 @@ def main(config):
 
     # Get the plant costs from GSheets and append to costs
     storage_costs = fetch_df("costs", "costs_scenario", config)
+    storage_costs = storage_costs[storage_costs["GENERATION_PROJECT"].isin(gen_projects["GENERATION_PROJECT"])]
     add_to_csv("gen_build_costs.csv", storage_costs, primary_key=["GENERATION_PROJECT", "build_year"])
 
     # Create add_storage_info.csv