diff --git a/gdplib/water_network/wnd.py b/gdplib/water_network/wnd.py index 465dc35..249c15e 100644 --- a/gdplib/water_network/wnd.py +++ b/gdplib/water_network/wnd.py @@ -593,7 +593,7 @@ def unit_exists_or_not(m, unit): # Approximation of the concave capital cost term for the active treatment units in the objective function. - if approximation == 'quadratic': + if approximation == 'quadratic_zero_origin': # New variable for potential term in capital cost. Z = sum(Q)**0.7, Z >= 0 unit_exists.cost_var = pyo.Var( m.TU, @@ -676,7 +676,7 @@ def _cost_nv(unit_exists): == unit_exists.flow[mt, unit] ) - elif approximation == "quadratic2": + elif approximation == "quadratic_nonzero_origin": def _func2(x, a, b, c): """This function computes the quadratic curve fit.