diff --git a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C index 8af64331726b82f7a1a5ebf99bd4b95b4c85124e..0fe8f62af421b19fa0f789ee67ed13b870bb326e 100644 --- a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C +++ b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C @@ -29,10 +29,8 @@ License #include "polySurface.H" #include "mapPolyMesh.H" -#include "stringListOps.H" #include "volFields.H" #include "HashOps.H" -#include "PstreamCombineReduceOps.H" #include "Time.H" #include "UIndirectList.H" #include "addToRunTimeSelectionTable.H" diff --git a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.H b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.H index c72fc1034d268a6abff7a0f0fb11e67206aa9ac0..84406abbfdb2231d95a66d196320bcd8a281b194 100644 --- a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.H +++ b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.H @@ -280,7 +280,6 @@ class sampledSurfaces // \return True if surface existed and was removed bool removeRegistrySurface(const sampledSurface& s); - //- Store sampled field onto surface registry if it exists template<class Type, class GeoMeshType> bool storeRegistryField @@ -291,11 +290,21 @@ class sampledSurfaces Field<Type>&& values ); - //- Test surfaces for condition template<class Container, class Predicate> static bool testAny(const Container& items, const Predicate& pred); + //- Do any surfaces need an update? + virtual bool needsUpdate() const; + + //- Mark the surfaces as needing an update. + // Return false if all surfaces were already marked as expired. + virtual bool expire(); + + //- Update the surfaces as required. + // Return false if no surfaces required an update. + virtual bool update(); + //- No copy construct sampledSurfaces(const sampledSurfaces&) = delete; @@ -336,18 +345,6 @@ public: // Member Functions - //- Does any of the surfaces need an update? - virtual bool needsUpdate() const; - - //- Mark the surfaces as needing an update. - // May also free up unneeded data. - // Return false if all surfaces were already marked as expired. - virtual bool expire(); - - //- Update the surfaces as required and merge surface points (parallel). - // Return false if no surfaces required an update. - virtual bool update(); - //- Set verbosity level void verbose(const bool verbosity = true); @@ -372,7 +369,7 @@ public: //- Get merge tolerance static scalar mergeTol(); - //- Set tolerance and return old tolerance + //- Set merge tolerance and return old value static scalar mergeTol(const scalar tol); }; diff --git a/src/surfMesh/ModifiableMeshedSurface/ModifiableMeshedSurface.H b/src/surfMesh/ModifiableMeshedSurface/ModifiableMeshedSurface.H index 906a770c18e42f17aa04f6e011e4b17dc5bd0fb3..f3538900cd0f91913d071b20d79f811e514c6f28 100644 --- a/src/surfMesh/ModifiableMeshedSurface/ModifiableMeshedSurface.H +++ b/src/surfMesh/ModifiableMeshedSurface/ModifiableMeshedSurface.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2016-2018 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2016-2019 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -52,15 +52,6 @@ class ModifiableMeshedSurface : public MeshedSurface<Face> { - // Private Member Functions - - //- No copy construct - ModifiableMeshedSurface(const ModifiableMeshedSurface<Face>&) = delete; - - //- No copy assignment - void operator=(const ModifiableMeshedSurface<Face>&) = delete; - - public: // Constructors