Skip to content

Commit 9fedfd5

Browse files
[Janitor mode] Fix whitespace
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@22771 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
1 parent c1aaa75 commit 9fedfd5

File tree

7 files changed

+36
-36
lines changed

7 files changed

+36
-36
lines changed

Compiler/BackEnd/HpcOmScheduler.mo

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -624,7 +624,7 @@ algorithm
624624
end createDepTask;
625625

626626
protected function createDepTaskAndCommunicationInfo "author: marcusw
627-
Create a dependeny task that indicates that variables of another task are required.
627+
Create a dependeny task that indicates that variables of another task are required.
628628
The communication info is created out of the given communication array and the simvar-mapping."
629629
input HpcOmSimCode.Task iSourceTask;
630630
input HpcOmSimCode.Task iTargetTask;
@@ -665,7 +665,7 @@ algorithm
665665
commInfo = convertCommunicationToCommInfo(commBetweenTasks, iSimVarMapping);
666666
tmpTask = createDepTask(iSourceTask, iTargetTask, false, commInfo);
667667
then tmpTask;
668-
else
668+
else
669669
equation
670670
print("CreateDepTaskAndCommunicationInfo failed!\n");
671671
then fail();
@@ -5757,8 +5757,8 @@ algorithm
57575757
end match;
57585758
end isEmptyTask;
57595759

5760-
public function convertFixedLevelScheduleToTaskLists
5761-
"Convert the given LevelSchedule to an list of task for each level and each thread.
5760+
public function convertFixedLevelScheduleToTaskLists
5761+
"Convert the given LevelSchedule to an list of task for each level and each thread.
57625762
author:marcusw"
57635763
input HpcOmSimCode.Schedule iSchedule;
57645764
input Integer iNumOfThreads;
@@ -5784,7 +5784,7 @@ algorithm
57845784
end convertFixedLevelScheduleToTaskLists;
57855785

57865786
protected function convertFixedLevelScheduleToTaskLists1
5787-
"Add the task list of the given array-index to the result list.
5787+
"Add the task list of the given array-index to the result list.
57885788
author:marcusw"
57895789
input array<list<HpcOmSimCode.Task>> iLevelTasks;
57905790
input Integer iCurrentArrayIdx;
@@ -5806,7 +5806,7 @@ algorithm
58065806
then tmpResultList;
58075807
else
58085808
then iResultList;
5809-
end matchcontinue;
5809+
end matchcontinue;
58105810
end convertFixedLevelScheduleToTaskLists1;
58115811

58125812
protected function revertTaskLists
@@ -5828,7 +5828,7 @@ algorithm
58285828
then tmpResultList;
58295829
else
58305830
then iResultList;
5831-
end matchcontinue;
5831+
end matchcontinue;
58325832
end revertTaskLists;
58335833

58345834
protected function revertTaskList
@@ -5850,11 +5850,11 @@ algorithm
58505850
then tmpResultList;
58515851
else
58525852
then iResultList;
5853-
end matchcontinue;
5853+
end matchcontinue;
58545854
end revertTaskList;
58555855

58565856
protected function convertFixedLevelScheduleToTaskListsForLevel
5857-
"Convert a level task list into a task list for each thread.
5857+
"Convert a level task list into a task list for each thread.
58585858
author:marcusw"
58595859
input HpcOmSimCode.TaskList iTasksOfLevel;
58605860
input Integer iThreadCount;

Compiler/SimCode/HpcOmSimCodeMain.mo

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ algorithm
172172
list<tuple<HpcOmSimCode.Task, list<Integer>>> eventSystemTasks;
173173
list<SimCode.SimEqSystem> equationsForConditions;
174174
array<Option<SimCode.SimEqSystem>> simEqIdxSimEqMapping;
175-
175+
176176
array<list<SimCodeVar.SimVar>> simVarMapping; //maps each backend variable to a list of simVars
177177
case (BackendDAE.DAE(eqs=eqs), _, _, _, _, _, _, _, _, _, _, _) equation
178178

@@ -307,7 +307,7 @@ algorithm
307307
SimCodeUtil.execStat("hpcom dump simplified TaskGraph");
308308

