Skip to content

Commit 18bc272

Browse files
author
Vitalij Ruge
committed
cosmetic change
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@25294 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
1 parent 31c55da commit 18bc272

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Compiler/BackEnd/DynamicOptimization.mo

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -708,8 +708,8 @@ algorithm
708708

709709
conVarsList := List.select(varlst, BackendVariable.isRealOptimizeConstraintsVars);
710710
fconVarsList := List.select(varlst, BackendVariable.isRealOptimizeFinalConstraintsVars);
711-
objMayer := checkObjectIsSet(v,"$OMC$objectMayerTerm");
712-
objLagrange := checkObjectIsSet(v,"$OMC$objectLagrangeTerm");
711+
objMayer := checkObjectIsSet(v,BackendDAE.optimizationMayerTermName);
712+
objLagrange := checkObjectIsSet(v,BackendDAE.optimizationLagrangeTermName);
713713

714714
opt_varlst := List.appendNoCopy(opt_varlst, conVarsList);
715715
opt_varlst := List.appendNoCopy(opt_varlst, fconVarsList);

Compiler/BackEnd/SymbolicJacobian.mo

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1634,7 +1634,7 @@ algorithm
16341634
// Differentiate the System w.r.t states&inputs for matrices B
16351635

16361636
optimizer_vars = BackendVariable.addVariables(statesarr, BackendVariable.copyVariables(conVars));
1637-
object = DynamicOptimization.checkObjectIsSet(outputvarsarr,"$OMC$objectLagrangeTerm");
1637+
object = DynamicOptimization.checkObjectIsSet(outputvarsarr, BackendDAE.optimizationLagrangeTermName);
16381638
optimizer_vars = BackendVariable.addVars(object, optimizer_vars);
16391639
//BackendDump.printVariables(optimizer_vars);
16401640
(linearModelMatrix, sparsePattern, sparseColoring, funcs) = createJacobian(backendDAE2,states_inputs,statesarr,inputvarsarr,paramvarsarr,optimizer_vars,varlst,"B");
@@ -1646,7 +1646,7 @@ algorithm
16461646
end if;
16471647

16481648
// Differentiate the System w.r.t states for matrices C
1649-
object = DynamicOptimization.checkObjectIsSet(outputvarsarr,"$OMC$objectMayerTerm");
1649+
object = DynamicOptimization.checkObjectIsSet(outputvarsarr, BackendDAE.optimizationMayerTermName);
16501650
optimizer_vars = BackendVariable.addVars(object, optimizer_vars);
16511651
//BackendDump.printVariables(optimizer_vars);
16521652
(linearModelMatrix, sparsePattern, sparseColoring, funcs) = createJacobian(backendDAE2,states_inputs,statesarr,inputvarsarr,paramvarsarr,optimizer_vars,varlst,"C");

0 commit comments

Comments
 (0)