WIP

Author: YingboMa

src/systems/connectors.jl

@@ -177,15 +177,15 @@ end
 function find_connection(connector_name, ogsys, names)
     cs = get_connections(ogsys)
     cs === nothing || for c in cs
-        renamespace(names, connector_name) in c && return ogsys, c
+        renamespace(names, connector_name) in c && return names, c
     end
     innersys = ogsys
     for (i, n) in enumerate(names)
         innersys = getproperty(innersys, n)
         cs = get_connections(innersys)
         cs === nothing || for c in cs
             nn = @view names[i+1:end]
-            renamespace(nn, connector_name) in c && return innersys, c
+            renamespace(nn, connector_name) in c && return nn, c
         end
     end
     error("$connector_name cannot be found in $(nameof(ogsys)) with levels $(names)")
@@ -200,7 +200,9 @@ function flowvar(sys::AbstractSystem)
     error("There in no flow variable in $(nameof(sys))")
 end
 
-function expand_instream(ogsys, sys::AbstractSystem=ogsys, names=[]; debug=false)
+positivemax(m, ::Any; tol=nothing)= max(m, something(tol, 1e-8))
+
+function expand_instream(ogsys, sys::AbstractSystem=ogsys, names=[]; debug=false, tol=nothing)
     subsys = get_systems(sys)
     isempty(subsys) && return sys
 
