- Use realLn

git-svn-id: https://openmodelica.org/svn/OpenModelica/branches/sjoelund-functiontree@6688 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Oct 28, 2010 · 05f689c · 05f689c
1 parent 67e5538
commit 05f689c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/Compiler/Ceval.mo b/Compiler/Ceval.mo
@@ -1609,7 +1609,7 @@ algorithm
         Values.REAL(rv_1);
     case ("log",SOME("log"),{Values.REAL(real = rv)},_)
       equation
-        rv_1 = realLog(rv);
+        rv_1 = realLn(rv);
       then
         Values.REAL(rv_1);
     case ("log10",SOME("log10"),{Values.REAL(real = rv)},_)
@@ -3379,7 +3379,7 @@ algorithm
     case (cache,env,{exp},impl,st,msg)
       equation
         (cache,Values.REAL(rv),_) = ceval(cache,env, exp, impl, st,NONE(), msg);
-        rv_1 = realLog(rv);
+        rv_1 = realLn(rv);
       then
         (cache,Values.REAL(rv_1),st);
   end matchcontinue;

diff --git a/Compiler/ExpressionSimplify.mo b/Compiler/ExpressionSimplify.mo
@@ -515,7 +515,15 @@ algorithm
     case(DAE.CALL(path=path,expLst={e})) 
       equation
         Builtin.isLog(path);
-        r = realLog(Expression.getRealConst(e));
+        r = realLn(Expression.getRealConst(e));
+      then 
+        DAE.RCONST(r);
+
+    // log10 function
+    case(DAE.CALL(path=path,expLst={e})) 
+      equation
+        Builtin.isLog10(path);
+        r = realLog10(Expression.getRealConst(e));
       then 
         DAE.RCONST(r);