Skip to content

Commit 566b709

Browse files
[Janitor mode] Fix whitespace
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@22527 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
1 parent e8f4256 commit 566b709

File tree

2 files changed

+16
-16
lines changed

2 files changed

+16
-16
lines changed

Compiler/Template/CodegenCpp.tpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4497,7 +4497,7 @@ match modelInfo
44974497
<%generateMethodDeclarationCode(simCode)%>
44984498
virtual bool getCondition(unsigned int index);
44994499
virtual void initPreVars(unordered_map<string,unsigned int>&,unordered_map<string,unsigned int>&);
4500-
4500+
45014501
protected:
45024502
//Methods:
45034503
<%getrealvars%>
@@ -4530,7 +4530,7 @@ match modelInfo
45304530
>>%>
45314531
45324532
<%memberfuncs%>
4533-
4533+
45344534
<%additionalProtectedMembers%>
45354535
};
45364536
>>

Compiler/Template/CodegenCppHpcom.tpl

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ case SIMCODE(modelInfo = MODELINFO(__)) then
9393
let addHpcomVarHeaders = getAddHpcomVarHeaders(hpcOmSchedule)
9494
let addHpcomArrayHeaders = getAddHpcomVarArrays(hpcOmMemory)
9595
let type = getConfigString(HPCOM_CODE)
96-
96+
9797
<<
9898
// HPCOM
9999
#ifdef __GNUC__
@@ -103,9 +103,9 @@ case SIMCODE(modelInfo = MODELINFO(__)) then
103103
#define VARARRAY_ALIGN_PRE __declspec(align(64))
104104
#define VARARRAY_ALIGN_POST
105105
#endif
106-
106+
107107
static long unsigned int getThreadNumber()
108-
{
108+
{
109109
<% match type
110110
case ("openmp") then
111111
<<
@@ -114,12 +114,12 @@ case SIMCODE(modelInfo = MODELINFO(__)) then
114114
else
115115
'return 0;'%>
116116
}
117-
117+
118118
<%addHpcomFunctionHeaders%>
119119
<%addHpcomArrayHeaders%>
120120
<%addHpcomVarHeaders%>
121121
<%MemberVariable(modelInfo, hpcOmMemory,useFlatArrayNotation,false)%>
122-
122+
123123
<% if boolNot(stringEq(getConfigString(PROFILING_LEVEL),"none")) then
124124
<<
125125
std::vector<MeasureTimeData> measureTimeArrayHpcom;
@@ -368,17 +368,17 @@ case SIMCODE(modelInfo = MODELINFO(__)) then
368368
ss << i;
369369
measureTimeArray[i] = MeasureTimeData(ss.str());
370370
}
371-
371+
372372
measureTimeArrayHpcom = std::vector<MeasureTimeData>(2);
373373
MeasureTime::addResultContentBlock("<%dotPath(modelInfo.name)%>","hpcomMeasurements",&measureTimeArrayHpcom);
374374
measuredStartValuesODE = MeasureTime::getZeroValues();
375375
measuredEndValuesODE = MeasureTime::getZeroValues();
376-
376+
377377
measureTimeArrayHpcom[0] = MeasureTimeData("EvaluateODE");
378378
measureTimeArrayHpcom[1] = MeasureTimeData("EvaluateODE Overhead");
379379
>>
380380
%>
381-
381+
382382
//DAE's are not supported yet, Index reduction is enabled
383383
_dimAE = 0; // algebraic equations
384384
//Initialize the state vector
@@ -646,10 +646,10 @@ template update2(list<SimEqSystem> allEquationsPlusWhen, list<list<SimEqSystem>>
646646
>>%>
647647
648648
<%odeEqs%>
649-
649+
650650
<%if boolNot(stringEq(getConfigString(PROFILING_LEVEL),"none")) then
651651
<<
652-
652+
653653
MeasureTime::getTimeValuesEnd(valuesEnd);
654654
valuesEnd->sub(valuesStart);
655655
valuesEnd->sub(MeasureTime::getOverhead());
@@ -661,7 +661,7 @@ template update2(list<SimEqSystem> allEquationsPlusWhen, list<list<SimEqSystem>>
661661
delete valuesEnd;
662662
>>%>
663663
}
664-
<%if boolNot(stringEq(getConfigString(PROFILING_LEVEL),"none")) then
664+
<%if boolNot(stringEq(getConfigString(PROFILING_LEVEL),"none")) then
665665
<<
666666
delete threadValues;
667667
++(measureTimeArrayHpcom[0].numCalcs);
@@ -1293,21 +1293,21 @@ end simulationMainFileAnalyzation;
12931293
template simulationMakefile(String target,SimCode simCode)
12941294
::=
12951295
let type = getConfigString(HPCOM_CODE)
1296-
1296+
12971297
let &additionalCFlags_GCC = buffer ""
12981298
let &additionalCFlags_GCC += if stringEq(type,"openmp") then " -fopenmp" else ""
12991299
let &additionalCFlags_GCC += if Flags.isSet(Flags.HPCOM_ANALYZATION_MODE) then ' -D ANALYZATION_MODE -I"$(SUNDIALS_INCLUDE)" -I"$(SUNDIALS_INCLUDE)/kinsol" -I"$(SUNDIALS_INCLUDE)/nvector"' else ""
13001300

13011301
let &additionalCFlags_MSVC = buffer ""
13021302
let &additionalCFlags_MSVC += if stringEq(type,"openmp") then "/openmp" else ""
13031303
let &additionalCFlags_MSVC += if Flags.isSet(Flags.HPCOM_ANALYZATION_MODE) then '/DANALYZATION_MODE /I"$(SUNDIALS_INCLUDE)" /I"$(SUNDIALS_INCLUDE)/kinsol" /I"$(SUNDIALS_INCLUDE)/nvector"' else ""
1304-
1304+
13051305
let &additionalLinkerFlags_GCC = buffer ""
13061306
let &additionalLinkerFlags_GCC += if Flags.isSet(Flags.HPCOM_ANALYZATION_MODE) then '$(LIBOMCPPOMCFACTORY) $(LIBOMCPPSIMCONTROLLER) $(LIBOMCPPSIMULATIONSETTINGS) $(LIBOMCPPSYSTEM) $(LIBOMCPPDATAEXCHANGE) $(LIBOMCPPNEWTON) $(LIBOMCPPUMFPACK) $(LIBOMCPPKINSOL) $(LIBOMCPPCVODE) $(LIBOMCPPSOLVER) $(LIBOMCPPMATH) $(LIBOMCPPMODELICAUTILITIES) $(SUNDIALS_LIBS) $(LAPACK_LIBS) $(BASE_LIB)' else '-lOMCppOMCFactory $(BASE_LIB)'
13071307
let &additionalLinkerFlags_GCC += if stringEq(type,"tbb") then "-ltbb" else ""
13081308

13091309
let &additionalLinkerFlags_MSVC = buffer ""
1310-
1310+
13111311
CodegenCpp.simulationMakefile(target, simCode, additionalLinkerFlags_GCC, additionalCFlags_MSVC, additionalCFlags_GCC, additionalLinkerFlags_MSVC)
13121312
end simulationMakefile;
13131313

0 commit comments

Comments
 (0)