309309
Debug.fcall(Flags.HPCOM_DUMP,print,"Filter successful applied\n");
310-
310+
311311
//Create schedule
312312
//---------------
313313
numProc = Flags.getConfigInt(Flags.NUM_PROC);
@@ -329,7 +329,7 @@ algorithm
329329
//HpcOmScheduler.printSchedule(schedule);
330330

331331
SimCodeUtil.execStat("hpcom dump schedule TaskGraph");
332-
332+
333333
Debug.fcall(Flags.HPCOM_DUMP,print,"Schedule created\n");
334334

335335
//Check ODE-System size
@@ -455,7 +455,7 @@ algorithm
455455
//doNotMerge = List.map3(doNotMergeIn,HpcOmTaskGraph.getCompInComps,1,inComps,nodeMark);
456456
//(taskGraph1,taskGraphMeta1,changed1) = HpcOmTaskGraph.mergeSimpleNodes(taskGraph1, taskGraphMeta1, doNotMerge);
457457
changed1 = false;
458-
458+
459459
//HpcOmTaskGraph.TASKGRAPHMETA(inComps=inComps,nodeMark=nodeMark) = taskGraphMeta1;
460460
//doNotMerge = List.map3(doNotMergeIn,HpcOmTaskGraph.getCompInComps,1,inComps,nodeMark);
461461
//(taskGraph1,taskGraphMeta1,changed2) = HpcOmTaskGraph.mergeParentNodes(taskGraph1, taskGraphMeta1, doNotMerge);

Compiler/SimCode/SimCodeUtil.mo

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12969,7 +12969,7 @@ algorithm
1296912969
simVars = List.map1(crefs,get,ht);
1297012970
simVarIdcs = List.map2(simVars,getSimVarIndex,varInfo,allVars);
1297112971
varMapping = makeVarMapTuple(simVarIdcs,bVarIdcs,{});
12972-
_ = List.fold1(simVars, fillSimVarMapping, simVarMapping, 1);
12972+
_ = List.fold1(simVars, fillSimVarMapping, simVarMapping, 1);
1297312973
//print(stringDelimitList(List.map(crefs,ComponentReference.printComponentRefStr),"\n")+&"\n");
1297412974
//List.map_0(simVars,dumpVar);
1297512975
then

Compiler/Template/CodegenCpp.tpl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1803,7 +1803,7 @@ case SIMCODE(modelInfo = MODELINFO(__)) then
18031803
measureTimeProfileBlocksArray = std::vector<MeasureTimeData>(<%numOfEqs%>);
18041804
MeasureTime::addResultContentBlock("<%dotPath(modelInfo.name)%>","profileBlocks",&measureTimeProfileBlocksArray);
18051805
measureTimeFunctionsArray = std::vector<MeasureTimeData>(3); //1 evaluateODE ; 2 evaluateAll; 3 writeOutput
1806-
MeasureTime::addResultContentBlock("<%dotPath(modelInfo.name)%>","functions",&measureTimeFunctionsArray);
1806+
MeasureTime::addResultContentBlock("<%dotPath(modelInfo.name)%>","functions",&measureTimeFunctionsArray);
18071807
measuredProfileBlockStartValues = MeasureTime::getZeroValues();
18081808
measuredProfileBlockEndValues = MeasureTime::getZeroValues();
18091809
measuredFunctionStartValues = MeasureTime::getZeroValues();
@@ -1815,7 +1815,7 @@ case SIMCODE(modelInfo = MODELINFO(__)) then
18151815
ss << i;
18161816
measureTimeProfileBlocksArray[i] = MeasureTimeData(ss.str());
18171817
}
1818-
1818+
18191819
measureTimeFunctionsArray[0] = MeasureTimeData("evaluateODE");
18201820
measureTimeFunctionsArray[1] = MeasureTimeData("evaluateAll");
18211821
measureTimeFunctionsArray[2] = MeasureTimeData("writeOutput");
@@ -4488,7 +4488,7 @@ match modelInfo
44884488
<%generateMethodDeclarationCode(simCode)%>
44894489
virtual bool getCondition(unsigned int index);
44904490
virtual void initPreVars(unordered_map<string,unsigned int>&,unordered_map<string,unsigned int>&);
4491-
4491+
44924492
protected:
44934493
//Methods:
44944494
<%getrealvars%>
@@ -4522,7 +4522,7 @@ match modelInfo
45224522
>>%>
45234523
45244524
<%memberfuncs%>
4525-
4525+
45264526
<%additionalProtectedMembers%>
45274527
};
45284528
>>
@@ -11565,7 +11565,7 @@ template createEvaluateAll( list<SimEqSystem> allEquationsPlusWhen,list<SimWhenC
1156511565
<%equation_all_func_calls%>
1156611566
/* Reinits */
1156711567
<%reinit%>
11568-
11568+
1156911569
<%generateMeasureTimeEndCode("measuredFunctionStartValues", "measuredFunctionEndValues", "measureTimeFunctionsArray[1]")%>
1157011570
return state_var_reinitialized;
1157111571
}

