Skip to content

Commit 18f3391

Browse files
[Janitor mode] Fix whitespace
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@21502 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
1 parent 2dbbd84 commit 18f3391

File tree

5 files changed

+15
-15
lines changed

5 files changed

+15
-15
lines changed

Compiler/BackEnd/BackendQSS.mo

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1016,7 +1016,7 @@ algorithm
10161016
Option<SimCode.BackendMapping> backendMapping;
10171017
Option<HpcOmSimCode.MemoryMap> hpOmMemoryMap;
10181018
list<SimCode.SimEqSystem> equationsForConditions;
1019-
1019+
10201020
case (SimCode.SIMCODE(modelInfo,literals,recordDecls,externalFunctionIncludes,allEquations,odeEquations,
10211021
algebraicEquations,residualEquations,useSymbolicInitialization,useHomotopy,initialEquations,removedInitialEquations,startValueEquations,nominalValueEquations,minValueEquations,maxValueEquations,
10221022
parameterEquations,removedEquations,algorithmAndEquationAsserts,equationsForZeroCrossings,jacobianEquations,stateSets,constraints,classAttributes,zeroCrossings,relations,

Compiler/BackEnd/HpcOmSimCodeMain.mo

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -185,11 +185,11 @@ algorithm
185185
//-----
186186
System.realtimeTick(GlobalScript.RT_CLOCK_EXECSTAT_HPCOM_MODULES);
187187
(simCode,(lastEqMappingIdx,equationSccMapping)) = SimCodeUtil.createSimCode(inBackendDAE, inClassName, filenamePrefix, inString11, functions, externalFunctionIncludes, includeDirs, libs, simSettingsOpt, recordDecls, literals, args);
188-
188+
189189
SimCode.SIMCODE(modelInfo, simCodeLiterals, simCodeRecordDecls, simCodeExternalFunctionIncludes, allEquations, odeEquations, algebraicEquations, residualEquations, useSymbolicInitialization, useHomotopy, initialEquations, removedInitialEquations, startValueEquations, nominalValueEquations, minValueEquations, maxValueEquations,
190190
parameterEquations, removedEquations, algorithmAndEquationAsserts, zeroCrossingsEquations, jacobianEquations, stateSets, constraints, classAttributes, zeroCrossings, relations, timeEvents, whenClauses,
191191
discreteModelVars, extObjInfo, makefileParams, delayedExps, jacobianMatrixes, simulationSettingsOpt, fileNamePrefix, _, _, _, crefToSimVarHT, backendMapping) = simCode;
192-
192+
193193
(allComps,_) = HpcOmTaskGraph.getSystemComponents(inBackendDAE);
194194
highestSccIdx = findHighestSccIdxInMapping(equationSccMapping,-1);
195195
compCountPlusDummy = listLength(allComps)+1;
@@ -226,7 +226,7 @@ algorithm
226226
taskGraphEvent = arrayCopy(taskGraph);
227227
taskGraphDataEvent = HpcOmTaskGraph.copyTaskGraphMeta(taskGraphData);
228228
(taskGraphEvent,taskGraphDataEvent) = HpcOmTaskGraph.getEventSystem(taskGraphEvent,taskGraphDataEvent,inBackendDAE, zeroCrossings, simeqCompMapping);
229-
229+
230230
fileName = ("taskGraph"+&filenamePrefix+&"_event.graphml");
231231
schedulerInfo = arrayCreate(arrayLength(taskGraphEvent), (-1,-1,-1.0));
232232
HpcOmTaskGraph.dumpAsGraphMLSccLevel(taskGraphEvent, taskGraphDataEvent,inBackendDAE, fileName, "", {}, {}, sccSimEqMapping ,schedulerInfo);
@@ -310,7 +310,7 @@ algorithm
310310
SimCodeUtil.execStat("hpcom create memory map");
311311

312312
equationsForConditions = getSimCodeEqsByTaskList(eventSystemTaskList, allEquations);
313-
313+
314314
simCode = SimCode.SIMCODE(modelInfo, simCodeLiterals, simCodeRecordDecls, simCodeExternalFunctionIncludes, allEquations, odeEquations, algebraicEquations, residualEquations, useSymbolicInitialization, useHomotopy, initialEquations, removedInitialEquations, startValueEquations, nominalValueEquations, minValueEquations, maxValueEquations,
315315
parameterEquations, removedEquations, algorithmAndEquationAsserts, zeroCrossingsEquations, jacobianEquations, stateSets, constraints, classAttributes, zeroCrossings, relations, timeEvents, whenClauses,
316316
discreteModelVars, extObjInfo, makefileParams, delayedExps, jacobianMatrixes, simulationSettingsOpt, fileNamePrefix, SOME(schedule), optTmpMemoryMap, equationsForConditions, crefToSimVarHT, backendMapping);

Compiler/BackEnd/HpcOmTaskGraph.mo

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2123,7 +2123,7 @@ end getLeaves;
21232123
//Functions to get the event-graph
21242124
//------------------------------------------
21252125
//------------------------------------------
2126-
public function getEventSystem "gets the graph and the adjacencyLst only for the EventSystem. This means that all branches which leads to a node solving
2126+
public function getEventSystem "gets the graph and the adjacencyLst only for the EventSystem. This means that all branches which leads to a node solving
21272127
a whencondition or another boolean condition will remain.
21282128
author: marcusw"
21292129
input TaskGraph iTaskGraph;
@@ -2233,7 +2233,7 @@ protected
22332233
algorithm
22342234
outTpl := match(inTpl)
22352235
case(e,false)
2236-
equation
2236+
equation
22372237
res = Expression.traverseCrefsFromExp(e, getComponentsIncludingTime2, false);
22382238
then ((e,res));
22392239
else then inTpl;
@@ -2335,7 +2335,7 @@ protected function solvesDiscreteValue
23352335
output Integer oFirstEqIdx;
23362336
algorithm
23372337
(oSolvesDiscreteValue,oFirstEqIdx) := matchcontinue(inComp,iOrderedVars)
2338-
local
2338+
local
23392339
Integer eqn, var;
23402340
list<Integer> vars, eqns;
23412341
list<BackendDAE.Var> backendVars;
@@ -2360,7 +2360,7 @@ algorithm
23602360
backendVars = List.map1r(vars, BackendVariable.getVarAt, iOrderedVars);
23612361
solvesDiscreteValue = BackendVariable.hasDiscreteVar(backendVars);
23622362
eqn = List.first(eqns);
2363-
then (solvesDiscreteValue,eqn);
2363+
then (solvesDiscreteValue,eqn);
23642364
case(BackendDAE.SINGLEARRAY(vars=vars,eqn=eqn),_)
23652365
equation
23662366
//print("Vars of single array: " +& stringDelimitList(List.map(vars, intString), ",") +& "\n");
@@ -2390,7 +2390,7 @@ algorithm
23902390
//print("Vars of single if equation: " +& stringDelimitList(List.map(vars, intString), ",") +& "\n");
23912391
backendVars = List.map1r(vars, BackendVariable.getVarAt, iOrderedVars);
23922392
solvesDiscreteValue = BackendVariable.hasDiscreteVar(backendVars);
2393-
then (solvesDiscreteValue,eqn);
2393+
then (solvesDiscreteValue,eqn);
23942394
else
23952395
then
23962396
(false,-1);

Compiler/Template/CodegenCppHpcom.tpl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ case SIMCODE(modelInfo = MODELINFO(__)) then
108108
<%generateMethodDeclarationCode(simCode)%>
109109
virtual bool getCondition(unsigned int index);
110110
virtual void initPreVars(unordered_map<string,unsigned int>&,unordered_map<string,unsigned int>&);
111-
111+
112112
protected:
113113
114114
//Methods:
@@ -704,7 +704,7 @@ template update( list<SimEqSystem> allEquationsPlusWhen,list<SimWhenClause> when
704704
<%createEvaluateAll(allEquations,whenClauses,simCode,contextOther)%>
705705

706706
<%createEvaluateZeroFuncs(equationsForZeroCrossings,simCode,contextOther) %>
707-
707+
708708
<%createEvaluateConditions(simCode, allEquationsPlusWhen, whenClauses, modelInfo.name, context)%>
709709
<%parCode%>
710710
>>
@@ -724,8 +724,8 @@ template createEvaluateConditions(SimCode simCode, list<SimEqSystem> allEquation
724724
//length: <%listLength(equationsForConditions)%>
725725
<%eqs%>
726726
<%reinit%>
727-
return state_var_reinitialized;
728-
}
727+
return state_var_reinitialized;
728+
}
729729
>>
730730
end createEvaluateConditions;
731731

SimulationRuntime/cpp/Core/System/EventHandling.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ bool EventHandling::IterateEventQueue(bool& state_vars_reinitialized)
187187
_event_system->getConditions(_conditions0);
188188
//Handle all events
189189

190-
state_vars_reinitialized = _countinous_system->evaluateConditions();
190+
state_vars_reinitialized = _countinous_system->evaluateConditions();
191191
//state_vars_reinitialized = evaluateAll();
192192
//_countinous_system->evaluateODE();
193193
//state_vars_reinitialized = _countinous_system->evaluateConditions();

0 commit comments

Comments
 (0)