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@24009 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
OpenModelica-Hudson committed Jan 12, 2015
1 parent cae7958 commit f92dbf3
Show file tree
Hide file tree
Showing 6 changed files with 95 additions and 95 deletions.
162 changes: 81 additions & 81 deletions Compiler/BackEnd/HpcOmMemory.mo

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Compiler/SimCode/HpcOmSimCode.mo
Expand Up @@ -71,7 +71,7 @@ encapsulated package HpcOmSimCode
end CALCTASK;
record CALCTASK_LEVEL
list<Integer> eqIdc;
list<Integer> nodeIdc; //graph-node indices of same level nodes
list<Integer> nodeIdc; //graph-node indices of same level nodes
Option<Integer> threadIdx; //an advice which thread should calculate the task
end CALCTASK_LEVEL;
record DEPTASK
Expand Down
2 changes: 1 addition & 1 deletion Compiler/SimCode/HpcOmSimCodeMain.mo
Expand Up @@ -199,7 +199,7 @@ algorithm
SimCode.SIMCODE(modelInfo, simCodeLiterals, simCodeRecordDecls, simCodeExternalFunctionIncludes, allEquations, odeEquations, algebraicEquations, residualEquations, useSymbolicInitialization, useHomotopy, initialEquations, removedInitialEquations, startValueEquations, nominalValueEquations, minValueEquations, maxValueEquations,
parameterEquations, removedEquations, algorithmAndEquationAsserts, zeroCrossingsEquations, jacobianEquations, stateSets, constraints, classAttributes, zeroCrossings, relations, timeEvents, whenClauses,
discreteModelVars, extObjInfo, makefileParams, delayedExps, jacobianMatrixes, simulationSettingsOpt, fileNamePrefix, _, _, _, crefToSimVarHT, backendMapping) = simCode;

//print("Number of literals pre: " + intString(listLength(simCodeLiterals)) + "\n");

SOME(SimCode.BACKENDMAPPING(simVarMapping=simVarMapping)) = backendMapping;
Expand Down
8 changes: 4 additions & 4 deletions Compiler/Template/CodegenCpp.tpl
Expand Up @@ -5070,12 +5070,12 @@ case SIMCODE(modelInfo=MODELINFO(__), extObjInfo=EXTOBJINFO(__)) then
#ifdef __GNUC__
#define VAR_ALIGN_PRE
#define VAR_ALIGN_POST __attribute__((aligned(0x40)))
#elif defined _MSC_VER
#elif defined _MSC_VER
#define VAR_ALIGN_PRE __declspec(align(64))
#define VAR_ALIGN_POST
#else
#define VAR_ALIGN_PRE
#define VAR_ALIGN_POST
#define VAR_ALIGN_PRE
#define VAR_ALIGN_POST
#endif

//Forward declaration to speed-up the compilation process
Expand Down Expand Up @@ -5175,7 +5175,7 @@ match modelInfo
<%friendclasses%>
public:
<%additionalPublicMembers%>

<%lastIdentOfPath(modelInfo.name)%>(IGlobalSettings* globalSettings, boost::shared_ptr<IAlgLoopSolverFactory> nonlinsolverfactor, boost::shared_ptr<ISimData>);

virtual ~<%lastIdentOfPath(modelInfo.name)%>();
Expand Down
14 changes: 7 additions & 7 deletions Compiler/Template/CodegenCppHpcom.tpl
Expand Up @@ -27,10 +27,10 @@ template translateModel(SimCode simCode , Boolean useFlatArrayNotation) ::=
simulationMainFile(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, "", HpcOmMemory.useHpcomMemoryOptimization(hpcOmMemory)),
let()= textFile(simulationHeaderFile(simCode ,contextOther,&extraFuncs ,&extraFuncsDecl, "", generateAdditionalIncludes(simCode ,&extraFuncs ,&extraFuncsDecl, "", HpcOmMemory.useHpcomMemoryOptimization(hpcOmMemory)),
generateAdditionalPublicMemberDeclaration(simCode ,&extraFuncs ,&extraFuncsDecl, ""),
generateAdditionalProtectedMemberDeclaration(simCode ,&extraFuncs ,&extraFuncsDecl, "", HpcOmMemory.useHpcomMemoryOptimization(hpcOmMemory)),
false, HpcOmMemory.useHpcomMemoryOptimization(hpcOmMemory)),
generateAdditionalProtectedMemberDeclaration(simCode ,&extraFuncs ,&extraFuncsDecl, "", HpcOmMemory.useHpcomMemoryOptimization(hpcOmMemory)),
false, HpcOmMemory.useHpcomMemoryOptimization(hpcOmMemory)),
'OMCpp<%fileNamePrefix%>.h')
let()= textFile(simulationCppFile(simCode ,contextOther,&extraFuncs ,&extraFuncsDecl, "", stateDerVectorName, HpcOmMemory.useHpcomMemoryOptimization(hpcOmMemory)), 'OMCpp<%fileNamePrefix%>.cpp')
let()= textFile(simulationFunctionsHeaderFile(simCode ,&extraFuncs ,&extraFuncsDecl, "",modelInfo.functions,literals,stateDerVectorName,false), 'OMCpp<%fileNamePrefix%>Functions.h')
Expand Down Expand Up @@ -118,9 +118,9 @@ template generateAdditionalPublicMemberDeclaration(SimCode simCode ,Text& extraF
let addHpcomArrayHeaders = getAddHpcomVarArrays(hpcOmMemory)
<<
<%addHpcomArrayHeaders%>

void* operator new(size_t);
void operator delete(void*);
void operator delete(void*);
>>
else ''
else ''
Expand Down Expand Up @@ -475,7 +475,7 @@ template simulationCppFile(SimCode simCode,Context context,Text& extraFuncs,Text
<%hpcomConstructorExtension%>
}

<%if(HpcOmMemory.useHpcomMemoryOptimization(hpcOmMemory)) then
<<
void* <%lastIdentOfPath(modelInfo.name)%>::operator new(size_t size)
Expand Down Expand Up @@ -1931,7 +1931,7 @@ match simVar
else
<<
<%varTypeStr%> <%varNameStr%>;
>>
>>
)
)
else ''
Expand Down
2 changes: 1 addition & 1 deletion Compiler/Template/SimCodeTV.mo
Expand Up @@ -3460,7 +3460,7 @@ package HpcOmMemory
input Option<HpcOmSimCode.MemoryMap> iMemoryMapOpt;
output Boolean oUseMemoryOptimization;
end useHpcomMemoryOptimization;

function getPositionMappingByArrayName
input HpcOmSimCode.MemoryMap iMemoryMap;
input DAE.ComponentRef iVarName;
Expand Down

0 comments on commit f92dbf3

Please sign in to comment.