Fix when captype modules update results_cap table (#807)

We need to import the capacity_all results first before updating the
table; otherwise, the update statement has no effect.

gridpath/auxiliary/module_list.py

@@ -73,6 +73,7 @@ def all_modules_list():
         "system.reliability.local_capacity.local_capacity_requirement",
         "system.markets.prices",
         "project",
+        "project.capacity",
         "project.capacity.capacity_types",
         "project.capacity.capacity",
         "project.capacity.capacity_groups",

gridpath/project/capacity/__init__.py

@@ -1,4 +1,4 @@
-# Copyright 2016-2020 Blue Marble Analytics LLC.
+# Copyright 2016-2021 Blue Marble Analytics LLC.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,3 +17,87 @@
 capacity-associated costs of generation, storage, and demand-side
 infrastructure 'projects' in the optimization problem.
 """
+
+import csv
+import os.path
+
+from db.common_functions import spin_on_database_lock
+from gridpath.auxiliary.db_interface import setup_results_import
+
+
+# Database
+###############################################################################
+
+def import_results_into_database(
+    scenario_id, subproblem, stage, c, db, results_directory, quiet
+):
+    """
+    :param scenario_id:
+    :param c:
+    :param db:
+    :param results_directory:
+    :param quiet:
+    :return:
+    """
+    # First import the capacity_all results; the capacity type modules will
+    # then update the database tables rather than insert (all projects
+    # should have been inserted here)
+    # Delete prior results and create temporary import table for ordering
+    if not quiet:
+        print("project capacity")
+
+    # Delete prior results and create temporary import table for ordering
+    setup_results_import(conn=db, cursor=c,
+                         table="results_project_capacity",
+                         scenario_id=scenario_id, subproblem=subproblem,
+                         stage=stage)
+
+    # Load results into the temporary table
+    results = []
+    with open(os.path.join(results_directory, "capacity_all.csv"), "r") as \
+            capacity_file:
+        reader = csv.reader(capacity_file)
+
+        next(reader)  # skip header
+        for row in reader:
+            project = row[0]
+            period = row[1]
+            capacity_type = row[2]
+            technology = row[3]
+            load_zone = row[4]
+            capacity_mw = row[5]
+            hyb_gen_capacity_mw = None if row[6] == "" else row[6]
+            hyb_stor_capacity_mw = None if row[7] == "" else row[7]
+            energy_capacity_mwh = None if row[8] == "" else row[8]
+
+            results.append(
+                (scenario_id, project, period, subproblem, stage,
+                 capacity_type, technology, load_zone,
+                 capacity_mw, hyb_gen_capacity_mw, hyb_stor_capacity_mw,
+                 energy_capacity_mwh)
+            )
+
+    insert_temp_sql = """
+        INSERT INTO temp_results_project_capacity{}
+        (scenario_id, project, period, subproblem_id, stage_id, capacity_type,
+        technology, load_zone, capacity_mw, hyb_gen_capacity_mw, 
+        hyb_stor_capacity_mw, energy_capacity_mwh)
+        VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);
+        """.format(scenario_id)
+    spin_on_database_lock(conn=db, cursor=c, sql=insert_temp_sql, data=results)
+
+    # Insert sorted results into permanent results table
+    insert_sql = """
+        INSERT INTO results_project_capacity
+        (scenario_id, project, period, subproblem_id, stage_id, capacity_type,
+        technology, load_zone, capacity_mw, hyb_gen_capacity_mw, 
+        hyb_stor_capacity_mw, energy_capacity_mwh)
+        SELECT
+        scenario_id, project, period, subproblem_id, stage_id, capacity_type,
+        technology, load_zone, capacity_mw, hyb_gen_capacity_mw, 
+        hyb_stor_capacity_mw, energy_capacity_mwh
+        FROM temp_results_project_capacity{}
+        ORDER BY scenario_id, project, period, subproblem_id, 
+        stage_id;""".format(scenario_id)
+    spin_on_database_lock(conn=db, cursor=c, sql=insert_sql, data=(),
+                          many=False)

gridpath/project/capacity/capacity.py

@@ -26,14 +26,12 @@
 import pandas as pd
 from pyomo.environ import Set, Expression, value
 
-from db.common_functions import spin_on_database_lock
 from gridpath.auxiliary.auxiliary import \
     get_required_subtype_modules_from_projects_file, join_sets
 from gridpath.project.capacity.common_functions import \
     load_project_capacity_type_modules
 from gridpath.auxiliary.dynamic_components import \
     capacity_type_operational_period_sets
-from gridpath.auxiliary.db_interface import setup_results_import
 import gridpath.project.capacity.capacity_types as cap_type_init
 
 
@@ -373,82 +371,3 @@ def summarize_results(scenario_directory, subproblem, stage):
             )
         else:
             pass
-
-
-# Database
-###############################################################################
-
-def import_results_into_database(
-    scenario_id, subproblem, stage, c, db, results_directory, quiet
-):
-    """
-    :param scenario_id:
-    :param c:
-    :param db:
-    :param results_directory:
-    :param quiet:
-    :return:
-    """
-    # First import the capacity_all results; the capacity type modules will
-    # then update the database tables rather than insert (all projects
-    # should have been inserted here)
-    # Delete prior results and create temporary import table for ordering
-    if not quiet:
-        print("project capacity")
-
-    # Delete prior results and create temporary import table for ordering
-    setup_results_import(conn=db, cursor=c,
-                         table="results_project_capacity",
-                         scenario_id=scenario_id, subproblem=subproblem,
-                         stage=stage)
-
-    # Load results into the temporary table
-    results = []
-    with open(os.path.join(results_directory, "capacity_all.csv"), "r") as \
-            capacity_file:
-        reader = csv.reader(capacity_file)
-
-        next(reader)  # skip header
-        for row in reader:
-            project = row[0]
-            period = row[1]
-            capacity_type = row[2]
-            technology = row[3]
-            load_zone = row[4]
-            capacity_mw = row[5]
-            hyb_gen_capacity_mw = None if row[6] == "" else row[6]
-            hyb_stor_capacity_mw = None if row[7] == "" else row[7]
-            energy_capacity_mwh = None if row[8] == "" else row[8]
-
-            results.append(
-                (scenario_id, project, period, subproblem, stage,
-                 capacity_type, technology, load_zone,
-                 capacity_mw, hyb_gen_capacity_mw, hyb_stor_capacity_mw,
-                 energy_capacity_mwh)
-            )
-
-    insert_temp_sql = """
-        INSERT INTO temp_results_project_capacity{}
-        (scenario_id, project, period, subproblem_id, stage_id, capacity_type,
-        technology, load_zone, capacity_mw, hyb_gen_capacity_mw, 
-        hyb_stor_capacity_mw, energy_capacity_mwh)
-        VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);
-        """.format(scenario_id)
-    spin_on_database_lock(conn=db, cursor=c, sql=insert_temp_sql, data=results)
-
-    # Insert sorted results into permanent results table
-    insert_sql = """
-        INSERT INTO results_project_capacity
-        (scenario_id, project, period, subproblem_id, stage_id, capacity_type,
-        technology, load_zone, capacity_mw, hyb_gen_capacity_mw, 
-        hyb_stor_capacity_mw, energy_capacity_mwh)
-        SELECT
-        scenario_id, project, period, subproblem_id, stage_id, capacity_type,
-        technology, load_zone, capacity_mw, hyb_gen_capacity_mw, 
-        hyb_stor_capacity_mw, energy_capacity_mwh
-        FROM temp_results_project_capacity{}
-        ORDER BY scenario_id, project, period, subproblem_id, 
-        stage_id;""".format(scenario_id)
-    spin_on_database_lock(conn=db, cursor=c, sql=insert_sql, data=(),
-                          many=False)
-