Skip to content

Commit

Permalink
[NB] update initial() call handling (#11892)
Browse files Browse the repository at this point in the history 
- check if initial() is part of an array condition
  - some dumping and debug upgrades for new simcode
  - add external alias variables to the simvars block
  • Loading branch information
@kabdelhak
kabdelhak committed Jan 26, 2024
1 parent a2a5435 commit 6480af8
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 28 deletions.
8 changes: 4 additions & 4 deletions OMCompiler/Compiler/NBackEnd/Modules/1_Main/NBInitialization.mo
View file
Expand Up @@ -748,18 +748,18 @@ public
end removeWhenEquationStatement;

function isInitialCall
"checks if the expression is an initial call or can be simplified to be one.
ToDo: better apprach is to replace all initial calls with true and see if the expression can be simplified to true.
do this once ExpressionSimplify is mature enough"
"checks if the expression is an initial call or can be simplified to be one."
input Expression condition;
output Boolean b;
algorithm
b := match condition
// it's an initial call -> true;
case Expression.CALL() then Call.isNamed(condition.call, "initial");
// its an "or" expression, check if either argument is an initial call
// it's an "or" expression, check if either argument is an initial call
case Expression.LBINARY(operator = Operator.OPERATOR(op = NFOperator.Op.OR))
then isInitialCall(condition.exp1) or isInitialCall(condition.exp2);
// it's an array where any of the elements is an initialCall
case Expression.ARRAY() then List.any(arrayList(condition.elements), isInitialCall);
// not an initial call. Ignore "and" constructs
else false;
end match;
Expand Down
8 changes: 4 additions & 4 deletions OMCompiler/Compiler/NSimCode/NSimCode.mo
View file
Expand Up @@ -302,10 +302,10 @@ public
funcTree := BackendDAE.getFunctionTree(bdae);

// create sim vars before everything else
residual_vars := BackendDAE.getLoopResiduals(bdae);
(vars, simCodeIndices) := SimVars.create(varData, residual_vars, simCodeIndices);
(extObjInfo, simCodeIndices) := ExtObjInfo.create(varData.external_objects, simCodeIndices);
simcode_map := SimCodeUtil.createSimCodeMap(vars, extObjInfo);
residual_vars := BackendDAE.getLoopResiduals(bdae);
(vars, simCodeIndices) := SimVars.create(varData, residual_vars, simCodeIndices);
(extObjInfo, vars, simCodeIndices) := ExtObjInfo.create(varData.external_objects, vars, simCodeIndices);
simcode_map := SimCodeUtil.createSimCodeMap(vars, extObjInfo);

// create empty equation map and fill while creating the blocks
equation_map := UnorderedMap.new<SimStrongComponent.Block>(ComponentRef.hash, ComponentRef.isEqual);
Expand Down
41 changes: 21 additions & 20 deletions OMCompiler/Compiler/NSimCode/NSimVar.mo
View file
Expand Up @@ -737,10 +737,12 @@ public
str := str + SimVar.listToString(vars.stateVars, "States");
str := str + SimVar.listToString(vars.derivativeVars, "Derivatives");
str := str + SimVar.listToString(vars.algVars, "Algebraic Variables");
str := str + SimVar.listToString(vars.discreteAlgVars, "Discrete Algebraic Variables");
str := str + SimVar.listToString(vars.intAlgVars, "Integer Algebraic Variables");
str := str + SimVar.listToString(vars.boolAlgVars, "Boolean Algebraic Variables");
str := str + SimVar.listToString(vars.paramVars, "Real Parameters");
str := str + SimVar.listToString(vars.intParamVars, "Integer Parameters");
str := str + SimVar.listToString(vars.boolParamVars, "Boolean Parameters");
str := str + SimVar.listToString(vars.residualVars, "Residual Variables");
str := str + SimVar.listToString(vars.aliasVars, "Real Alias", true);
// ToDo: all the other stuff
Expand Down Expand Up @@ -772,26 +774,21 @@ public
list<SimVar> dataReconSetBVars = {};
algorithm
_ := match varData
local
BVariable.VarData qual;

case qual as BVariable.VAR_DATA_SIM()
algorithm
({stateVars}, simCodeIndices) := createSimVarLists(qual.states, simCodeIndices, SplitType.NONE, VarType.SIMULATION);
({derivativeVars}, simCodeIndices) := createSimVarLists(qual.derivatives, simCodeIndices, SplitType.NONE, VarType.SIMULATION);
({algVars}, simCodeIndices) := createSimVarLists(qual.algebraics, simCodeIndices, SplitType.NONE, VarType.SIMULATION);
({nonTrivialAlias}, simCodeIndices) := createSimVarLists(qual.nonTrivialAlias, simCodeIndices, SplitType.NONE, VarType.SIMULATION);
({discreteAlgVars, intAlgVars, boolAlgVars, stringAlgVars}, simCodeIndices) := createSimVarLists(qual.discretes, simCodeIndices, SplitType.TYPE, VarType.SIMULATION);
({discreteAlgVars2, intAlgVars2, boolAlgVars2, stringAlgVars2}, simCodeIndices) := createSimVarLists(qual.discrete_states, simCodeIndices, SplitType.TYPE, VarType.SIMULATION);
({aliasVars, intAliasVars, boolAliasVars, stringAliasVars}, simCodeIndices) := createSimVarLists(qual.aliasVars, simCodeIndices, SplitType.TYPE, VarType.ALIAS);
({paramVars, intParamVars, boolParamVars, stringParamVars}, simCodeIndices) := createSimVarLists(qual.parameters, simCodeIndices, SplitType.TYPE, VarType.PARAMETER);
({constVars, intConstVars, boolConstVars, stringConstVars}, simCodeIndices) := createSimVarLists(qual.constants, simCodeIndices, SplitType.TYPE, VarType.SIMULATION);
({inputVars}, simCodeIndices) := createSimVarLists(qual.top_level_inputs, simCodeIndices, SplitType.NONE, VarType.SIMULATION);
({residualVars}, simCodeIndices) := createSimVarLists(residual_vars, simCodeIndices, SplitType.NONE, VarType.RESIDUAL);
case BVariable.VAR_DATA_SIM() algorithm
({stateVars}, simCodeIndices) := createSimVarLists(varData.states, simCodeIndices, SplitType.NONE, VarType.SIMULATION);
({derivativeVars}, simCodeIndices) := createSimVarLists(varData.derivatives, simCodeIndices, SplitType.NONE, VarType.SIMULATION);
({algVars}, simCodeIndices) := createSimVarLists(varData.algebraics, simCodeIndices, SplitType.NONE, VarType.SIMULATION);
({nonTrivialAlias}, simCodeIndices) := createSimVarLists(varData.nonTrivialAlias, simCodeIndices, SplitType.NONE, VarType.SIMULATION);
({discreteAlgVars, intAlgVars, boolAlgVars, stringAlgVars}, simCodeIndices) := createSimVarLists(varData.discretes, simCodeIndices, SplitType.TYPE, VarType.SIMULATION);
({discreteAlgVars2, intAlgVars2, boolAlgVars2, stringAlgVars2}, simCodeIndices) := createSimVarLists(varData.discrete_states, simCodeIndices, SplitType.TYPE, VarType.SIMULATION);
({aliasVars, intAliasVars, boolAliasVars, stringAliasVars}, simCodeIndices) := createSimVarLists(varData.aliasVars, simCodeIndices, SplitType.TYPE, VarType.ALIAS);
({paramVars, intParamVars, boolParamVars, stringParamVars}, simCodeIndices) := createSimVarLists(varData.parameters, simCodeIndices, SplitType.TYPE, VarType.PARAMETER);
({constVars, intConstVars, boolConstVars, stringConstVars}, simCodeIndices) := createSimVarLists(varData.constants, simCodeIndices, SplitType.TYPE, VarType.SIMULATION);
({inputVars}, simCodeIndices) := createSimVarLists(varData.top_level_inputs, simCodeIndices, SplitType.NONE, VarType.SIMULATION);
({residualVars}, simCodeIndices) := createSimVarLists(residual_vars, simCodeIndices, SplitType.NONE, VarType.RESIDUAL);
then ();

case qual as BVariable.VAR_DATA_JAC() then ();
case qual as BVariable.VAR_DATA_HES() then ();
case BVariable.VAR_DATA_JAC() then ();
case BVariable.VAR_DATA_HES() then ();

else algorithm
Error.addMessage(Error.INTERNAL_ERROR,{getInstanceName() + " failed."});
Expand Down Expand Up @@ -1238,16 +1235,20 @@ public
function create
input VariablePointers external_objects;
output ExtObjInfo info;
input output SimVars vars;
input output SimCodeIndices simCodeIndices;
protected
Pointer<SimCodeIndices> indices_ptr = Pointer.create(simCodeIndices);
Pointer<list<SimVar>> acc = Pointer.create({});
VarType varType = VarType.EXTERNAL_OBJECT;
list<SimVar> var_lst;
algorithm
VariablePointers.map(external_objects, function SimVar.traverseCreate(acc = acc, indices_ptr = indices_ptr, varType = varType));
simCodeIndices := Pointer.access(indices_ptr);
var_lst := listReverse(Pointer.access(acc));
vars.extObjVars := var_lst;
// todo: alias
info := EXT_OBJ_INFO(listReverse(Pointer.access(acc)), {});
info := EXT_OBJ_INFO(var_lst, {});
end create;

function convert
Expand Down

0 comments on commit 6480af8

Please sign in to comment.