@@ -6838,26 +6838,6 @@ let conditionvariables = conditionvariable(zeroCrossings,simCode , &extraFuncs
68386838
68396839match modelInfo
68406840 case MODELINFO(vars=SIMVARS(__)) then
6841-
6842- /* changed: handled in SimVars class
6843- let getrealvars =
6844- (List.partition(listAppend(vars.algVars, listAppend(vars.discreteAlgVars, listAppend(vars.aliasVars, vars.paramVars))), 100) |> ls hasindex idx =>
6845- <<
6846- void getReal_<%idx%>(double* z);
6847- void setReal_<%idx%>(const double* z);
6848- >>
6849- ;separator="\n")
6850- let getintvars = (List.partition(listAppend(listAppend(vars.intAlgVars, vars.intParamVars), vars.intAliasVars), 100) |> ls hasindex idx =>
6851- <<
6852- void getInteger_<%idx%>(int* z);
6853- >>
6854- ;separator="\n")
6855- let getboolvars = (List.partition(listAppend(listAppend(vars.boolAlgVars, vars.boolParamVars), vars.boolAliasVars), 100) |> ls hasindex idx =>
6856- <<
6857- void getBoolean_<%idx%>(bool* z);
6858- >>
6859- ;separator="\n")
6860- */
68616841 let getstringvars = (List.partition(listAppend(listAppend(vars.stringAlgVars, vars.stringParamVars), vars.stringAliasVars), 100) |> ls hasindex idx =>
68626842 <<
68636843 void getString_<%idx%>(string* z);
@@ -9202,35 +9182,6 @@ case SIMCODE(modelInfo = MODELINFO(vars = vars as SIMVARS(__)))
92029182
92039183end saveAll;
92049184
9205-
9206-
9207-
9208-
9209-
9210-
9211-
9212- /*
9213- <<
9214- void <%className%>::initPreVars_<%partIdx%>(unordered_map<double* const,unsigned int>& vars1, unordered_map<double* const,unsigned int>& vars2)
9215- {
9216- insert(vars1)
9217- <%(partVars |> SIMVAR(__) hasindex i0 fromindex (intMul(partIdx, multiplicator)) =>
9218- '<%\t%>(&<%cref(name, useFlatArrayNotation)%>,<%i0%>)'
9219- ;separator="\n")%>;
9220- <%if (intLt(intMul(partIdx, multiplicator), stateVarStartIdx)) then
9221- <<
9222- insert(vars2)
9223- <%(partVars |> SIMVAR(__) hasindex i0 fromindex (intMul(partIdx, multiplicator)) =>
9224- if (intLt(i0, stateVarStartIdx)) then
9225- '<%\t%>(&<%cref(name, useFlatArrayNotation)%>,<%i0%>)'
9226- else ''
9227- ;separator="\n")%>;
9228- >>
9229- %>
9230- }
9231- >>
9232- */
9233-
92349185template saveDiscreteVars(ModelInfo modelInfo, SimCode simCode ,Text& extraFuncs,Text& extraFuncsDecl,Text extraFuncsNamespace, Boolean useFlatArrayNotation)
92359186::=
92369187match simCode
@@ -12928,10 +12879,6 @@ template crefStartValueType(ComponentRef cr) "template crefType
1292812879 end match
1292912880end crefStartValueType;
1293012881
12931-
12932-
12933-
12934-
1293512882template crefStartValueType2(DAE.Type ty)
1293612883::=
1293712884 match ty
@@ -12944,15 +12891,8 @@ template crefStartValueType2(DAE.Type ty)
1294412891 case T_ARRAY(ty=T_BOOL(__)) then 'Bool'
1294512892 else "error start value type"
1294612893end match
12947-
12948-
1294912894end crefStartValueType2;
1295012895
12951-
12952-
12953-
12954-
12955-
1295612896template expTypeFromExpShort(Exp exp)
1295712897
1295812898::=
@@ -16153,57 +16093,6 @@ template giveVariables(ModelInfo modelInfo, Context context,Boolean useFlatArray
1615316093 }
1615416094 >>
1615516095 end match
16156- /* else
16157- match modelInfo
16158- case MODELINFO(vars=SIMVARS(__)) then
16159- <<
16160- void <%lastIdentOfPath(name)%>::getReal(double* z)
16161- {
16162- throw ModelicaSimulationError(MODEL_EQ_SYSTEM,"getReal is not implemented yet");
16163- }
16164-
16165- void <%lastIdentOfPath(name)%>::getInteger(int* z)
16166- {
16167- throw ModelicaSimulationError(MODEL_EQ_SYSTEM,"getInteger is not implemented yet");
16168- }
16169-
16170- void <%lastIdentOfPath(name)%>::getBoolean(bool* z)
16171- {
16172- throw ModelicaSimulationError(MODEL_EQ_SYSTEM,"getBoolean is not implemented yet");
16173- }
16174-
16175- void <%lastIdentOfPath(name)%>::getString(string* z)
16176- {
16177- throw ModelicaSimulationError(MODEL_EQ_SYSTEM,"getString is not implemented yet");
16178- }
16179-
16180- void <%lastIdentOfPath(name)%>::setReal(const double* z)
16181- {
16182- throw ModelicaSimulationError(MODEL_EQ_SYSTEM,"setReal is not implemented yet");
16183- }
16184-
16185- void <%lastIdentOfPath(name)%>::setInteger(const int* z)
16186- {
16187- throw ModelicaSimulationError(MODEL_EQ_SYSTEM,"setInteger is not implemented yet");
16188- }
16189-
16190- void <%lastIdentOfPath(name)%>::setBoolean(const bool* z)
16191- {
16192- throw ModelicaSimulationError(MODEL_EQ_SYSTEM,"setBoolean is not implemented yet");
16193- }
16194-
16195- void <%lastIdentOfPath(name)%>::setString(const string* z)
16196- {
16197- throw ModelicaSimulationError(MODEL_EQ_SYSTEM,"setString is not implemented yet");
16198- }
16199- >>
16200- */
16201- /*
16202- <%System.tmpTickReset(0)%>
16203- <%vars.stringAlgVars |> var => giveVariablesDefault(var, System.tmpTick()) ;separator="\n"%>
16204- <%vars.stringParamVars |> var => giveVariablesDefault(var, System.tmpTick()) ;separator="\n"%>
16205- <%vars.stringAliasVars |> var => giveVariablesDefault(var, System.tmpTick()) ;separator="\n"%>
16206- */
1620716096end giveVariables;
1620816097
1620916098template getStateVariables(SimVar simVar, Integer valueReference, String arrayName, Integer index)
0 commit comments