Skip to content

Commit

Permalink
[Janitor mode] Fix whitespace
Browse files Browse the repository at this point in the history
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@25545 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
OpenModelica-Hudson committed Apr 14, 2015
1 parent 26d28e4 commit e9f1e1a
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 10 deletions.
6 changes: 3 additions & 3 deletions Compiler/BackEnd/HpcOmScheduler.mo
Expand Up @@ -215,7 +215,7 @@ algorithm
//find the best thread for scheduling
threadFinishTimes = calculateFinishTimes(0.0, head, {}, iCommCosts, iThreadReadyTimes);
((threadId, threadFinishTime)) = getThreadFinishTimesMin(1,threadFinishTimes,-1,0.0);

tmpThreadReadyTimes = arrayUpdate(iThreadReadyTimes, threadId, threadFinishTime);
threadTasks = arrayGet(allThreadTasks,threadId);
simEqIdc = List.flatten(List.map1(eqIdc,getSimEqSysIdxForComp,iSccSimEqMapping));
Expand Down Expand Up @@ -6284,8 +6284,8 @@ algorithm
oTypeString := match(iTask)
case(HpcOmSimCode.SCHEDULED_TASK()) then "Scheduled task";
case(HpcOmSimCode.CALCTASK()) then "Calctask";
case(HpcOmSimCode.CALCTASK_LEVEL()) then "Calctask level";
case(HpcOmSimCode.DEPTASK()) then "Deptask";
case(HpcOmSimCode.CALCTASK_LEVEL()) then "Calctask level";
case(HpcOmSimCode.DEPTASK()) then "Deptask";
case(HpcOmSimCode.PREFETCHTASK()) then "Prefetch task";
case(HpcOmSimCode.TASKEMPTY()) then "Empty task";
else then "Unknown";
Expand Down
2 changes: 1 addition & 1 deletion Compiler/BackEnd/HpcOmTaskGraph.mo
Expand Up @@ -4393,7 +4393,7 @@ algorithm
commCosts := getCommCostsOnly(commCosts);
// estimate the executionCosts
exeCostsLst := List.flatten(List.map3(List.intRange(listLength(compsLst)),estimateCosts0,compsLst,eqSystems,shared));

//overwrite old values
compIdx := 1;
for exeCost in exeCostsLst loop
Expand Down
2 changes: 1 addition & 1 deletion Compiler/SimCode/HpcOmSimCode.mo
Expand Up @@ -41,7 +41,7 @@ encapsulated package HpcOmSimCode
Option<HpcOmSimCode.Schedule> daeSchedule;
Option<HpcOmSimCode.Schedule> odeSchedule;
Option<HpcOmSimCode.MemoryMap> hpcOmMemory;
end HPCOMDATA;
end HPCOMDATA;
end HpcOmData;

public uniontype MemoryMap //stores information to organize the memory for the parallel code in an efficient way
Expand Down
4 changes: 2 additions & 2 deletions Compiler/SimCode/HpcOmSimCodeMain.mo
Expand Up @@ -332,7 +332,7 @@ algorithm
//---------------
numProc = Flags.getConfigInt(Flags.NUM_PROC);
(numProc,_) = setNumProc(numProc,cpCostsWoC,taskGraphDataOde);//in case n-flag is not set

(scheduleDae,simCode,taskGraphDaeScheduled,taskGraphDataDaeScheduled,sccSimEqMapping) = createSchedule(taskGraphDaeSimplified,taskGraphDataDaeSimplified,daeSccSimEqMapping,simVarMapping,filenamePrefix,numProc,simCode,scheduledTasksDae,"DAE system");
(scheduleOde,simCode,taskGraphOdeScheduled,taskGraphDataOdeScheduled,sccSimEqMapping) = createSchedule(taskGraphOdeSimplified,taskGraphDataOdeSimplified,sccSimEqMapping,simVarMapping,filenamePrefix,numProc,simCode,scheduledTasksOde,"ODE system");

Expand Down Expand Up @@ -368,7 +368,7 @@ algorithm
//------------------------------
optTmpMemoryMap = HpcOmMemory.createMemoryMap(modelInfo, taskGraphOdeSimplified, BackendDAEUtil.transposeMatrix(taskGraphOdeSimplified,arrayLength(taskGraphOdeSimplified)), taskGraphDataOdeSimplified, eqs, filenamePrefix, schedulerInfo, scheduleOde, sccSimEqMapping, criticalPaths, criticalPathsWoC, criticalPathInfo, numProc, allComps);
SimCodeUtil.execStat("hpcom create memory map");

hpcomData = HpcOmSimCode.HPCOMDATA(SOME(scheduleDae), SOME(scheduleOde), optTmpMemoryMap);
simCode = SimCode.SIMCODE(modelInfo, simCodeLiterals, simCodeRecordDecls, simCodeExternalFunctionIncludes, allEquations, odeEquations, algebraicEquations, useSymbolicInitialization, useHomotopy, initialEquations, removedInitialEquations, startValueEquations, nominalValueEquations, minValueEquations, maxValueEquations,
parameterEquations, removedEquations, algorithmAndEquationAsserts, zeroCrossingsEquations, jacobianEquations, stateSets, constraints, classAttributes, zeroCrossings, relations, timeEvents, whenClauses,
Expand Down
2 changes: 1 addition & 1 deletion Compiler/SimCode/SimCodeUtil.mo
Expand Up @@ -12305,7 +12305,7 @@ algorithm
HpcOmSimCode.HpcOmData hpcomData;
Option<SimCode.FmiModelStructure> modelStruct;
Option<SimCode.BackendMapping> backendMapping;

case (SimCode.SIMCODE(modelInfo, _, recordDecls, externalFunctionIncludes,
allEquations, odeEquations, algebraicEquations,
useSymbolicInitialization, useHomotopy, initialEquations, removedInitialEquations, startValueEquations, nominalValueEquations, minValueEquations, maxValueEquations,
Expand Down
4 changes: 2 additions & 2 deletions Compiler/Template/SimCodeTV.mo
Expand Up @@ -3462,9 +3462,9 @@ package HpcOmSimCode
Option<Schedule> daeSchedule;
Option<Schedule> odeSchedule;
Option<MemoryMap> hpcOmMemory;
end HPCOMDATA;
end HPCOMDATA;
end HpcOmData;

uniontype CommunicationInfo //stores more detailed information about a communication (edge)
record COMMUNICATION_INFO
list<SimCodeVar.SimVar> floatVars; //the float, int and boolean variables that have to be transfered
Expand Down

0 comments on commit e9f1e1a

Please sign in to comment.