Compiler/Template/CodegenCppHpcom.tpl

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ case SIMCODE(modelInfo = MODELINFO(__)) then
373373
measureTimeProfileBlocksArray = std::vector<MeasureTimeData>(<%numOfEqs%>);
374374
MeasureTime::addResultContentBlock("<%dotPath(modelInfo.name)%>","profileBlocks",&measureTimeProfileBlocksArray);
375375
measureTimeFunctionsArray = std::vector<MeasureTimeData>(3); //1 evaluateODE ; 2 evaluateAll; 3 writeOutput
376-
MeasureTime::addResultContentBlock("<%dotPath(modelInfo.name)%>","functions",&measureTimeFunctionsArray);
376+
MeasureTime::addResultContentBlock("<%dotPath(modelInfo.name)%>","functions",&measureTimeFunctionsArray);
377377
measuredProfileBlockStartValues = MeasureTime::getZeroValues();
378378
measuredProfileBlockEndValues = MeasureTime::getZeroValues();
379379
measuredFunctionStartValues = MeasureTime::getZeroValues();
@@ -385,7 +385,7 @@ case SIMCODE(modelInfo = MODELINFO(__)) then
385385
ss << i;
386386
measureTimeProfileBlocksArray[i] = MeasureTimeData(ss.str());
387387
}
388-
388+
389389
measureTimeFunctionsArray[0] = MeasureTimeData("evaluateODE");
390390
measureTimeFunctionsArray[1] = MeasureTimeData("evaluateAll");
391391
measureTimeFunctionsArray[2] = MeasureTimeData("writeOutput");
@@ -458,9 +458,9 @@ template getHpcomMemberVariableDefinition(Option<Schedule> hpcOmScheduleOpt)
458458
,<%initializeBarrierByName("levelBarrier","",getConfigInt(NUM_PROC),type)%>
459459
>>
460460
else ""
461-
end match
461+
end match
462462
else ""
463-
end match
463+
end match
464464
end getHpcomMemberVariableDefinition;
465465

