Debugging code

Author: toddleif

src/constraints/electric_utility_constraints.jl

@@ -1,6 +1,6 @@
 # REopt®, Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/REopt.jl/blob/master/LICENSE.
 function add_export_constraints(m, p; _n="")
-
+    print("\n #1: p.techs.all is: $(p.techs.all)")
     ##Constraint (8e): Production export and curtailment no greater than production
     @constraint(m, [t in p.techs.elec, ts in p.time_steps_with_grid],
         p.production_factor[t,ts] * p.levelization_factor[t] * m[Symbol("dvRatedProduction"*_n)][t,ts] 
@@ -384,8 +384,8 @@ end
 
 
 function add_elec_utility_expressions(m, p; _n="")
-
-    if !isempty(p.s.electric_tariff.export_bins) && !isempty(p.techs.all)
+    # TODO: if prefered, change the if statement below so that the hydropower does not need to be called out separately (note: hydro is removed from p.techs.all in reopt.jl in this line of code: NonHydroTechs = filter!(x->x != hydropower_tech, p.techs.all))
+    if (!isempty(p.s.electric_tariff.export_bins) && !isempty(p.techs.all)) || (!isempty(p.techs.existing_hydropower))
         # NOTE: levelization_factor is baked into dvProductionToGrid
         m[Symbol("TotalExportBenefit"*_n)] = m[Symbol("NEM_benefit"*_n)] + m[Symbol("WHL_benefit"*_n)] +
                                              m[Symbol("EXC_benefit"*_n)]

src/constraints/existing_hydropower_constraints.jl

@@ -70,6 +70,7 @@ function add_existing_hydropower_constraints(m,p)
 
 	elseif p.s.existing_hydropower.computation_type == "fixed_efficiency_linearized_reservoir_head"
 		@info "Adding hydropower power output constraint using a fixed efficiency and linearized reservoir head"
+		# TODO: make an option that is like this, but linearized using discretization
 
         @variable(m, reservoir_head[ts in p.time_steps] >= 0)
 
@@ -111,6 +112,8 @@ function add_existing_hydropower_constraints(m,p)
 		throw(@error("Invalid input for the computation_type field"))
 	end
 
+	print("*********The p.techs.elec are: $(p.techs.elec)")
+
 	# Total water volume is between the max and min levels
 	@constraint(m, [ts in p.time_steps],
 		m[:dvWaterVolume][ts] <= p.s.existing_hydropower.cubic_meter_maximum
@@ -288,8 +291,9 @@ function add_existing_hydropower_constraints(m,p)
 			@constraint(m, !m[:indicator_turbine_turn_off][t, ts] => { m[:binTurbineActive][t,ts+1] - m[:binTurbineActive][t,ts] >= 0  } )
 		end
 	end
+	
 	# TODO: remove this constraint, which prevents a spike in the spillway use during the first time step
-	#@constraint(m, [ts in p.time_steps], m[:dvSpillwayWaterFlow][1] == 0)
+	@constraint(m, [ts in p.time_steps], m[:dvSpillwayWaterFlow][1] == 0)
 
 end
 

src/core/reopt.jl

@@ -274,6 +274,8 @@ function build_reopt!(m::JuMP.AbstractModel, p::REoptInputs)
 	m[:ResidualGHXCapCost] = 0.0
 	m[:ObjectivePenalties] = 0.0
 
+	print("\n ****************** The no curtail techs are: $(p.techs.no_curtail)")
+
 	if !isempty(p.techs.all)
 		add_tech_size_constraints(m, p)
 
@@ -384,7 +386,6 @@ function build_reopt!(m::JuMP.AbstractModel, p::REoptInputs)
         add_coincident_peak_charge_constraints(m, p)
     end
 
-
 	# Remove hydropower from the calculation:
 	NonHydroTechs=[]
 	for hydropower_tech in p.techs.existing_hydropower
@@ -396,7 +397,6 @@ function build_reopt!(m::JuMP.AbstractModel, p::REoptInputs)
         m[:TotalTechCapCosts] += p.third_party_factor *
             sum( p.cap_cost_slope[t] * m[:dvPurchaseSize][t] for t in setdiff(NonHydroTechs, p.techs.segmented))
     end
-
     if !isempty(p.techs.segmented)
         @warn "Adding binary variable(s) to model cost curves"
         add_cost_curve_vars_and_constraints(m, p)
@@ -407,7 +407,6 @@ function build_reopt!(m::JuMP.AbstractModel, p::REoptInputs)
             )
         end
     end
-	
 	@expression(m, TotalStorageCapCosts, p.third_party_factor * (
 		sum( p.s.storage.attr[b].net_present_cost_per_kw * m[:dvStoragePower][b] for b in p.s.storage.types.elec) + 
 		sum( p.s.storage.attr[b].net_present_cost_per_kwh * m[:dvStorageEnergy][b] for b in p.s.storage.types.all )
@@ -518,7 +517,7 @@ function build_reopt!(m::JuMP.AbstractModel, p::REoptInputs)
 		add_to_expression!(Costs, m[:Lifecycle_Emissions_Cost_Health])
 	end
 	if "ExistingHydropower_Turbine1" in p.techs.elec
-		print("\n Adding hydro to the objective function")
+		print("\n Adding spillway water flow to the objective function to minimize the spillway water flow")
 		add_to_expression!(Costs, sum(m[:dvSpillwayWaterFlow][ts] for ts in p.time_steps)) # minimize the water that is released in the spillway
 	end
 	## Modify objective with incentives that are not part of the LCC

src/core/reopt_inputs.jl

@@ -431,10 +431,10 @@ function setup_tech_inputs(s::AbstractScenario)
     else
         heating_cop["ElectricHeater"] = 1.0
     end
-
-    if "ExistingHydropower_Turbine1" in techs.all
+    
+    if "ExistingHydropower_Turbine1" in techs.all   # Note: the setup_existing_hydropower_inputs function adds inputs for the other turbine numbers
         print("\n Setting up Existing Hydropower in the reopt inputs file")
-        setup_existing_hydropower_inputs(s, existing_hydropower_inputs, techs_by_exportbin, production_factor)
+        setup_existing_hydropower_inputs(s, existing_hydropower_inputs, techs_by_exportbin, production_factor, techs)
     else
         print("\n Existing Hydropower is not in the techs")
         #existing_hydropower["existing_kw_per_turbine"] = 0
@@ -645,13 +645,17 @@ function setup_wind_inputs(s::AbstractScenario, max_sizes, min_sizes, existing_s
     return nothing
 end
 
-function setup_existing_hydropower_inputs(s::AbstractScenario, existing_hydropower_inputs, techs_by_exportbin, production_factor)
+function setup_existing_hydropower_inputs(s::AbstractScenario, existing_hydropower_inputs, techs_by_exportbin, production_factor, techs)
     existing_hydropower_inputs["existing_kw_per_turbine"] = s.existing_hydropower.existing_kw_per_turbine
      for i in 1:s.existing_hydropower.number_of_turbines
         # TODO: update so that hydropower works with 15 min and 30 min interval data too
         production_factor["ExistingHydropower_Turbine"*string(i),:] = ones(8760 * s.settings.time_steps_per_hour) # get_production_factor(s.existing_hydropower; s.settings.time_steps_per_hour)
         fillin_techs_by_exportbin(techs_by_exportbin, s.existing_hydropower, "ExistingHydropower_Turbine"*string(i))
 
+        if !(s.existing_hydropower.can_curtail)
+            push!(techs.no_curtail, "ExistingHydropower_Turbine"*string(i))
+        end
+        
     end
     return nothing 
 end