Pump power: Curve reading and linear fitting

src/core/pump.jl

@@ -456,16 +456,39 @@ function _calc_pump_power_points_ne(wm::AbstractWaterModel, nw::Int, pump_id::In
     return q_build, max.(0.0, density * gravity * inv.(eff) .* f_build)
 end
 
+# pump_power_updates
+function modify_pump_power_points(wm::AbstractWaterModel, nw::Int)
+    power_curve_unscaled = ref(wm, nw, :pump_power_curve)
+    bf = wm.ref[:it][wm_it_sym][:base_flow]
+    bm = wm.ref[:it][wm_it_sym][:base_mass]
+    bl = wm.ref[:it][wm_it_sym][:base_length]
+    bt = wm.ref[:it][wm_it_sym][:base_time]
+    bp = bm*(bl^2 / bt^3)
 
-function _calc_pump_power(wm::AbstractWaterModel, nw::Int, pump_id::Int, q::Vector{Float64})
+    q_points_scaled = power_curve_unscaled["q_points"] ./bf
+    f_points_sclaed = power_curve_unscaled["f_points"] ./bp
+
+    return q_points_scaled, f_points_sclaed
+    # make the scaling consistent
+end
+
+function _calc_pump_power_linear_coeff(wm::AbstractWaterModel, nw::Int, z::JuMP.VariableRef)
+    q_true, f_true = modify_pump_power_points(wm, nw)
+    q_array = hcat(q_true, ones(length(q_true)))
+    linear_coefficients = q_array \ f_true
+    return q -> sum(linear_coefficients .*[q, z])
+end
+
+
+function _calc_pump_power(wm::AbstractWaterModel, nw::Int, pump_id::Int)
     q_true, f_true = _calc_pump_power_points(wm, nw, pump_id, 100)
-    return max.(Interpolations.linear_interpolation(q_true, f_true).(q), 0.0)
+    return q -> max.(Interpolations.linear_interpolation(q_true, f_true).(q), 0.0)
 end
 
 
-function _calc_pump_power_ne(wm::AbstractWaterModel, nw::Int, pump_id::Int, q::Vector{Float64})
+function _calc_pump_power_ne(wm::AbstractWaterModel, nw::Int, pump_id::Int)
     q_true, f_true = _calc_pump_power_points_ne(wm, nw, pump_id, 100)
-    return max.(Interpolations.linear_interpolation(q_true, f_true).(q), 0.0)
+    return q -> max.(Interpolations.linear_interpolation(q_true, f_true).(q), 0.0)
 end
 
 
@@ -561,7 +584,7 @@ function _calc_pump_power_quadratic_approximation(wm::AbstractWaterModel, nw::In
 
     # Ensure that a negative constant term does not exist.
     linear_coefficients[3] = max(0.0, linear_coefficients[3])
-    
+
     # Return the least squares-fitted quadratic approximation.
     return x -> sum(linear_coefficients .* [x * x, x, z])
 end

src/core/pump_power_updates.jl

@@ -0,0 +1 @@
+

src/form/ncd.jl

@@ -735,9 +735,10 @@ function constraint_on_off_pump_power(
     z = var(wm, n, :z_pump, a)
 
     # Add constraint equating power with respect to the power curve.
-    power_qa = _calc_pump_power_quadratic_approximation(wm, n, a, z)
-    c_1 = JuMP.@constraint(wm.model, power_qa(q) <= P)
-    c_2 = JuMP.@constraint(wm.model, power_qa(q) >= P)
+    power_qa = _calc_pump_power_linear_coeff(wm, n, z)
+    # power_qa = _calc_pump_power_quadratic_approximation(wm, n, a, z)
+    c_1 = JuMP.@constraint(wm.model, power(q) <= P)
+    c_2 = JuMP.@constraint(wm.model, power(q) >= P)
 
     # Append the :on_off_pump_power constraint array.
     append!(con(wm, n, :on_off_pump_power)[a], [c_1, c_2])
@@ -756,9 +757,9 @@ function constraint_on_off_pump_power_ne(
     z = var(wm, n, :z_ne_pump, a)
 
     # Add constraint equating power with respect to the power curve.
-    power_qa = _calc_pump_power_quadratic_approximation_ne(wm, n, a, z)
-    c_1 = JuMP.@constraint(wm.model, power_qa(q) <= P)
-    c_2 = JuMP.@constraint(wm.model, power_qa(q) >= P)
+    power = _calc_pump_power_linear_coeff(wm, n, z)
+    c_1 = JuMP.@constraint(wm.model, power(q) <= P)
+    c_2 = JuMP.@constraint(wm.model, power(q) >= P)
 
     # Append the :on_off_pump_power constraint array.
     append!(con(wm, n, :on_off_pump_power_ne)[a], [c_1, c_2])