Linear fit for NCD pump power

src/core/objective.jl

@@ -85,34 +85,25 @@ cost of building and operating all network expansion components is minimized.
 """
 function objective_ne(wm::AbstractWaterModel)::JuMP.AffExpr
     # Get all network IDs in the multinetwork.
-    network_ids = sort(collect(nw_ids(wm)))
+    first_network_id = sort(collect(nw_ids(wm)))[1]
 
-    # Find the network IDs over which the objective will be defined.
-    if length(network_ids) > 1
-        network_ids_flow = network_ids[1]
-        # network_ids_flow = network_ids[1:end-1]
-    else
-        network_ids_flow = network_ids
-    end
 
     # Initialize the objective expression to zero.
     objective = JuMP.AffExpr(0.0)
 
-    for n in network_ids_flow
-        # Get the set of network expansion short pipes at time index `n`.
-        for (a, ne_short_pipe) in ref(wm, n, :ne_short_pipe)
-            # Add the cost of network expansion component `a` at time period `n`.
-            term = ne_short_pipe["construction_cost"] * var(wm, n, :z_ne_short_pipe, a)
-            JuMP.add_to_expression!(objective, term)
-        end
-
-        # Get the set of network expansion pumps at time index `n`.
-        for (a, ne_pump) in ref(wm, n, :ne_pump)
-            # Add the cost of network expansion component `a` at time period `n`.
-            term = ne_pump["construction_cost"] * var(wm, n, :x_ne_pump, a)
-            JuMP.add_to_expression!(objective, term)
-        end
+n = first_network_id
+    # Get the set of network expansion short pipes at time index `n`.
+    for (a, ne_short_pipe) in ref(wm, n, :ne_short_pipe)
+        # Add the cost of network expansion component `a` at time period `n`.
+        term = ne_short_pipe["construction_cost"] * var(wm, n, :z_ne_short_pipe, a)
+        JuMP.add_to_expression!(objective, term)
+    end
 
+    # Get the set of network expansion pumps at time index `n`.
+    for (a, ne_pump) in ref(wm, n, :ne_pump)
+        # Add the cost of network expansion component `a` at time period `n`.
+        term = ne_pump["construction_cost"] * var(wm, n, :x_ne_pump, a)
+        JuMP.add_to_expression!(objective, term)
     end
 
     # Minimize the total cost of network expansion.

src/form/ncd.jl

@@ -735,10 +735,11 @@ 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_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)
+    power_la = _calc_pump_power_linear_coeff(wm, n, z)
+        println("power_la = $power_la")
+    # power_la = _calc_pump_power_quadratic_approximation(wm, n, a, z)
+    c_1 = JuMP.@constraint(wm.model, power_la(q) <= P)
+    c_2 = JuMP.@constraint(wm.model, power_la(q) >= P)
 
     # Append the :on_off_pump_power constraint array.
     append!(con(wm, n, :on_off_pump_power)[a], [c_1, c_2])
@@ -757,9 +758,10 @@ 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 = _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)
+    # power_la = _calc_pump_power_quadratic_approximation_ne(wm, n, a, z)
+    power_la = _calc_pump_power_linear_coeff(wm, n, z)
+    c_1 = JuMP.@constraint(wm.model, power_la(q) <= P)
+    c_2 = JuMP.@constraint(wm.model, power_la(q) >= P)
 
     # Append the :on_off_pump_power constraint array.
     append!(con(wm, n, :on_off_pump_power_ne)[a], [c_1, c_2])