@@ -209,6 +211,8 @@ function expand_instream(ogsys, sys::AbstractSystem=ogsys, names=[]; debug=false
         n = nameof(s)
         expand_instream(ogsys, s, [names; n], debug=debug)
     end
+
+    sys = flatten(sys)
     eqs′ = get_eqs(sys)
     eqs = Equation[]
     instream_eqs = Equation[]
@@ -225,79 +229,78 @@ function expand_instream(ogsys, sys::AbstractSystem=ogsys, names=[]; debug=false
 
     sub = Dict()
     seen = Set()
-    additional_eqs = Equation[]
+    #additional_eqs = Equation[]
     for ex in instream_exprs
         var = only(arguments(ex))
         connector_name, streamvar_name = split_sys_var(var)
 
-        outer_sc = []
-        inner_sc = []
         # find the connect
-        parentsys, connect = find_connection(connector_name, ogsys, names)
+        connect_namespaces, connect = find_connection(connector_name, ogsys, names)
         connectors = Iterators.flatten((connect.inners, connect.outers))
         # stream variable
         sv = getproperty(first(connectors), streamvar_name; namespace=false)
-        if nameof(parentsys) != nameof(sys)
-            # everything is a inner connector w.r.t. `sys`
+        if connect_namespaces !== names
+            inner_sc = []
             for s in connectors
                 push!(inner_sc, s)
             end
+            outer_sc = []
         else
-            for s in connectors
-                if connector_name == split_var(nameof(s))[1]
-                    push!(inner_sc, s)
-                else
-                    push!(outer_sc, s)
-                end
-            end
+            inner_sc = connect.inners
+            outer_sc = connect.outers
         end
 
-        n_inners = length(outer_sc)
-        n_outers = length(inner_sc)
+        n_outers = length(outer_sc)
+        n_inners = length(inner_sc)
         outer_names = (nameof(s) for s in outer_sc)
         inner_names = (nameof(s) for s in inner_sc)
         if debug
+            @show connect_namespaces
             println("Expanding: $ex")
             isempty(inner_names) || println("Inner connectors: $(collect(inner_names))")
             isempty(outer_names) || println("Outer connectors: $(collect(outer_names))")
         end
 
+        cn = renamespace(connect_namespaces, connector_name)
         # expand `instream`s
         # https://specification.modelica.org/v3.4/Ch15.html
         # Based on the above requirements, the following implementation is
         # recommended:
         if n_inners == 1 && n_outers == 0
-            connector_name === only(inner_names) || error("$stream_name is not in any stream connector of $(nameof(ogsys))")
+            cn === only(inner_names) || error("$var is not in any stream connector of $(nameof(ogsys))")
             sub[ex] = var
         elseif n_inners == 2 && n_outers == 0
-            connector_name in inner_names || error("$stream_name is not in any stream connector of $(nameof(ogsys))")
-            idx = findfirst(c->nameof(c) === connector_name, inner_sc)
+            @info names cn collect(inner_names) length(inner_sc)
+            cn in inner_names || error("$var is not in any stream connector of $(nameof(ogsys))")
+            idx = findfirst(c->nameof(c) === cn, inner_sc)
             other = idx == 1 ? 2 : 1
             sub[ex] = states(inner_sc[other], sv)
         elseif n_inners == 1 && n_outers == 1
-            isinner = connector_name === only(inner_names)
-            isouter = connector_name === only(outer_names)
-            (isinner || isouter) || error("$stream_name is not in any stream connector of $(nameof(ogsys))")
+            isinner = cn === only(inner_names)
+            isouter = cn === only(outer_names)
+            (isinner || isouter) || error("$var is not in any stream connector of $(nameof(ogsys))")
             if isinner
                 outerinstream = states(only(outer_sc), sv) # c_1.h_outflow
                 sub[ex] = outerinstream
             end
             if var in seen
-                push!(additional_eqs, outerinstream ~ var)
+                #push!(additional_eqs, outerinstream ~ var)
                 push!(seen, var)
             end
         elseif n_inners == 0 && n_outers == 2
             # we don't expand `instream` in this case.
+            #=
             if var in seen
                 v1 = states(outer_sc[1], sv)
                 v2 = states(outer_sc[2], sv)
                 push!(additional_eqs, v1 ~ instream(v2))
                 push!(additional_eqs, v2 ~ instream(v1))
                 push!(seen, var)
             end
+            =#
         else
             fv = flowvar(first(connectors))
-            idx = findfirst(c->nameof(c) === connector_name, inner_sc)
+            idx = findfirst(c->nameof(c) === cn, inner_sc)
             if idx !== nothing
                 si = sum(s->max(states(s, fv), 0), outer_sc)
                 for j in 1:n_inners; j == i && continue
@@ -309,19 +312,20 @@ function expand_instream(ogsys, sys::AbstractSystem=ogsys, names=[]; debug=false
                 den = 0
                 for j in 1:n_inners; j == i && continue
                     f = states(inner_sc[j], fv)
-                    tmp = positivemax(-f, si)
+                    tmp = positivemax(-f, si; tol=tol)
                     den += tmp
                     num += tmp * states(inner_sc[j], sv)
                 end
                 for k in 1:n_outers
                     f = states(outer_sc[k], fv)
-                    tmp = positivemax(f, si)
+                    tmp = positivemax(f, si; tol=tol)
                     den += tmp
                     num += tmp * instream(states(outer_sc[k], sv))
                 end
                 sub[ex] = num / den
             end
 
+            #=
             if var in seen
                 for q in 1:n_outers
                     sq += sum(s->max(-states(s, fv), 0), inner_sc)
@@ -334,20 +338,21 @@ function expand_instream(ogsys, sys::AbstractSystem=ogsys, names=[]; debug=false
                     den = 0
                     for j in 1:n_inners
                         f = states(inner_sc[j], fv)
-                        tmp = positivemax(-f, sq)
+                        tmp = positivemax(-f, sq; tol=tol)
                         den += tmp
                         num += tmp * states(inner_sc[j], sv)
                     end
                     for k in 1:n_outers; k == q && continue
                         f = states(outer_sc[k], fv)
-                        tmp = positivemax(f, sq)
+                        tmp = positivemax(f, sq; tol=tol)
                         den += tmp
                         num += tmp * instream(states(outer_sc[k], sv))
                     end
                     push!(additional_eqs, states(outer_sc[q], sv) ~ num / den)
                 end
                 push!(seen, var)
             end
+            =#
         end
     end
     instream_eqs = map(Base.Fix2(substitute, sub), instream_eqs)
@@ -364,7 +369,7 @@ function expand_instream(ogsys, sys::AbstractSystem=ogsys, names=[]; debug=false
         end
     end
     @set! sys.eqs = [eqs; instream_eqs; additional_eqs]
-    return flatten(sys)
+    return sys
 end
 
 function expand_connections(sys::AbstractSystem; debug=false)