Skip to content
This repository has been archived by the owner on May 18, 2019. It is now read-only.

disable optModules for symjac as well #1807

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 16 additions & 15 deletions Compiler/BackEnd/SymbolicJacobian.mo
Original file line number Diff line number Diff line change
Expand Up @@ -1900,6 +1900,7 @@ protected function optimizeJacobianMatrix "author: wbraun"
protected
array<Integer> ea = listArray({});
BackendDAE.Matching eMatching = BackendDAE.MATCHING(ea, ea, {});
list<String> postOptModules, preOptModules;
algorithm
outJacobian :=
matchcontinue (inBackendDAE,inComRef1,inComRef2)
Expand Down Expand Up @@ -1931,21 +1932,21 @@ algorithm
b = Flags.disableDebug(Flags.EXEC_STAT);
end if;

backendDAE2 = BackendDAEUtil.getSolvedSystemforJacobians(backendDAE,
{"removeEqualFunctionCalls",
"removeSimpleEquations",
"evalFunc"},
NONE(),
NONE(),
{
"wrapFunctionCalls",
"inlineArrayEqn",
"constantLinearSystem",
"solveSimpleEquations",
"tearingSystem",
"calculateStrongComponentJacobians",
"removeConstants",
"simplifyTimeIndepFuncCalls"});
preOptModules = {"removeEqualFunctionCalls",
"removeSimpleEquations",
"evalFunc"};
postOptModules = {"wrapFunctionCalls",
"inlineArrayEqn",
"constantLinearSystem",
"solveSimpleEquations",
"tearingSystem",
"calculateStrongComponentJacobians",
"removeConstants",
"simplifyTimeIndepFuncCalls"};
(_,preOptModules,_) = List.intersection1OnTrue(preOptModules,Flags.getConfigStringList(Flags.POST_OPT_MODULES_SUB),stringEq);
(_,postOptModules,_) = List.intersection1OnTrue(postOptModules,Flags.getConfigStringList(Flags.POST_OPT_MODULES_SUB),stringEq);
backendDAE2 = BackendDAEUtil.getSolvedSystemforJacobians(backendDAE,preOptModules,NONE(),NONE(),postOptModules);

if Flags.isSet(Flags.JAC_DUMP) then
BackendDump.bltdump("Symbolic Jacobian",backendDAE2);
else
Expand Down