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

STYLE: consolidate positionsCompat1706 structure (issue #721)

Browse Source
This commit is contained in:
Mark Olesen
2018-02-19 11:57:57 +01:00
parent 3c35c3535e
commit cbbb9753eb
5 changed files with 38 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
applications/utilities/parallelProcessing/redistributePar/passivePositionParticle.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2017 OpenCFD Ltd.
\\ / A nd | Copyright (C) 2017-2018 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -122,17 +122,7 @@ public:
{
// Copy data into old format structure. Exact opposite of
// particleIO.C reading old format.
struct oldParticle
{
vector position;
label celli;
label facei;
scalar stepFraction;
label tetFacei;
label tetPti;
label origProc;
label origId;
} p;
particle::positionsCompat1706 p;
p.position = ppi.position_;
p.celli = ppi.cell();
@ -158,7 +148,8 @@ public:
{
const std::size_t sizeofFields
(
sizeof(oldParticle) - offsetof(oldParticle, position)
sizeof(particle::positionsCompat1706)
- offsetof(particle::positionsCompat1706, position)
);
os.write

2
src/lagrangian/basic/IOPosition/IOPosition.C
View File

@ -23,8 +23,6 @@ License
\*---------------------------------------------------------------------------*/
#include "IOPosition.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
template<class CloudType>

18
src/lagrangian/basic/injectedParticle/injectedParticleIO.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2016-2017 OpenCFD Ltd.
\\ / A nd | Copyright (C) 2016-2018 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -204,20 +204,12 @@ void Foam::injectedParticle::writePosition(Ostream& os) const
}
else
{
struct oldParticle
{
vector position;
label celli;
label facei;
scalar stepFraction;
label tetFacei;
label tetPti;
label origProc;
label origId;
} p;
positionsCompat1706 p;
const size_t s =
offsetof(oldParticle, facei) - offsetof(oldParticle, position);
(
offsetof(positionsCompat1706, facei)
- offsetof(positionsCompat1706, position));
p.position = position_;
p.celli = cell();

14
src/lagrangian/basic/particle/particle.H
View File

@ -126,6 +126,20 @@ public:
};
//- Old particle positions content for OpenFOAM-1706 and earlier
struct positionsCompat1706
{
vector position;
label celli;
label facei;
scalar stepFraction;
label tetFacei;
label tetPti;
label origProc;
label origId;
};
private:
// Private data

42
src/lagrangian/basic/particle/particleIO.C
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
\\/ M anipulation | Copyright (C) 2016-2018 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -86,17 +86,7 @@ Foam::particle::particle
}
else
{
struct oldParticle
{
vector position;
label celli;
label facei;
scalar stepFraction;
label tetFacei;
label tetPti;
label origProc;
label origId;
} p;
positionsCompat1706 p;
if (is.format() == IOstream::ASCII)
{
@ -118,15 +108,20 @@ Foam::particle::particle
{
// Read whole struct
const size_t s =
sizeof(oldParticle) - offsetof(oldParticle, position);
(
sizeof(positionsCompat1706)
- offsetof(positionsCompat1706, position)
);
is.read(reinterpret_cast<char*>(&p.position), s);
}
else
{
// Read only position and cell
const size_t s =
offsetof(oldParticle, facei)
- offsetof(oldParticle, position);
(
offsetof(positionsCompat1706, facei)
- offsetof(positionsCompat1706, position)
);
is.read(reinterpret_cast<char*>(&p.position), s);
}
}
@ -181,20 +176,13 @@ void Foam::particle::writePosition(Ostream& os) const
}
else
{
struct oldParticle
{
vector position;
label celli;
label facei;
scalar stepFraction;
label tetFacei;
label tetPti;
label origProc;
label origId;
} p;
positionsCompat1706 p;
const size_t s =
offsetof(oldParticle, facei) - offsetof(oldParticle, position);
(
offsetof(positionsCompat1706, facei)
- offsetof(positionsCompat1706, position)
);
p.position = position();
p.celli = celli_;