Skip to content

Commit

Permalink
- fix TaskGraph.mo
Browse files Browse the repository at this point in the history 
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@12831 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
Jens Frenkel committed Sep 7, 2012
1 parent 6784612 commit 9c449b6
Showing 1 changed file with 43 additions and 42 deletions.
85 changes: 43 additions & 42 deletions Compiler/BackEnd/TaskGraph.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@ algorithm
TaskGraphExt.registerStartStop(starttask, endtask);
vars = BackendDAEUtil.varList(vararr);
knvars = BackendDAEUtil.varList(knvararr);
addVariables(vars, starttask);
addVariables(knvars, starttask);
List.map1_0(vars,addVariable, starttask);
List.map1_0(knvars,addVariable, starttask);
cref_ = ComponentReference.makeCrefIdent("sim_time",DAE.T_REAL_DEFAULT,{});
addVariables({BackendDAE.VAR(cref_,BackendDAE.VARIABLE(),
DAE.INPUT(),DAE.NON_PARALLEL(),DAE.T_REAL_DEFAULT,NONE(),NONE(),{},DAE.emptyElementSource,NONE(),
Expand Down Expand Up @@ -122,17 +122,18 @@ algorithm
equation
vars = BackendDAEUtil.varList(vararr);
kvars = BackendDAEUtil.varList(kvararr);
buildInits2(vars);
buildInits2(kvars);
buildInits2(vars,1);
buildInits2(kvars,1);
then
();
end match;
end buildInits;

protected function buildInits2
input list<BackendDAE.Var> inBackendDAEVarLst;
input Integer index;
algorithm
_ := matchcontinue (inBackendDAEVarLst)
_ := matchcontinue (inBackendDAEVarLst,index)
local
String v,origname_str;
DAE.ComponentRef origname;
Expand All @@ -141,99 +142,99 @@ algorithm
list<BackendDAE.Var> rest;
DAE.Exp e;
Values.Value value;
case ({}) then ();
case ((BackendDAE.VAR(varKind = BackendDAE.VARIABLE(),varName = origname,values = dae_var_attr,comment = comment) :: rest))
case ({},_) then ();
case ((BackendDAE.VAR(varKind = BackendDAE.VARIABLE(),varName = origname,values = dae_var_attr,comment = comment) :: rest),_)
equation
e = DAEUtil.getStartAttr(dae_var_attr);
v = ExpressionDump.printExpStr(e);
origname_str = ComponentReference.printComponentRefStr(origname);
TaskGraphExt.addInitVar(0, v, origname_str);
buildInits2(rest);
TaskGraphExt.addInitVar(index, v, origname_str);
buildInits2(rest,index+1);
then
();
case ((BackendDAE.VAR(varKind = BackendDAE.VARIABLE(),varName = origname,values = dae_var_attr,comment = comment) :: rest))
case ((BackendDAE.VAR(varKind = BackendDAE.VARIABLE(),varName = origname,values = dae_var_attr,comment = comment) :: rest),_)
equation
origname_str = ComponentReference.printComponentRefStr(origname);
TaskGraphExt.addInitVar(0, "0.0", origname_str);
buildInits2(rest);
TaskGraphExt.addInitVar(index, "0.0", origname_str);
buildInits2(rest,index+1);
then
();
case ((BackendDAE.VAR(varKind = BackendDAE.STATE(),varName = origname,values = dae_var_attr,comment = comment) :: rest))
case ((BackendDAE.VAR(varKind = BackendDAE.STATE(),varName = origname,values = dae_var_attr,comment = comment) :: rest),_)
equation
e = DAEUtil.getStartAttr(dae_var_attr);
v = ExpressionDump.printExpStr(e);
origname_str = ComponentReference.printComponentRefStr(origname);
TaskGraphExt.addInitState(0, v, origname_str);
buildInits2(rest);
TaskGraphExt.addInitState(index, v, origname_str);
buildInits2(rest,index+1);
then
();
case ((BackendDAE.VAR(varKind = BackendDAE.STATE(),varName = origname,values = dae_var_attr,comment = comment) :: rest))
case ((BackendDAE.VAR(varKind = BackendDAE.STATE(),varName = origname,values = dae_var_attr,comment = comment) :: rest),_)
equation
origname_str = ComponentReference.printComponentRefStr(origname);
TaskGraphExt.addInitState(0, "0.0", origname_str);
buildInits2(rest);
TaskGraphExt.addInitState(index, "0.0", origname_str);
buildInits2(rest,index+1);
then
();
case ((BackendDAE.VAR(varKind = BackendDAE.DUMMY_DER(),varName = origname,values = dae_var_attr,comment = comment) :: rest))
case ((BackendDAE.VAR(varKind = BackendDAE.DUMMY_DER(),varName = origname,values = dae_var_attr,comment = comment) :: rest),_)
equation
e = DAEUtil.getStartAttr(dae_var_attr);
v = ExpressionDump.printExpStr(e);
origname_str = ComponentReference.printComponentRefStr(origname);
TaskGraphExt.addInitVar(0, v, origname_str);
buildInits2(rest);
TaskGraphExt.addInitVar(index, v, origname_str);
buildInits2(rest,index+1);
then
();
case ((BackendDAE.VAR(varKind = BackendDAE.DUMMY_DER(),varName = origname,values = dae_var_attr,comment = comment) :: rest))
case ((BackendDAE.VAR(varKind = BackendDAE.DUMMY_DER(),varName = origname,values = dae_var_attr,comment = comment) :: rest),_)
equation
origname_str = ComponentReference.printComponentRefStr(origname);
TaskGraphExt.addInitVar(0, "0.0", origname_str);
buildInits2(rest);
TaskGraphExt.addInitVar(index, "0.0", origname_str);
buildInits2(rest,index+1);
then
();
case ((BackendDAE.VAR(varKind = BackendDAE.DUMMY_STATE(),varName = origname,values = dae_var_attr,comment = comment) :: rest))
case ((BackendDAE.VAR(varKind = BackendDAE.DUMMY_STATE(),varName = origname,values = dae_var_attr,comment = comment) :: rest),_)
equation
e = DAEUtil.getStartAttr(dae_var_attr);
v = ExpressionDump.printExpStr(e);
origname_str = ComponentReference.printComponentRefStr(origname);
TaskGraphExt.addInitVar(0, v, origname_str);
buildInits2(rest);
TaskGraphExt.addInitVar(index, v, origname_str);
buildInits2(rest,index+1);
then
();
case ((BackendDAE.VAR(varKind = BackendDAE.DUMMY_STATE(),varName = origname,values = dae_var_attr,comment = comment) :: rest))
case ((BackendDAE.VAR(varKind = BackendDAE.DUMMY_STATE(),varName = origname,values = dae_var_attr,comment = comment) :: rest),_)
equation
origname_str = ComponentReference.printComponentRefStr(origname);
TaskGraphExt.addInitVar(0, "0.0", origname_str);
buildInits2(rest);
TaskGraphExt.addInitVar(index, "0.0", origname_str);
buildInits2(rest,index+1);
then
();
case ((BackendDAE.VAR(varKind = BackendDAE.PARAM(),bindValue = SOME(value),varName = origname,values = dae_var_attr,comment = comment) :: rest))
case ((BackendDAE.VAR(varKind = BackendDAE.PARAM(),bindValue = SOME(value),varName = origname,values = dae_var_attr,comment = comment) :: rest),_)
equation
v = ValuesUtil.valString(value);
origname_str = ComponentReference.printComponentRefStr(origname);
TaskGraphExt.addInitParam(0, v, origname_str);
buildInits2(rest);
TaskGraphExt.addInitParam(index, v, origname_str);
buildInits2(rest,index+1);
then
();
case ((BackendDAE.VAR(varKind = BackendDAE.PARAM(),bindValue = NONE(),varName = origname,values = dae_var_attr,comment = comment) :: rest))
case ((BackendDAE.VAR(varKind = BackendDAE.PARAM(),bindValue = NONE(),varName = origname,values = dae_var_attr,comment = comment) :: rest),_)
equation
origname_str = ComponentReference.printComponentRefStr(origname);
TaskGraphExt.addInitParam(0, "0.0", origname_str);
buildInits2(rest);
TaskGraphExt.addInitParam(index, "0.0", origname_str);
buildInits2(rest,index+1);
then
();
case ((BackendDAE.VAR(varKind = BackendDAE.CONST(),bindValue = SOME(value),varName = origname,values = dae_var_attr,comment = comment) :: rest))
case ((BackendDAE.VAR(varKind = BackendDAE.CONST(),bindValue = SOME(value),varName = origname,values = dae_var_attr,comment = comment) :: rest),_)
equation
v = ValuesUtil.valString(value);
origname_str = ComponentReference.printComponentRefStr(origname);
TaskGraphExt.addInitParam(0, v, origname_str);
buildInits2(rest);
TaskGraphExt.addInitParam(index, v, origname_str);
buildInits2(rest,index+1);
then
();
case ((BackendDAE.VAR(varKind = BackendDAE.CONST(),bindValue = NONE(),varName = origname,values = dae_var_attr,comment = comment) :: rest))
case ((BackendDAE.VAR(varKind = BackendDAE.CONST(),bindValue = NONE(),varName = origname,values = dae_var_attr,comment = comment) :: rest),_)
equation
origname_str = ComponentReference.printComponentRefStr(origname);
TaskGraphExt.addInitParam(0, "0.0", origname_str);
buildInits2(rest);
TaskGraphExt.addInitParam(index, "0.0", origname_str);
buildInits2(rest,index+1);
then
();
end matchcontinue;
Expand Down

0 comments on commit 9c449b6

Please sign in to comment.