zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

COMP: adjustments for 64-bit label-size

Browse Source
This commit is contained in:
Mark Olesen
2017-12-11 10:22:06 +01:00
parent 2d76c49b94
commit fd4782f754
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
applications/utilities/parallelProcessing/redistributePar/parLagrangianRedistributorRedistributeFields.C
View File

@ -105,7 +105,7 @@ void Foam::parLagrangianRedistributor::redistributeLagrangianFields
IOobject::NO_WRITE, IOobject::NO_WRITE,
false false
), ),
0 label(0)
); );
map.distribute(field); map.distribute(field);
@ -179,7 +179,7 @@ void Foam::parLagrangianRedistributor::redistributeLagrangianFieldFields
Info<< " " << objectNames[i] << endl; Info<< " " << objectNames[i] << endl;
// Read if present // Read if present
CompactIOField<Field<Type>, Type > field CompactIOField<Field<Type>, Type> field
( (
IOobject IOobject
( (
@ -191,7 +191,7 @@ void Foam::parLagrangianRedistributor::redistributeLagrangianFieldFields
IOobject::NO_WRITE, IOobject::NO_WRITE,
false false
), ),
0 label(0)
); );
// Distribute // Distribute
@ -259,7 +259,7 @@ void Foam::parLagrangianRedistributor::readLagrangianFields
IOobject::READ_IF_PRESENT, IOobject::READ_IF_PRESENT,
IOobject::NO_WRITE IOobject::NO_WRITE
), ),
0 label(0)
); );
fieldPtr->store(); fieldPtr->store();
@ -277,7 +277,7 @@ void Foam::parLagrangianRedistributor::redistributeStoredLagrangianFields
{ {
HashTable<Container*> fields HashTable<Container*> fields
( (
cloud.lookupClass<Container >() cloud.lookupClass<Container>()
); );
if (fields.size()) if (fields.size())

22
src/OpenFOAM/db/IOobjects/decomposedBlockData/decomposedBlockData.C
View File

@ -366,7 +366,7 @@ bool Foam::decomposedBlockData::readBlocks
( (
label proci = 1; label proci = 1;
proci < UPstream::nProcs(comm); proci < UPstream::nProcs(comm);
proci++ ++proci
) )
{ {
List<char> elems(is); List<char> elems(is);
@ -423,7 +423,7 @@ bool Foam::decomposedBlockData::readBlocks
( (
label proci = 1; label proci = 1;
proci < UPstream::nProcs(comm); proci < UPstream::nProcs(comm);
proci++ ++proci
) )
{ {
List<char> elems(is); List<char> elems(is);
@ -506,7 +506,7 @@ Foam::autoPtr<Foam::ISstream> Foam::decomposedBlockData::readBlocks
( (
label proci = 1; label proci = 1;
proci < UPstream::nProcs(comm); proci < UPstream::nProcs(comm);
proci++ ++proci
) )
{ {
is >> data; is >> data;
@ -589,7 +589,7 @@ Foam::autoPtr<Foam::ISstream> Foam::decomposedBlockData::readBlocks
( (
label proci = 1; label proci = 1;
proci < UPstream::nProcs(comm); proci < UPstream::nProcs(comm);
proci++ ++proci
) )
{ {
List<char> elems(is); List<char> elems(is);
@ -661,8 +661,8 @@ void Foam::decomposedBlockData::gather
char* data0Ptr = reinterpret_cast<char*>(datas.begin()); char* data0Ptr = reinterpret_cast<char*>(datas.begin());
labelList recvOffsets; List<int> recvOffsets;
labelList recvSizes; List<int> recvSizes;
if (UPstream::master()) if (UPstream::master())
{ {
recvOffsets.setSize(nProcs); recvOffsets.setSize(nProcs);
@ -716,7 +716,7 @@ void Foam::decomposedBlockData::gatherSlaveData
sliceSizes[proci] = int(recvSizes[proci]); sliceSizes[proci] = int(recvSizes[proci]);
sliceOffsets[proci] = totalSize; sliceOffsets[proci] = totalSize;
totalSize += sliceSizes[proci]; totalSize += sliceSizes[proci];
proci++; ++proci;
} }
sliceOffsets[proci] = totalSize; sliceOffsets[proci] = totalSize;
recvData.setSize(totalSize); recvData.setSize(totalSize);
@ -798,7 +798,7 @@ bool Foam::decomposedBlockData::writeBlocks
label slaveOffset = 0; label slaveOffset = 0;
for (label proci = 1; proci < nProcs; proci++) for (label proci = 1; proci < nProcs; ++proci)
{ {
os << nl << nl << "// Processor" << proci << nl; os << nl << nl << "// Processor" << proci << nl;
start[proci] = os.stdStream().tellp(); start[proci] = os.stdStream().tellp();
@ -827,7 +827,7 @@ bool Foam::decomposedBlockData::writeBlocks
} }
// Write slaves // Write slaves
List<char> elems; List<char> elems;
for (label proci = 1; proci < nProcs; proci++) for (label proci = 1; proci < nProcs; ++proci)
{ {
elems.setSize(recvSizes[proci]); elems.setSize(recvSizes[proci]);
IPstream::read IPstream::read
@ -899,7 +899,7 @@ bool Foam::decomposedBlockData::writeBlocks
) )
{ {
totalSize += recvSizes[proci]; totalSize += recvSizes[proci];
proci++; ++proci;
} }
masterData[1] = proci-masterData[0]; masterData[1] = proci-masterData[0];
@ -948,7 +948,7 @@ bool Foam::decomposedBlockData::writeBlocks
( (
label proci = startAndSize[0]; label proci = startAndSize[0];
proci < startAndSize[0]+startAndSize[1]; proci < startAndSize[0]+startAndSize[1];
proci++ ++proci
) )
{ {
os << nl << nl << "// Processor" << proci << nl; os << nl << nl << "// Processor" << proci << nl;