Merge pull request #117 from REAM-lab/hotfix/hydro_constraint

Revert inequality to equality for the hydro simple module

REAM Model Changelog.md

@@ -1,7 +1,7 @@
 # REAM Model Breaking Changes
 
 This file specifies the breaking changes that we have done to the model.
-A breaking change is any change that would change the results of previously
+A breaking change is any change that might change the results of previously
 completed runs.
 
 ## List of breaking changes to model
@@ -17,4 +17,5 @@ Changes are listed from oldest (first line) to newest (last line of table).
 | #57 | June 2021 | Specify predetermined storage energy capacity in inputs (previously left unspecified). |
 | #68 | June 2021 | Change financial params to 2018 dollars & 5% interest rate. Start using terrain multipliers (which now include the economic multiplier). |
 | #72 | July 2021 | Drop build and O&M costs of existing transmission lines. |
-| #89 | August 2021 | Change hydro module average flow constraint to a monthly constraint rather than per timeseries and change it to a <= rather than ==. |
+| #89 | August 2021 | Change hydro module average flow constraint to a monthly constraint rather than per timeseries and change it to a <= rather than ==. |
+| #117 | January 2022 | Revert hydro module change (#89) to disallow curtailment of hydro (see #114). |

switch_model/generators/extensions/hydro_simple.py

@@ -175,7 +175,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')