Fixed bug in StateSelection.jl: If unitless=true, no unit is associated with the tearing variable in the generated AST.

Author: MartinOtter

Project.toml

@@ -1,7 +1,7 @@
 name = "ModiaBase"
 uuid = "ec7bf1ca-419d-4510-bbab-199861c55244"
 authors = ["Hilding Elmqvist <[email protected]>", "Martin Otter <[email protected]>"]
-version = "0.7.6-dev"
+version = "0.7.6"
 
 [deps]
 DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"

src/StateSelection.jl

@@ -870,29 +870,34 @@ end
 
 
 """
-    addLinearEquations!(eq::EquationGraph, hasConstantCoefficients::Bool)
+    addLinearEquations!(eq::EquationGraph, hasConstantCoefficients::Bool, unitless::Bool)
 
 A linear equation system is solved. Push this information to
 eq.SortedEquations. Furthermore, generate the AST for a for-loop that builds
 and solves a linear equation system A*x = b
 from the solved equations and the residual equations,
 and push this information to eq.SortedEquations.AST.
 """
-function addLinearEquations!(eq::EquationGraph, hasConstantCoefficients::Bool)::Nothing
+function addLinearEquations!(eq::EquationGraph, hasConstantCoefficients::Bool, unitless::Bool)::Nothing
     # Construct body of for-loop
     empty!(eq.AST_aux)
     while_body = eq.AST_aux
     vTear_names   = String[]
     vTear_lengths = Int[] 
 
     # Assign iteration variables
-    #   v_i = leq.vTear_value[i]
+    #   unitless = false:
+    #     v_i = leq.vTear_value[i]
+    #
+    #   unitless = true:
+    #     v_i = leq.vTear_value[i]*@u_str($v_unit)
+    #   
     vAssigned_names = Any[]
     i1 = 0
     i2 = 0
     for (i,v) in enumerate(eq.vTear)
         v_name   = eq.fc.var_julia_name(v)
-        v_unit   = eq.fc.var_unit(v)
+        v_unit   = unitless ? "" : eq.fc.var_unit(v)
         v_length = eq.fc.var_length(undifferentiated(eq,v)) 
         i1 = i2 + 1
         i2 = i1 + v_length - 1
@@ -1392,7 +1397,7 @@ function getSortedAndSolvedAST(G,     # Typically ::Vector{Vector{Int}}
                     end
 
                     # Generate AST to build-up and solve linear equation system of the teared equations
-                    addLinearEquations!(eq, hasConstantCoefficients)
+                    addLinearEquations!(eq, hasConstantCoefficients, unitless)
 
 
                 else