Merge branch 'master' into powerplant_data-functions

OSeMOSYS · Sep 21, 2024 · 33b7755 · 33b7755
2 parents cace89b + 2d745c4
commit 33b7755
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 763 deletions.
diff --git a/workflow/scripts/osemosys_global/demand/main.py b/workflow/scripts/osemosys_global/demand/main.py
@@ -80,6 +80,7 @@ def main(
         start_year = 2020
         end_year = 2050
         custom_nodes = ["INDWE", "INDEA", "INDNE", "INDNO", "INDSO"]
+        # custom_nodes = []
         custom_nodes_data = "resources/data/custom_nodes/specified_annual_demand.csv"
 
     # first bring together original and missing iamc data

diff --git a/workflow/scripts/osemosys_global/demand/projection.py b/workflow/scripts/osemosys_global/demand/projection.py
@@ -31,7 +31,8 @@ def perform_node_projections(
 
     proj = _interpolate_yearly_demand(df)
     proj = _get_node_peak_demand_ratio(plexos_demand, proj)
-    return _adjust_with_peak_demand(proj, PEAK_RATIO_FACTOR)
+    # return _adjust_with_peak_demand(proj, PEAK_RATIO_FACTOR)
+    return proj
 
 
 def perform_node_projection_step(