Allow "curtailment" from hydro

staadecker · staadecker · commit 3514883436e7 · 2021-08-03T16:02:21.000-07:00
diff --git a/switch_model/generators/extensions/hydro_simple.py b/switch_model/generators/extensions/hydro_simple.py
@@ -177,7 +177,7 @@ def define_components(mod):
         # Compute the weighted average of the dispatch
         sum(m.DispatchGen[g, t] * m.tp_weight[t] for t in m.TPS_IN_HTS[hts])
         / sum(m.tp_weight[tp] for tp in m.TPS_IN_HTS[hts])
-        == m.hydro_avg_flow_mw[g, hts] * enforce_hydro_avg_flow_scaling_factor
+        <= m.hydro_avg_flow_mw[g, hts] * enforce_hydro_avg_flow_scaling_factor
     )
 
     mod.min_data_check('hydro_min_flow_mw', 'hydro_avg_flow_mw')

Original file line number	Diff line number	Diff line change
`@@ -177,7 +177,7 @@ def define_components(mod):`
`177`	`177`	`# Compute the weighted average of the dispatch`
`178`	`178`	`sum(m.DispatchGen[g, t] * m.tp_weight[t] for t in m.TPS_IN_HTS[hts])`
`179`	`179`	`/ sum(m.tp_weight[tp] for tp in m.TPS_IN_HTS[hts])`
`180`		`- == m.hydro_avg_flow_mw[g, hts] * enforce_hydro_avg_flow_scaling_factor`
	`180`	`+ <= m.hydro_avg_flow_mw[g, hts] * enforce_hydro_avg_flow_scaling_factor`
`181`	`181`	`)`
`182`	`182`
`183`	`183`	`mod.min_data_check('hydro_min_flow_mw', 'hydro_avg_flow_mw')`