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@25597 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
OpenModelica-Hudson committed Apr 17, 2015
1 parent c6b8c97 commit 5c52f06
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions Compiler/BackEnd/HpcOmMemory.mo
Expand Up @@ -341,7 +341,7 @@ encapsulated package HpcOmMemory
else
tmpMemoryMap = HpcOmSimCode.MEMORYMAP_UNIFORM();
end if;

//print cache map
//printCacheMap(cacheMap);
//evaluateCacheBehaviour(cacheMap, iTaskGraphT, nodeSimCodeVarMapping, scVarCLMapping, iNumberOfThreads, numCL, iSchedulerInfo);
Expand Down Expand Up @@ -1385,7 +1385,7 @@ encapsulated package HpcOmMemory
print("HpcOmMemory.createCacheMapFromThreadAndSharedCLs: Thread bool cache lines\n");
List.map_0(cacheLinesBool, function printCacheLineMap(iCacheVariables = cacheVariables));
print("\n");

cacheLinesFloat := listAppend(cacheLinesFloat, List.map(Util.tuple31(partlyFilledCacheLines), getCacheLineMapOfPartlyFilledCacheLine));
print("HpcOmMemory.createCacheMapFromThreadAndSharedCLs: Partly float cache lines\n");
List.map_0(List.map(Util.tuple31(partlyFilledCacheLines), getCacheLineMapOfPartlyFilledCacheLine), function printCacheLineMap(iCacheVariables = cacheVariables));
Expand Down
2 changes: 1 addition & 1 deletion Compiler/Template/CodegenCpp.tpl
Expand Up @@ -6158,7 +6158,7 @@ case SIMCODE(modelInfo=MODELINFO(__), extObjInfo=EXTOBJINFO(__)) then
end generateAlgloopHeaderInlcudeString;

template generateClassDeclarationCode(SimCode simCode,Context context,Text& extraFuncs,Text& extraFuncsDecl,Text extraFuncsNamespace,
String additionalPublicMembers, String additionalProtectedMembers, String memberVariableDefinitions,
String additionalPublicMembers, String additionalProtectedMembers, String memberVariableDefinitions,
String memberPreVariableDefinitions, Boolean useFlatArrayNotation)
"Generates class declarations."
::=
Expand Down
14 changes: 7 additions & 7 deletions Compiler/Template/CodegenCppHpcom.tpl
Expand Up @@ -27,10 +27,10 @@ template translateModel(SimCode simCode)
let() = textFile(simulationMainFile(target, simCode, &extraFuncs, &extraFuncsDecl, "", (if Flags.isSet(USEMPI) then "#include <mpi.h>" else ""), (if Flags.isSet(USEMPI) then MPIInit() else ""), (if Flags.isSet(USEMPI) then MPIFinalize() else "")), 'OMCpp<%fileNamePrefix%>Main.cpp')

let() = textFile(simulationHeaderFile(simCode ,contextOther, &extraFuncs, &extraFuncsDecl, "",
generateAdditionalIncludes(simCode, &extraFuncs, &extraFuncsDecl, "", stringBool(useMemoryOptimization)),
generateAdditionalIncludes(simCode, &extraFuncs, &extraFuncsDecl, "", stringBool(useMemoryOptimization)),
generateAdditionalPublicMemberDeclaration(simCode, &extraFuncs, &extraFuncsDecl, ""),
generateAdditionalProtectedMemberDeclaration(simCode, &extraFuncs, &extraFuncsDecl, "", stringBool(useMemoryOptimization)),
MemberVariable(modelInfo, hpcomData.hpcOmMemory, stringBool(useMemoryOptimization),false),
MemberVariable(modelInfo, hpcomData.hpcOmMemory, stringBool(useMemoryOptimization),false),
//MemberVariablePreVariables(modelInfo, hpcomData.hpcOmMemory, stringBool(useMemoryOptimization),false), false),
CodegenCpp.MemberVariablePreVariables(modelInfo,false), false),
'OMCpp<%fileNamePrefix%>.h')
Expand Down Expand Up @@ -261,19 +261,19 @@ template getAddHpcomVarArrays(Option<MemoryMap> optHpcomMemoryMap, Boolean creat
match hpcomMemoryMap
case(MEMORYMAP_ARRAY(__)) then
<<
<%if intGt(floatArraySize,0) then
<%if intGt(floatArraySize,0) then
if(createConstructorDeclaration) then
'varArray1(new double[<%floatArraySize%>]),'
else
'double *varArray1; //float variables <%floatArraySize%>'
%>
<%if intGt(intArraySize,0) then
<%if intGt(intArraySize,0) then
if(createConstructorDeclaration) then
'varArray2(new int[<%intArraySize%>]),'
else
'int *varArray2; //int variables <%intArraySize%>'
%>
<%if intGt(boolArraySize,0) then
<%if intGt(boolArraySize,0) then
if(createConstructorDeclaration) then
'varArray3(new bool[<%boolArraySize%>]),'
else
Expand Down Expand Up @@ -1931,7 +1931,7 @@ template MemberVariableInitialize1(SimVar simVar, Option<MemoryMap> hpcOmMemoryO
::=
match simVar
case SIMVAR(numArrayElement={},arrayCref=NONE(),name=CREF_IDENT(subscriptLst=_::_)) then ''

case SIMVAR(numArrayElement={},arrayCref=NONE()) then
MemberVariableInitialize2(simVar, HpcOmMemory.getPositionMappingByArrayName(hpcOmMemoryOpt,name), hpcOmMemoryOpt, createDefaultInitialization, useFlatArrayNotation, type, indices)
case v as SIMVAR(name=CREF_IDENT(__),arrayCref=SOME(_),numArrayElement=num)
Expand Down Expand Up @@ -1988,7 +1988,7 @@ match simVar
>>
else
if createDefaultInitialization then CodegenCpp.MemberVariableInitialize2(simVar, useFlatArrayNotation, type, indices) else ''
end match
end match
/*special case for variables that marked as array but are not arrays */
case SIMVAR(numArrayElement=_::_) then
match(optVarArrayAssignment)
Expand Down

0 comments on commit 5c52f06

Please sign in to comment.