Add fields to PowerFlowEvaluationModels to support further PSI integration

src/PowerFlowData.jl

@@ -1,4 +1,4 @@
-Base.@kwdef mutable struct SolverData
+@kwdef mutable struct SolverData
     J::Union{SparseMatrixCSC{Float64, Int}, Nothing} = nothing
     dSbus_dV_ref::Union{Vector{Float64}, Nothing} = nothing
 end

src/PowerFlows.jl

@@ -18,6 +18,7 @@ export write_export
 export get_psse_export_paths
 export penalty_factors
 
+import Base: @kwdef
 import Logging
 import DataFrames
 import PowerSystems

src/powerflow_types.jl

@@ -6,24 +6,53 @@ struct NLSolveACPowerFlow <: ACPowerFlowSolverType end
 
 struct ACPowerFlow{ACSolver <: ACPowerFlowSolverType} <: PowerFlowEvaluationModel
     check_reactive_power_limits::Bool
+    exporter::Union{Nothing, PowerFlowEvaluationModel}
 end
 
 ACPowerFlow{ACSolver}(;
     check_reactive_power_limits::Bool = false,
+    exporter::Union{Nothing, PowerFlowEvaluationModel} = nothing,
 ) where {ACSolver <: ACPowerFlowSolverType} =
-    ACPowerFlow{ACSolver}(check_reactive_power_limits)
+    ACPowerFlow{ACSolver}(check_reactive_power_limits, exporter)
 
 ACPowerFlow(
     ACSolver::Type{<:ACPowerFlowSolverType} = KLUACPowerFlow;
     check_reactive_power_limits::Bool = false,
-) = ACPowerFlow{ACSolver}(check_reactive_power_limits)
+    exporter::Union{Nothing, PowerFlowEvaluationModel} = nothing,
+) = ACPowerFlow{ACSolver}(check_reactive_power_limits, exporter)
 
-struct DCPowerFlow <: PowerFlowEvaluationModel end
-struct PTDFDCPowerFlow <: PowerFlowEvaluationModel end
-struct vPTDFDCPowerFlow <: PowerFlowEvaluationModel end
+@kwdef struct DCPowerFlow <: PowerFlowEvaluationModel
+    exporter::Union{Nothing, PowerFlowEvaluationModel} = nothing
+end
+
+@kwdef struct PTDFDCPowerFlow <: PowerFlowEvaluationModel
+    exporter::Union{Nothing, PowerFlowEvaluationModel} = nothing
+end
+
+@kwdef struct vPTDFDCPowerFlow <: PowerFlowEvaluationModel
+    exporter::Union{Nothing, PowerFlowEvaluationModel} = nothing
+end
 
-Base.@kwdef struct PSSEExportPowerFlow <: PowerFlowEvaluationModel
+@kwdef struct PSSEExportPowerFlow <: PowerFlowEvaluationModel
     psse_version::Symbol
     export_dir::AbstractString
     write_comments::Bool = false
+    overwrite::Bool = false
+end
+
+get_exporter(pfem::PowerFlowEvaluationModel) = pfem.exporter
+get_exporter(::PSSEExportPowerFlow) = nothing
+
+"""
+Expand a single `PowerFlowEvaluationModel` into its possibly multiple parts for separate
+evaluation. Namely, if `pfem` contains a non-nothing `exporter`, return `[pfem, exporter]`,
+else return `[pfem]`.
+"""
+function flatten_power_flow_evaluation_model(pfem::PowerFlowEvaluationModel)
+    exporter = get_exporter(pfem)
+    return if isnothing(exporter)
+        PowerFlowEvaluationModel[pfem]
+    else
+        PowerFlowEvaluationModel[pfem, exporter]
+    end
 end

src/psse_export.jl

@@ -1337,6 +1337,7 @@ make_power_flow_container(pfem::PSSEExportPowerFlow, sys::PSY.System; kwargs...)
         pfem.export_dir;
         write_comments = pfem.write_comments,
         step = (0, 0),
+        overwrite = pfem.overwrite,
     )
 
 solve_powerflow!(exporter::PSSEExporter) = write_export(exporter)