Removing print statements

lanl-ansi · Mar 24, 2023 · 7d6d45e · 7d6d45e
1 parent 61accbb
commit 7d6d45e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 11 deletions.
diff --git a/src/WaterModels.jl b/src/WaterModels.jl
@@ -102,7 +102,6 @@ include("util/obbt.jl")
 # Deprecated functions.
 include("deprecated.jl")
 
-println("Running the cleaned up version of WaterModels.jl")
 # This must be included last to support automated export.
 include("core/export.jl")
 

diff --git a/src/core/pump.jl b/src/core/pump.jl
@@ -7,12 +7,10 @@ end
 
 
 function correct_ne_pumps!(data::Dict{String, <:Any})
-    if(haskey(data,"ne_pump"))
-        wm_data = get_wm_data(data)
-        base_flow = wm_data["per_unit"] ? wm_data["base_flow"] : 1.0
-        correction_func = x -> _correct_ne_pumps!(x, base_flow)
-        apply_wm!(correction_func, data; apply_to_subnetworks = true)
-    end
+    wm_data = get_wm_data(data)
+    base_flow = wm_data["per_unit"] ? wm_data["base_flow"] : 1.0
+    correction_func = x -> _correct_ne_pumps!(x, base_flow)
+    apply_wm!(correction_func, data; apply_to_subnetworks = true)
 end
 
 
@@ -409,7 +407,7 @@ function _calc_pump_power_points(wm::AbstractWaterModel, nw::Int, pump_id::Int,
     q_min = max(get(pump, "flow_min_forward", _flow_min), _flow_min)
 
     q_max = max(q_min, pump["flow_max"])
-    q_build = range(q_min - 1.0e-7, stop = q_max + 1.0e-7, length = num_points)
+    q_build = range(0.0, stop = q_max + 1.0e-7, length = num_points)
     f_build = head_curve_function.(collect(q_build)) .* q_build
 
     if haskey(pump, "efficiency_curve")
@@ -429,7 +427,7 @@ function _calc_pump_power_points(wm::AbstractWaterModel, nw::Int, pump_id::Int,
 end
 
 
-function _calc_pump_power_points_ne(wm::AbstractWaterModel, nw::Int, pump_id::Int, num_points::Int)
+function _calc_ne_pump_power_points(wm::AbstractWaterModel, nw::Int, pump_id::Int, num_points::Int)
     ne_pump = ref(wm, nw, :ne_pump, pump_id)
     head_curve_function = ref(wm, nw, :ne_pump, pump_id, "head_curve_function")
 
@@ -467,7 +465,7 @@ end
 
 function _calc_pump_power_ne(wm::AbstractWaterModel, nw::Int, pump_id::Int, q::Vector{Float64})
     q_true, f_true = _calc_pump_power_points_ne(wm, nw, pump_id, 100)
-    return max.(Interpolations.LinearInterpolation(q_true, f_true).(q), 0.0)
+    return max.(Interpolations.linear_interpolation(q_true, f_true).(q), 0.0)
 end
 
 

diff --git a/src/prob/wf.jl b/src/prob/wf.jl
@@ -119,7 +119,6 @@ function build_wf(wm::AbstractWaterModel)
 
     # Add the objective.
     objective_wf(wm)
-    println(wm.model)
 end
-Original file line number
+Diff line change
@@ Expand Up / @@ -119,7 +119,6 @@ function build_wf(wm::AbstractWaterModel) @@
         # Add the objective.
         objective_wf(wm)
-        println(wm.model)
     end
@@ Expand Down @@