Fix bug in endogenous availability modules (#855)

Fix missing timepoint weight in endogenous availability constraint.
blue-marble · Dec 16, 2021 · 4bd0969 · 4bd0969
1 parent c0ec4d2
commit 4bd0969
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/..._examples/project/project_availability/project_availability_endogenous/Nuclear-1-base.csv b/..._examples/project/project_availability/project_availability_endogenous/Nuclear-1-base.csv
@@ -1 +1 @@
-unavailable_hours_per_period,unavailable_hours_per_event_min,available_hours_between_events_min1,1,1
+unavailable_hours_per_period,unavailable_hours_per_event_min,available_hours_between_events_min2190,1,1

diff --git a/gridpath/project/availability/availability_types/binary.py b/gridpath/project/availability/availability_types/binary.py
@@ -231,7 +231,7 @@ def total_scheduled_availability_per_period_rule(mod, g, p):
     """
     return (
         sum(
-            mod.AvlBin_Unavailable[g, tmp] * mod.hrs_in_tmp[tmp]
+            mod.AvlBin_Unavailable[g, tmp] * mod.hrs_in_tmp[tmp] * mod.tmp_weight[tmp]
             for tmp in mod.TMPS_IN_PRD[p]
         )
         == mod.avl_bin_unavl_hrs_per_prd[g]

diff --git a/gridpath/project/availability/availability_types/continuous.py b/gridpath/project/availability/availability_types/continuous.py
@@ -235,7 +235,7 @@ def total_scheduled_availability_per_period_rule(mod, g, p):
     """
     return (
         sum(
-            mod.AvlCont_Unavailable[g, tmp] * mod.hrs_in_tmp[tmp]
+            mod.AvlCont_Unavailable[g, tmp] * mod.hrs_in_tmp[tmp] * mod.tmp_weight[tmp]
             for tmp in mod.TMPS_IN_PRD[p]
         )
         == mod.avl_cont_unavl_hrs_per_prd[g]
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		unavailable_hours_per_period,unavailable_hours_per_event_min,available_hours_between_events_min1,1,1
		unavailable_hours_per_period,unavailable_hours_per_event_min,available_hours_between_events_min2190,1,1
Expand Down