Standardize OperationalCost naming

NREL-Sienna · Mar 31, 2024 · 31b848a · 31b848a
1 parent d63dae6
commit 31b848a
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 15 deletions.
diff --git a/src/PowerSystems.jl b/src/PowerSystems.jl
@@ -603,9 +603,9 @@ include("models/operational_cost.jl")
 include("models/cost_functions/ValueCurves.jl")
 include("models/cost_functions/variable_cost.jl")
 include("models/cost_functions/MarketBidCost.jl")
-include("models/cost_functions/HydroPowerCost.jl")
+include("models/cost_functions/HydroGenerationCost.jl")
 include("models/cost_functions/LoadCost.jl")
-include("models/cost_functions/RenewablePowerCost.jl")
+include("models/cost_functions/RenewableGenerationCost.jl")
 include("models/cost_functions/StorageCost.jl")
 include("models/cost_functions/ThermalGenerationCost.jl")
 

diff --git a/src/descriptors/power_system_structs.json b/src/descriptors/power_system_structs.json
@@ -3514,7 +3514,7 @@
                 },
                 {
                     "name": "operation_cost",
-                    "null_value": "RenewablePowerCost(nothing)",
+                    "null_value": "RenewableGenerationCost(nothing)",
                     "data_type": "OperationalCost",
                     "comment": "Operation Cost of Generation [`OperationalCost`](@ref)"
                 },

diff --git a/src/models/cost_functions/HydroPowerCost.jl → ...els/cost_functions/HydroGenerationCost.jl b/src/models/cost_functions/HydroPowerCost.jl → ...els/cost_functions/HydroGenerationCost.jl
diff --git a/...dels/cost_functions/RenewablePowerCost.jl → ...cost_functions/RenewableGenerationCost.jl b/...dels/cost_functions/RenewablePowerCost.jl → ...cost_functions/RenewableGenerationCost.jl
@@ -1,5 +1,5 @@
 """
-    mutable struct RenewablePowerCost <: OperationalCost
+    mutable struct RenewableGenerationCost <: OperationalCost
         variable::CostCurve
         curtailment_cost::CostCurve
     end
@@ -12,29 +12,29 @@ curtailment Costs can be used to represent the loss of tax incentives.
 - `variable::CostCurve`: Variable cost.
 - `curtailment_cost::CostCurve`: Input/output cost of curtailing power.
 """
-mutable struct RenewablePowerCost <: OperationalCost
+mutable struct RenewableGenerationCost <: OperationalCost
     "variable cost"
     variable::CostCurve
     "curtailment cost"
     curtailment_cost::CostCurve
 end
 
-function RenewablePowerCost(;
+function RenewableGenerationCost(;
     variable,
     curtailment_cost = InputOutputCostCurve(LinearFunctionData(0.0)),
 )
-    RenewablePowerCost(variable, curtailment_cost)
+    RenewableGenerationCost(variable, curtailment_cost)
 end
 
 # Constructor for demo purposes; non-functional.
-function RenewablePowerCost(::Nothing)
-    RenewablePowerCost(;
+function RenewableGenerationCost(::Nothing)
+    RenewableGenerationCost(;
         variable = InputOutputCostCurve(LinearFunctionData(0.0)),
     )
 end
 
-"""Get [`RenewablePowerCost`](@ref) `variable`."""
-get_variable(value::RenewablePowerCost) = value.variable
+"""Get [`RenewableGenerationCost`](@ref) `variable`."""
+get_variable(value::RenewableGenerationCost) = value.variable
 
-"""Set [`RenewablePowerCost`](@ref) `variable`."""
-set_variable!(value::RenewablePowerCost, val) = value.variable = val
+"""Set [`RenewableGenerationCost`](@ref) `variable`."""
+set_variable!(value::RenewableGenerationCost, val) = value.variable = val
diff --git a/src/models/generated/RenewableDispatch.jl b/src/models/generated/RenewableDispatch.jl
@@ -95,7 +95,7 @@ function RenewableDispatch(::Nothing)
         prime_mover_type=PrimeMovers.OT,
         reactive_power_limits=nothing,
         power_factor=1.0,
-        operation_cost=RenewablePowerCost(nothing),
+        operation_cost=RenewableGenerationCost(nothing),
         base_power=0.0,
         services=Device[],
         dynamic_injector=nothing,

diff --git a/src/parsers/power_models_data.jl b/src/parsers/power_models_data.jl
@@ -349,7 +349,7 @@ function make_hydro_gen(gen_name, d, bus, sys_mbase)
 end
 
 function make_renewable_dispatch(gen_name, d, bus, sys_mbase)
-    cost = RenewablePowerCost(; variable = InputOutputCostCurve(LinearFunctionData(0.0)))
+    cost = RenewableGenerationCost(; variable = InputOutputCostCurve(LinearFunctionData(0.0)))
     base_conversion = sys_mbase / d["mbase"]
 
     rating = calculate_rating(d["pmax"], d["qmax"])