update code in main to new IS code

NREL-Sienna · Apr 25, 2024 · 479e4e6 · 479e4e6
1 parent 1414436
commit 479e4e6
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 42 deletions.
diff --git a/src/core/initial_conditions.jl b/src/core/initial_conditions.jl
@@ -134,16 +134,16 @@ function has_initial_condition_value(
 end
 
 ######################### Initial Conditions Definitions#####################################
-struct DevicePower <: IS.InitialConditionType end
-struct DeviceAboveMinPower <: IS.InitialConditionType end
-struct DeviceStatus <: IS.InitialConditionType end
-struct InitialTimeDurationOn <: IS.InitialConditionType end
-struct InitialTimeDurationOff <: IS.InitialConditionType end
-struct InitialEnergyLevel <: IS.InitialConditionType end
-struct AreaControlError <: IS.InitialConditionType end
+struct DevicePower <: InitialConditionType end
+struct DeviceAboveMinPower <: InitialConditionType end
+struct DeviceStatus <: InitialConditionType end
+struct InitialTimeDurationOn <: InitialConditionType end
+struct InitialTimeDurationOff <: InitialConditionType end
+struct InitialEnergyLevel <: InitialConditionType end
+struct AreaControlError <: InitialConditionType end
 
 # Decide whether to run the initial conditions reconciliation algorithm based on the presence of any of these
-requires_reconciliation(::Type{<:IS.InitialConditionType}) = false
+requires_reconciliation(::Type{<:InitialConditionType}) = false
 
 requires_reconciliation(::Type{InitialTimeDurationOn}) = true
 requires_reconciliation(::Type{InitialTimeDurationOff}) = true

diff --git a/src/core/variables.jl b/src/core/variables.jl
@@ -120,9 +120,9 @@ struct SystemBalanceSlackDown <: VariableType end
 
 struct ReserveRequirementSlack <: VariableType end
 
-struct FlowActivePowerSlackUpperBound <: IS.VariableType end
+struct FlowActivePowerSlackUpperBound <: VariableType end
 
-struct FlowActivePowerSlackLowerBound <: IS.VariableType end
+struct FlowActivePowerSlackLowerBound <: VariableType end
 
 """
 Struct to dispatch the creation of Voltage Magnitude Variables for AC formulations

diff --git a/src/devices_models/device_constructors/branch_constructor.jl b/src/devices_models/device_constructors/branch_constructor.jl
@@ -528,7 +528,7 @@ end
 function construct_device!(
     container::OptimizationContainer,
     sys::PSY.System,
-    ::IS.ModelConstructStage,
+    ::ModelConstructStage,
     device_model::DeviceModel{<:TwoTerminalHVDCTypes, HVDCTwoTerminalUnbounded},
     ::NetworkModel{<:PM.AbstractPowerModel},
 )

diff --git a/src/parameters/update_parameters.jl b/src/parameters/update_parameters.jl
@@ -339,7 +339,6 @@ function update_container_parameter_values!(
 ) where {T <: ParameterType, U <: PSY.Component}
     # Enable again for detailed debugging
     # TimerOutputs.@timeit RUN_SIMULATION_TIMER "$T $U Parameter Update" begin
-    optimization_container = get_optimization_container(model)
     # Note: Do not instantite a new key here because it might not match the param keys in the container
     # if the keys have strings in the meta fields
     parameter_array = get_parameter_array(optimization_container, key)
@@ -374,7 +373,7 @@ end
 function update_container_parameter_values!(
     optimization_container::OptimizationContainer,
     model::OperationModel,
-    key::IS.ParameterKey{FixValueParameter, U},
+    key::ParameterKey{FixValueParameter, U},
     input::DatasetContainer{InMemoryDataset},
 ) where {U <: PSY.Component}
     # Note: Do not instantite a new key here because it might not match the param keys in the container
@@ -386,22 +385,6 @@ function update_container_parameter_values!(
     return
 end
 
-function update_container_parameter_values!(
-    optimization_container::OptimizationContainer,
-    model::OperationModel,
-    key::ParameterKey{T, U},
-    input::DatasetContainer{InMemoryDataset},
-) where {T <: ParameterType, U <: PSY.Service}
-    # Note: Do not instantite a new key here because it might not match the param keys in the container
-    # if the keys have strings in the meta fields
-    parameter_array = get_parameter_array(optimization_container, key)
-    parameter_attributes = get_parameter_attributes(optimization_container, key)
-    service = PSY.get_component(U, get_system(model), key.meta)
-    @assert service !== nothing
-    _update_parameter_values!(parameter_array, parameter_attributes, service, model, input)
-    return
-end
-
 function update_container_parameter_values!(
     optimization_container::OptimizationContainer,
     model::OperationModel,
@@ -425,7 +408,7 @@ function update_parameter_values!(
     model::OperationModel,
     key::ParameterKey{T, U},
     input::DatasetContainer{InMemoryDataset},
-) where {T <: IS.ParameterType, U <: PSY.Component}
+) where {T <: ParameterType, U <: PSY.Component}
     # Enable again for detailed debugging
     # TimerOutputs.@timeit RUN_SIMULATION_TIMER "$T $U Parameter Update" begin
     optimization_container = get_optimization_container(model)

diff --git a/src/simulation/decision_model_simulation_results.jl b/src/simulation/decision_model_simulation_results.jl
@@ -262,7 +262,7 @@ function _read_results(
     cols::Union{Colon, Vector{String}} = (:),
 )
     vals = _read_results(res, result_keys, timestamps, store)
-    converted_vals = Dict{IS.OptimizationContainerKey, ResultsByTime{Matrix{Float64}}}()
+    converted_vals = Dict{OptimizationContainerKey, ResultsByTime{Matrix{Float64}}}()
     for (result_key, result_data) in vals
         inner_converted = SortedDict(
             (date_key, Matrix{Float64}(permutedims(inner_data[cols, :].data)))

diff --git a/src/simulation/simulation_problem_results.jl b/src/simulation/simulation_problem_results.jl
@@ -79,27 +79,27 @@ function set_results_timestamps!(
     result.results_timestamps = results_timestamps
 end
 
-list_result_keys(res::SimulationProblemResults, ::IS.AuxVarKey) = list_aux_variable_keys(res)
-list_result_keys(res::SimulationProblemResults, ::IS.ConstraintKey) = list_dual_keys(res)
-list_result_keys(res::SimulationProblemResults, ::IS.ExpressionKey) =
+list_result_keys(res::SimulationProblemResults, ::AuxVarKey) = list_aux_variable_keys(res)
+list_result_keys(res::SimulationProblemResults, ::ConstraintKey) = list_dual_keys(res)
+list_result_keys(res::SimulationProblemResults, ::ExpressionKey) =
     list_expression_keys(res)
-list_result_keys(res::SimulationProblemResults, ::IS.ParameterKey) =
+list_result_keys(res::SimulationProblemResults, ::ParameterKey) =
     list_parameter_keys(res)
-list_result_keys(res::SimulationProblemResults, ::IS.VariableKey) = list_variable_keys(res)
+list_result_keys(res::SimulationProblemResults, ::VariableKey) = list_variable_keys(res)
 
-get_cached_results(res::SimulationProblemResults, ::Type{<:IS.AuxVarKey}) =
+get_cached_results(res::SimulationProblemResults, ::Type{<:AuxVarKey}) =
     get_cached_aux_variables(res)
-get_cached_results(res::SimulationProblemResults, ::Type{<:IS.ConstraintKey}) =
+get_cached_results(res::SimulationProblemResults, ::Type{<:ConstraintKey}) =
     get_cached_duals(res)
-get_cached_results(res::SimulationProblemResults, ::Type{<:IS.ExpressionKey}) =
+get_cached_results(res::SimulationProblemResults, ::Type{<:ExpressionKey}) =
     get_cached_expressions(res)
-get_cached_results(res::SimulationProblemResults, ::Type{<:IS.ParameterKey}) =
+get_cached_results(res::SimulationProblemResults, ::Type{<:ParameterKey}) =
     get_cached_parameters(res)
-get_cached_results(res::SimulationProblemResults, ::Type{<:IS.VariableKey}) =
+get_cached_results(res::SimulationProblemResults, ::Type{<:VariableKey}) =
     get_cached_variables(res)
 get_cached_results(
     res::SimulationProblemResults,
-    ::Type{<:IS.OptimizationContainerKey} = OptimizationContainerKey,
+    ::Type{<:OptimizationContainerKey} = OptimizationContainerKey,
 ) =
     merge(  # PERF: could be done lazily
         get_cached_aux_variables(res),