STYLE: make some sampledSurfaces methods protected

- less used bookkeeping/convenience methods that may be phased out
  in the future

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"

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);
 };
 

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