Merge branch 'jd/move_structs_to_is' of https://github.com/NREL-SIIP/…

…PowerSimulations.jl into jd/move_structs_to_is
NREL-Sienna · Apr 25, 2024 · 65d5c37 · 65d5c37
2 parents ea603f6 + b055ff6
commit 65d5c37
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/PowerSimulations.jl b/src/PowerSimulations.jl
@@ -370,6 +370,8 @@ import InfrastructureSystems.Optimization: read_optimizer_stats, get_optimizer_s
 import InfrastructureSystems.Optimization: ArgumentConstructStage, ModelConstructStage
 import InfrastructureSystems.Optimization: OptimizationContainerKey, VariableKey,
     ConstraintKey, ExpressionKey, AuxVarKey, InitialConditionKey, ParameterKey
+import InfrastructureSystems.Optimization:
+    RightHandSideParameter, ObjectiveFunctionParameter, TimeSeriesParameter
 import InfrastructureSystems.Optimization: VariableType, ConstraintType, AuxVariableType,
     ParameterType, InitialConditionType, ExpressionType
 import InfrastructureSystems.Optimization: should_export_variable, should_export_dual,

diff --git a/src/initial_conditions/initialization.jl b/src/initial_conditions/initialization.jl
@@ -75,7 +75,7 @@ function build_initial_conditions_model!(model::T) where {T <: OperationModel}
     ic_container.built_for_recurrent_solves = false
     set_horizon!(ic_settings, min(INITIALIZATION_PROBLEM_HORIZON, main_problem_horizon))
     init_optimization_container!(
-        model.internal.ic_model_container,
+        IS.Optimization.get_initial_conditions_model_container(internal),
         get_network_model(get_template(model)),
         get_system(model),
     )