Skip to content

Commit

Permalink
undo changes to some files
Browse files Browse the repository at this point in the history
undo changes to files which are comment-only or whitespace-only
  • Loading branch information
qluo0320github committed Nov 28, 2023
1 parent eb157d1 commit 15ba005
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
4 changes: 4 additions & 0 deletions src/model/core/discharge/discharge.jl
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ function discharge!(EP::Model, inputs::Dict, setup::Dict)
# Energy injected into the grid by resource "y" at hour "t"
@variable(EP, vP[y=1:G,t=1:T] >=0);

### Expressions ###

## Objective Function Expressions ##

# Variable costs of "generation" for resource "y" during hour "t" = variable O&M
@expression(EP, eCVar_out[y=1:G,t=1:T], (inputs["omega"][t]*(dfGen[y,:Var_OM_Cost_per_MWh]*vP[y,t])))
# Sum individual resource contributions to variable discharging costs to get total variable discharging costs
Expand Down
6 changes: 3 additions & 3 deletions src/write_outputs/write_costs.jl
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ function write_costs(path::AbstractString, inputs::Dict, setup::Dict, EP::Model)
if haskey(inputs, "MinCapPriceCap")
dfCost[9,2] += value(EP[:eTotalCMinCapSlack])
end

if !isempty(VRE_STOR)
dfCost[!,2][11] = value(EP[:eTotalCGrid]) * (setup["ParameterScale"] == 1 ? ModelScalingFactor^2 : 1)
end
Expand Down Expand Up @@ -115,7 +115,7 @@ function write_costs(path::AbstractString, inputs::Dict, setup::Dict, EP::Model)

tempCVar = sum(value.(EP[:eCVar_out][Y_ZONE,:]))
tempCTotal += tempCVar

tempCFuel = sum(value.(EP[:ePlantCFuelOut][Y_ZONE,:]))
tempCTotal += tempCFuel

Expand Down Expand Up @@ -240,7 +240,7 @@ function write_costs(path::AbstractString, inputs::Dict, setup::Dict, EP::Model)
if !isempty(ELECTROLYZERS_ZONE)
push!(temp_cost_list,tempHydrogenValue)
end

dfCost[!,Symbol("Zone$z")] = temp_cost_list
end
CSV.write(joinpath(path, "costs.csv"), dfCost)
Expand Down

0 comments on commit 15ba005

Please sign in to comment.