Skip to content

Commit 80d1c3d

Browse files
author
Jens Frenkel
committed
- bugfix removeSimplequation alias der
- bugfix alias a=der(var) git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@11697 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
1 parent 3d29be7 commit 80d1c3d

File tree

2 files changed

+2
-14
lines changed

2 files changed

+2
-14
lines changed

Compiler/BackEnd/BackendDAEOptimize.mo

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -914,7 +914,7 @@ algorithm
914914
true = BackendVariable.isDummyDerVar(var);
915915
// because this is a self genererated var we need not check for uncertainities
916916
//false = BackendVariable.varHasUncertainValueRefine(var);
917-
(syst,shared,newvars) = selectAlias2(cr,cr2,var,var2,es,e2,syst,shared,mavars,negate,BackendEquation.equationSource(eqn));
917+
(syst,shared,newvars) = selectAlias2(cr,cr2,var,var2,e2,es,syst,shared,mavars,negate,BackendEquation.equationSource(eqn));
918918
then (cr,k,es,syst,shared,mvars,newvars,1);
919919
// a = der(b)
920920
// a is not a state
@@ -928,7 +928,7 @@ algorithm
928928
((var2::_),(j::_)) = BackendVariable.getVar(cr2,vars);
929929
false = BackendVariable.varHasUncertainValueRefine(var);
930930
replaceableAlias(var);
931-
(syst,shared,newvars) = selectAlias2(cr,cr2,var,var2,es,e2,syst,shared,mavars,negate,,BackendEquation.equationSource(eqn));
931+
(syst,shared,newvars) = selectAlias2(cr,cr2,var,var2,e2,es,syst,shared,mavars,negate,,BackendEquation.equationSource(eqn));
932932
then (cr,k,es,syst,shared,mvars,newvars,1);
933933
*/
934934
// a = der(b)

Compiler/BackEnd/SimCode.mo

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7807,18 +7807,6 @@ algorithm
78077807
case (DAE.CREF(componentRef=name),inVar) then ALIAS(name);
78087808
case (DAE.UNARY(operator=DAE.UMINUS(_),exp=DAE.CREF(componentRef=name)),inVar) then NEGATEDALIAS(name);
78097809
case (DAE.UNARY(operator=DAE.UMINUS_ARR(_),exp=DAE.CREF(componentRef=name)),inVar) then NEGATEDALIAS(name);
7810-
case (DAE.CALL(path=fname, expLst={DAE.CREF(componentRef=name)}),inVar)
7811-
equation
7812-
true = BackendVariable.isDummyDerVar(inVar);
7813-
then ALIAS(name);
7814-
case (DAE.UNARY(operator=DAE.UMINUS(_),exp=DAE.CALL(path=fname, expLst={DAE.CREF(componentRef=name)})),inVar)
7815-
equation
7816-
true = BackendVariable.isDummyDerVar(inVar);
7817-
then NEGATEDALIAS(name);
7818-
case (DAE.UNARY(operator=DAE.UMINUS_ARR(_),exp=DAE.CALL(path=fname, expLst={DAE.CREF(componentRef=name)})),inVar)
7819-
equation
7820-
true = BackendVariable.isDummyDerVar(inVar);
7821-
then NEGATEDALIAS(name);
78227810
case (DAE.CALL(path=fname, expLst={DAE.CREF(componentRef=name)}),inVar)
78237811
equation
78247812
Builtin.isDer(fname);

0 commit comments

Comments
 (0)