From 065bfa264e020703c3e927f144cb0061aa4ecfd9 Mon Sep 17 00:00:00 2001 From: Andrew Heather Date: Tue, 5 Sep 2017 10:19:09 +0100 Subject: [PATCH] INT: Compatibility updates followinglatest integrations --- .../parLagrangianRedistributor.C | 2 +- src/OpenFOAM/meshes/polyMesh/polyMesh.C | 2 +- .../Barycentric/barycentric/barycentric.C | 13 --- .../Barycentric/barycentric/barycentric.H | 1 - .../barycentric2D/barycentric2D.C | 12 --- .../barycentric2D/barycentric2D.H | 1 - .../interpolation/interpolation.H | 1 + src/functionObjects/field/Make/files | 7 ++ .../injectedParticle/injectedParticleI.H | 2 +- src/lagrangian/basic/particle/particle.H | 16 ++-- src/lagrangian/basic/particle/particleIO.C | 10 +-- .../basic/particle/particleTemplates.C | 5 -- .../KinematicParcel/KinematicParcel.C | 1 + .../Templates/ThermoParcel/ThermoParcel.C | 7 +- .../ParticleForces/Interface/InterfaceForce.C | 7 +- .../offsetSurface/offsetSurface.C | 11 ++- .../meshRefinement/meshRefinementRefine.C | 80 +++++++------------ src/sampling/surface/isoSurface/isoSurface.C | 17 ++-- 18 files changed, 71 insertions(+), 124 deletions(-) diff --git a/applications/utilities/parallelProcessing/redistributePar/parLagrangianRedistributor.C b/applications/utilities/parallelProcessing/redistributePar/parLagrangianRedistributor.C index 73b7f41236..2b0528737d 100644 --- a/applications/utilities/parallelProcessing/redistributePar/parLagrangianRedistributor.C +++ b/applications/utilities/parallelProcessing/redistributePar/parLagrangianRedistributor.C @@ -140,7 +140,7 @@ Foam::parLagrangianRedistributor::redistributeLagrangianPositions PstreamBuffers pBufs(Pstream::commsTypes::nonBlocking); { - // List of lists of particles to be transfered for all of the + // List of lists of particles to be transferred for all of the // neighbour processors List> particleTransferLists ( diff --git a/src/OpenFOAM/meshes/polyMesh/polyMesh.C b/src/OpenFOAM/meshes/polyMesh/polyMesh.C index 328fb417bd..41ea107049 100644 --- a/src/OpenFOAM/meshes/polyMesh/polyMesh.C +++ b/src/OpenFOAM/meshes/polyMesh/polyMesh.C @@ -147,7 +147,7 @@ Foam::autoPtr Foam::polyMesh::readTetBasePtIs() const IOobject::NO_WRITE ); - if (io.headerOk()) + if (io.typeHeaderOk(true)) { return autoPtr(new labelIOList(io)); } diff --git a/src/OpenFOAM/primitives/Barycentric/barycentric/barycentric.C b/src/OpenFOAM/primitives/Barycentric/barycentric/barycentric.C index f42aa1a9fe..5305ce0ce2 100644 --- a/src/OpenFOAM/primitives/Barycentric/barycentric/barycentric.C +++ b/src/OpenFOAM/primitives/Barycentric/barycentric/barycentric.C @@ -25,7 +25,6 @@ License #include "barycentric.H" #include "Random.H" -#include "cachedRandom.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -69,18 +68,6 @@ Foam::barycentric barycentric01 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // Foam::barycentric Foam::barycentric01(Random& rndGen) -{ - return - ::barycentric01 - ( - rndGen.scalar01(), - rndGen.scalar01(), - rndGen.scalar01() - ); -} - - -Foam::barycentric Foam::barycentric01(cachedRandom& rndGen) { return ::barycentric01 diff --git a/src/OpenFOAM/primitives/Barycentric/barycentric/barycentric.H b/src/OpenFOAM/primitives/Barycentric/barycentric/barycentric.H index 34cef96a1f..9dc91360fd 100644 --- a/src/OpenFOAM/primitives/Barycentric/barycentric/barycentric.H +++ b/src/OpenFOAM/primitives/Barycentric/barycentric/barycentric.H @@ -53,7 +53,6 @@ typedef Barycentric barycentric; //- Generate a random barycentric coordinate within the unit tetrahedron barycentric barycentric01(Random& rndGen); -barycentric barycentric01(cachedRandom& rndGen); template<> diff --git a/src/OpenFOAM/primitives/Barycentric2D/barycentric2D/barycentric2D.C b/src/OpenFOAM/primitives/Barycentric2D/barycentric2D/barycentric2D.C index f42f9d3d31..60cb8829fe 100644 --- a/src/OpenFOAM/primitives/Barycentric2D/barycentric2D/barycentric2D.C +++ b/src/OpenFOAM/primitives/Barycentric2D/barycentric2D/barycentric2D.C @@ -25,7 +25,6 @@ License #include "barycentric2D.H" #include "Random.H" -#include "cachedRandom.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -51,17 +50,6 @@ Foam::barycentric2D barycentric2D01 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // Foam::barycentric2D Foam::barycentric2D01(Random& rndGen) -{ - return - ::barycentric2D01 - ( - rndGen.scalar01(), - rndGen.scalar01() - ); -} - - -Foam::barycentric2D Foam::barycentric2D01(cachedRandom& rndGen) { return ::barycentric2D01 diff --git a/src/OpenFOAM/primitives/Barycentric2D/barycentric2D/barycentric2D.H b/src/OpenFOAM/primitives/Barycentric2D/barycentric2D/barycentric2D.H index 493ebd06b2..70dbb572ea 100644 --- a/src/OpenFOAM/primitives/Barycentric2D/barycentric2D/barycentric2D.H +++ b/src/OpenFOAM/primitives/Barycentric2D/barycentric2D/barycentric2D.H @@ -53,7 +53,6 @@ typedef Barycentric2D barycentric2D; //- Generate a random barycentric coordinate within the unit triangle barycentric2D barycentric2D01(Random& rndGen); -barycentric2D barycentric2D01(cachedRandom& rndGen); template<> diff --git a/src/finiteVolume/interpolation/interpolation/interpolation/interpolation.H b/src/finiteVolume/interpolation/interpolation/interpolation/interpolation.H index ca60aff4f4..ced0805851 100644 --- a/src/finiteVolume/interpolation/interpolation/interpolation/interpolation.H +++ b/src/finiteVolume/interpolation/interpolation/interpolation/interpolation.H @@ -39,6 +39,7 @@ Description #include "autoPtr.H" #include "runTimeSelectionTables.H" #include "tetIndices.H" +#include "barycentric.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/functionObjects/field/Make/files b/src/functionObjects/field/Make/files index 5161f46cf2..3362b2dbca 100644 --- a/src/functionObjects/field/Make/files +++ b/src/functionObjects/field/Make/files @@ -25,6 +25,13 @@ streamLine/streamLineBase.C streamLine/streamLineParticle.C streamLine/streamLineParticleCloud.C +/* +wallBoundedStreamLine/wallBoundedStreamLine.C +wallBoundedStreamLine/wallBoundedStreamLineParticle.C +wallBoundedStreamLine/wallBoundedStreamLineParticleCloud.C +wallBoundedStreamLine/wallBoundedParticle.C +*/ + surfaceInterpolate/surfaceInterpolate.C regionSizeDistribution/regionSizeDistribution.C diff --git a/src/lagrangian/basic/injectedParticle/injectedParticleI.H b/src/lagrangian/basic/injectedParticle/injectedParticleI.H index aa9361a7c4..579edb16ef 100644 --- a/src/lagrangian/basic/injectedParticle/injectedParticleI.H +++ b/src/lagrangian/basic/injectedParticle/injectedParticleI.H @@ -36,7 +36,7 @@ inline Foam::injectedParticle::injectedParticle const vector& U ) : - particle(mesh, position, -1, false), + particle(mesh, position, -1), tag_(tag), soi_(soi), d_(d), diff --git a/src/lagrangian/basic/particle/particle.H b/src/lagrangian/basic/particle/particle.H index 37d6031df4..0eae1ef01c 100644 --- a/src/lagrangian/basic/particle/particle.H +++ b/src/lagrangian/basic/particle/particle.H @@ -88,7 +88,7 @@ class particle // Private member data //- Size in bytes of the position data - static const std::size_t sizeofPosition_; + static const std::size_t sizeofPosition; //- Size in bytes of the fields static const std::size_t sizeofFields; @@ -180,8 +180,6 @@ private: label origId_; -private: - // Private Member Functions // Tetrahedra functions @@ -197,8 +195,8 @@ private: //- Get the transformation associated with the current tet. This // will convert a barycentric position within the tet to a - // cartesian position in the global coordinate system. The - // conversion is x = A & y, where x is the cartesian position, y is + // Cartesian position in the global coordinate system. The + // conversion is x = A & y, where x is the Cartesian position, y is // the barycentric position and A is the transformation tensor. barycentricTensor stationaryTetTransform() const; @@ -398,7 +396,7 @@ public: "{vector label label scalar label label label label}" ); - //- Cumulative particle counter - used to provode unique ID + //- Cumulative particle counter - used to provide unique ID static label particleCount_; @@ -429,7 +427,7 @@ public: //- Construct as a copy particle(const particle& p); - //- Construct as a copy with refernce to a new mesh + //- Construct as a copy with reference to a new mesh particle(const particle& p, const polyMesh& mesh); //- Construct a clone @@ -610,7 +608,7 @@ public: TrackData& td ); - //- Convenience function. Cobines trackToFace and hitFace + //- Convenience function. Combines trackToFace and hitFace template void trackToAndHitFace ( @@ -674,7 +672,7 @@ public: // Decompose and reconstruct - //- Return the tet point approproate for decomposition or reconstruction + //- Return the tet point appropriate for decomposition or reconstruction // to or from the given mesh. label procTetPt ( diff --git a/src/lagrangian/basic/particle/particleIO.C b/src/lagrangian/basic/particle/particleIO.C index e2842be409..4277457cab 100644 --- a/src/lagrangian/basic/particle/particleIO.C +++ b/src/lagrangian/basic/particle/particleIO.C @@ -31,7 +31,7 @@ License Foam::string Foam::particle::propertyList_ = Foam::particle::propertyList(); Foam::string Foam::particle::propertyTypes_ = Foam::particle::propertyTypes(); -const std::size_t Foam::particle::sizeofPosition_ +const std::size_t Foam::particle::sizeofPosition ( offsetof(particle, facei_) - offsetof(particle, coordinates_) ); @@ -69,11 +69,11 @@ Foam::particle::particle(const polyMesh& mesh, Istream& is, bool readFields) { if (readFields) { - is.read(reinterpret_cast(&coordinates_), sizeofFields_); + is.read(reinterpret_cast(&coordinates_), sizeofFields); } else { - is.read(reinterpret_cast(&coordinates_), sizeofPosition_); + is.read(reinterpret_cast(&coordinates_), sizeofPosition); } } @@ -93,7 +93,7 @@ void Foam::particle::writePosition(Ostream& os) const } else { - os.write(reinterpret_cast(&coordinates_), sizeofPosition_); + os.write(reinterpret_cast(&coordinates_), sizeofPosition); } // Check state of Ostream @@ -119,7 +119,7 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const particle& p) os.write ( reinterpret_cast(&p.coordinates_), - particle::sizeofFields_ + particle::sizeofFields ); } diff --git a/src/lagrangian/basic/particle/particleTemplates.C b/src/lagrangian/basic/particle/particleTemplates.C index 6ce265dd87..e812a20146 100644 --- a/src/lagrangian/basic/particle/particleTemplates.C +++ b/src/lagrangian/basic/particle/particleTemplates.C @@ -168,17 +168,12 @@ void Foam::particle::writeObjects(const CloudType& c, objectRegistry& obr) { label np = c.size(); - IOField& position - ( - cloud::createIOField("position", np, obr) - ); IOField