Fix function evaluation for HelmholtzMedia (#8586)

OpenModelica · Feb 19, 2022 · d6e04c0 · d6e04c0
1 parent b6e1ec9
commit d6e04c0
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/OMCompiler/Compiler/NFFrontEnd/NFEvalFunction.mo b/OMCompiler/Compiler/NFFrontEnd/NFEvalFunction.mo
@@ -557,8 +557,7 @@ algorithm
     // A mutable expression, only evaluate the expression it contains.
     case Expression.MUTABLE()
       algorithm
-        Expression.applyMutable(exp,
-          function Ceval.evalExp(target = NFCeval.EvalTarget.IGNORE_ERRORS()));
+        Expression.applyMutable(exp, evaluateReplacement2);
       then
         exp;
 
@@ -569,7 +568,7 @@ algorithm
       then
         exp;
 
-    else Ceval.evalExp(exp);
+    else if Expression.contains(exp, Expression.isEmpty) then exp else Ceval.evalExp(exp);
   end match;
 end evaluateReplacement2;