466466
template getHpcomConstructorExtension(Option<Schedule> hpcOmScheduleOpt, String modelNamePrefixStr)
@@ -473,7 +473,7 @@ template getHpcomConstructorExtension(Option<Schedule> hpcOmScheduleOpt, String
473473
case ("pthreads_spin") then
474474
let threadFuncs = List.intRange(getConfigInt(NUM_PROC)) |> tt hasindex i0 fromindex 0 => generateThread(i0, type, modelNamePrefixStr,"evaluateThreadFunc"); separator="\n"
475475
<<
476-
476+
477477
<%threadFuncs%>
478478
>>
479479
else ""
@@ -536,10 +536,10 @@ template getHpcomDestructorExtension(Option<Schedule> hpcOmScheduleOpt)
536536
<<
537537
<%destroylocks%>
538538
>>
539-
case "mpi" then
540-
<<
541-
//MF: Destruct MPI related stuff - nothing at the moment.
542-
>>
539+
case "mpi" then
540+
<<
541+
//MF: Destruct MPI related stuff - nothing at the moment.
542+
>>
543543
else
544544
let joinThreads = arrayList(hpcOmSchedule.threadTasks) |> tt hasindex i0 fromindex 0 => function_HPCOM_joinThread(i0, type); separator="\n"
545545
let threadReleaseLocks = arrayList(hpcOmSchedule.threadTasks) |> tt hasindex i0 fromindex 0 => releaseLockByLockName(i0, "th_lock", type); separator="\n"
@@ -649,7 +649,7 @@ template update2(list<SimEqSystem> allEquationsPlusWhen, list<list<SimEqSystem>>
649649
/*delete threadValues;
650650
++(measureTimeArrayHpcom[0].numCalcs);*/
651651
>>%>
652-
652+
653653
<%generateMeasureTimeEndCode("measuredFunctionStartValues", "measuredFunctionEndValues", "measureTimeFunctionsArray[0]")%>
654654
}
655655
>>
@@ -818,7 +818,7 @@ template generateLevelFixedCodeForThread(list<SimEqSystem> allEquationsPlusWhen,
818818
MeasureTime::getInstance()->initializeThread(getThreadNumber);
819819
//<%generateMeasureTimeStartCode('valuesStart')%>
820820
>>%>
821-
821+
822822
while(!_simulationFinished)
823823
{
824824
_evaluateBarrier.wait();
@@ -829,7 +829,7 @@ template generateLevelFixedCodeForThread(list<SimEqSystem> allEquationsPlusWhen,
829829
}
830830
<%if boolNot(stringEq(getConfigString(PROFILING_LEVEL),"none")) then '<%generateMeasureTimeStartCode("valuesStart")%>'%>
831831
<%odeEqs%>
832-
832+
833833
<%if boolNot(stringEq(getConfigString(PROFILING_LEVEL),"none")) then
834834
<<
835835
//MeasureTime::getTimeValuesEnd(valuesEnd);
@@ -842,7 +842,7 @@ template generateLevelFixedCodeForThread(list<SimEqSystem> allEquationsPlusWhen,
842842
//_measureTimeArrayLock.unlock();
843843
<%generateMeasureTimeEndCode("valuesStart", "valuesEnd", "measureTimeFunctionsArray[0]")%>
844844
>>%>
845-
845+
846846
_evaluateBarrier.wait();
847847
}
848848
<%if boolNot(stringEq(getConfigString(PROFILING_LEVEL),"none")) then

Compiler/Template/SimCodeTV.mo

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3334,7 +3334,7 @@ package HpcOmSimCode
33343334
list<SimCodeVar.SimVar> boolVars;
33353335
end COMMUNICATION_INFO;
33363336
end CommunicationInfo;
3337-
3337+
33383338
uniontype Task
33393339
record CALCTASK //Task which calculates something
33403340
Integer weighting;
@@ -3412,7 +3412,7 @@ package HpcOmMemory
34123412
end HpcOmMemory;
34133413

34143414
package HpcOmScheduler
3415-
function convertFixedLevelScheduleToTaskLists
3415+
function convertFixedLevelScheduleToTaskLists
34163416
input HpcOmSimCode.Schedule iSchedule;
34173417
input Integer iNumOfThreads;
34183418
output array<list<list<HpcOmSimCode.Task>>> oThreadLevelTasks;

Compiler/Util/Util.mo

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -981,7 +981,7 @@ public function arrayFold5
981981
replaceable type ArgType3 subtypeof Any;
982982
replaceable type ArgType4 subtypeof Any;
983983
replaceable type ArgType5 subtypeof Any;
984-
984+
985985
partial function FoldFunc5
986986
input ElementType inElement;
987987
input ArgType1 _inExtraArg1;
@@ -1074,7 +1074,7 @@ public function arrayFold6
10741074
replaceable type ArgType4 subtypeof Any;
10751075
replaceable type ArgType5 subtypeof Any;
10761076
replaceable type ArgType6 subtypeof Any;
1077-
1077+
10781078
partial function FoldFunc6
10791079
input ElementType inElement;
10801080
input ArgType1 _inExtraArg1;

0 commit comments

Comments
 (0)