diff --git a/src/core/export.jl b/src/core/export.jl index cf9cff96f..f9b17d6dc 100644 --- a/src/core/export.jl +++ b/src/core/export.jl @@ -1,9 +1,9 @@ -# ThreePhasePowerModels exports everything except internal symbols, which are defined as +# PowerModelsDistribution exports everything except internal symbols, which are defined as # those whose name starts with an underscore. If you don't want all of these -# symbols in your environment, then use `import ThreePhasePowerModels` instead of -# `using ThreePhasePowerModels`. +# symbols in your environment, then use `import PowerModelsDistribution` instead of +# `using PowerModelsDistribution`. -# Do not add ThreePhasePowerModels-defined symbols to this exclude list. Instead, rename +# Do not add PowerModelsDistribution-defined symbols to this exclude list. Instead, rename # them with an underscore. const _EXCLUDE_SYMBOLS = [Symbol(@__MODULE__), :eval, :include] @@ -20,9 +20,9 @@ for sym in names(@__MODULE__, all=true) end # the follow items are also exported for user-friendlyness when calling -# `using ThreePhasePowerModels` +# `using PowerModelsDistribution` -# so that users do not need to import JuMP to use a solver with ThreePhasePowerModels +# so that users do not need to import JuMP to use a solver with PowerModelsDistribution import JuMP: with_optimizer export with_optimizer diff --git a/src/io/opendss.jl b/src/io/opendss.jl index 3132f0518..74e1d2f63 100644 --- a/src/io/opendss.jl +++ b/src/io/opendss.jl @@ -1134,7 +1134,7 @@ function _decompose_transformers!(pmd_data; import_all::Bool=false) # 2-WINDING TRANSFORMER trans_dict = Dict{String, Any}() trans_dict["name"] = "tr$(tr_id)_w$(w)" - trans_dict["source_id"] = "$(trans["source_id"])" + trans_dict["source_id"] = "$(trans["source_id"])_$(w)" trans_dict["active_phases"] = [1, 2, 3] _push_dict_ret_key!(pmd_data["trans"], trans_dict) # connection settings diff --git a/test/opendss.jl b/test/opendss.jl index ac3bea113..b430840bc 100644 --- a/test/opendss.jl +++ b/test/opendss.jl @@ -249,7 +249,7 @@ @test pmd["branch"]["1"]["source_id"] == "line.l1" && length(pmd["branch"]["1"]["active_phases"]) == 3 # transformer is no longer a branch - @test pmd["trans"]["1"]["source_id"] == "transformer.t4" # winding indicated by _1 + @test pmd["trans"]["1"]["source_id"] == "transformer.t4_1" # winding indicated by _1 # updated index, reactors shifted @test pmd["branch"]["10"]["source_id"] == "reactor.reactor1" && length(pmd["branch"]["10"]["active_phases"]) == 3