From 8d4e32da22d730cde70d56cae4662223e9f9c3f2 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 30 Nov 2022 11:36:40 +0000
Subject: [PATCH] COMP: fixup test applications

---
 .../test/CircularBuffer/Test-CircularBuffer.C | 14 ++++++-------
 applications/test/DLList/Test-DLList.C        | 20 +++++++++----------
 applications/test/ISLList/Test-ISLList.C      |  6 +++---
 applications/test/List/Test-List.C            |  4 ++--
 .../test/PackedList1/Test-PackedList1.C       | 14 ++++++-------
 applications/test/SLList/Test-SLList.C        | 20 +++++++++----------
 applications/test/boolList/Test-boolList.C    | 12 +++++------
 applications/test/boolList/bitSetOrBoolList.H |  6 +++---
 .../coordinateSystem/Test-coordinateSystem.C  |  4 ++--
 .../test/rigidBodyDynamics/spring/spring.C    |  8 +++++++-
 .../PtrLists/PtrDynList/PtrDynList.H          |  4 ++--
 .../PtrLists/PtrDynList/PtrDynListI.H         |  7 -------
 12 files changed, 59 insertions(+), 60 deletions(-)

diff --git a/applications/test/CircularBuffer/Test-CircularBuffer.C b/applications/test/CircularBuffer/Test-CircularBuffer.C
index aa62de3267..f16d1512f6 100644
--- a/applications/test/CircularBuffer/Test-CircularBuffer.C
+++ b/applications/test/CircularBuffer/Test-CircularBuffer.C
@@ -64,23 +64,23 @@ inline Ostream& report
 int main(int argc, char *argv[])
 {
     CircularBuffer<label> buf1(1); report(buf1);
-    buf1.append(10); report(buf1);
+    buf1.push_back(10); report(buf1);
 
     Info<< buf1.range_one() << nl;
 
-    buf1.append(20); report(buf1);
-    buf1.append(30); report(buf1);
+    buf1.push_back(20); report(buf1);
+    buf1.push_back(30); report(buf1);
     buf1.push_back(40); report(buf1);
     buf1.push_front(-50); report(buf1);
-    buf1.append(60); report(buf1);
-    buf1.append(labelList({70,80,90})); report(buf1);
+    buf1.push_back(60); report(buf1);
+    buf1.push_back(labelList({70,80,90})); report(buf1);
 
     Info<< nl << "access: " << buf1 << nl;
 
     Info<< buf1[-12] << nl;
 
     Info<< "found: " << buf1.found(40) << nl;
-    buf1.appendUniq(100); report(buf1);
+    buf1.push_uniq(100); report(buf1);
 
     buf1 = Zero; report(buf1);
 
@@ -92,7 +92,7 @@ int main(int argc, char *argv[])
     }
     report(buf1);
 
-    buf1.append(identity(5)); report(buf1);
+    buf1.push_back(identity(5)); report(buf1);
 
     buf1.info(Info);
     Info<< buf1 << nl;
diff --git a/applications/test/DLList/Test-DLList.C b/applications/test/DLList/Test-DLList.C
index 28042d0534..f17c7adaff 100644
--- a/applications/test/DLList/Test-DLList.C
+++ b/applications/test/DLList/Test-DLList.C
@@ -67,11 +67,11 @@ int main(int argc, char *argv[])
 
     for (int i = 0; i<10; i++)
     {
-        myList.append(1.3*i);
+        myList.push_back(1.3*i);
     }
 
-    myList.append(100.3);
-    myList.append(500.3);
+    myList.push_back(100.3);
+    myList.push_back(500.3);
 
     Info<< "DLList<scalar>" << nl;
     Info<< nl << "flat-output: " << flatOutput(myList) << nl;
@@ -144,9 +144,9 @@ int main(int argc, char *argv[])
         Info<< " => " << flatOutput(myList) << nl;
     }
 
-    myList.append(500.3);
-    myList.append(200.3);
-    myList.append(100.3);
+    myList.push_back(500.3);
+    myList.push_back(200.3);
+    myList.push_back(100.3);
 
     Info<< nl << "Testing swapUp and swapDown:" << nl;
     Info<< " => " << flatOutput(myList) << nl;
@@ -200,7 +200,7 @@ int main(int argc, char *argv[])
 
         for (int i = 0; i<5; i++)
         {
-            labList.append(identity(6));
+            labList.push_back(identity(6));
         }
 
         Info<< nl
@@ -221,16 +221,16 @@ int main(int argc, char *argv[])
         List<label> content1 = identity(10);
 
         Info<< nl
-            << " move append ";
+            << " move push_back ";
         printAddress(content1);
 
-        labList.append(std::move(content1));
+        labList.push_back(std::move(content1));
 
         Info<< " content " << flatOutput(content1) << nl
             << " list" << labList  << nl;
 
         printAddresses(labList);
-        // labList.append(content1);
+        // labList.push_back(content1);
     }
 
     Info<< nl << "Done." << endl;
diff --git a/applications/test/ISLList/Test-ISLList.C b/applications/test/ISLList/Test-ISLList.C
index a30e57968c..263925bf7e 100644
--- a/applications/test/ISLList/Test-ISLList.C
+++ b/applications/test/ISLList/Test-ISLList.C
@@ -76,11 +76,11 @@ int main(int argc, char *argv[])
 
     for (int i = 0; i<10; i++)
     {
-        myList.append(new Scalar(1.3*i));
+        myList.push_back(new Scalar(1.3*i));
     }
 
-    myList.append(new Scalar(100.3));
-    myList.append(new Scalar(500.3));
+    myList.push_back(new Scalar(100.3));
+    myList.push_back(new Scalar(500.3));
 
     Info<< "ISLList<scalar>" << myList << nl;
     Info<< nl << "flat-output: " << flatOutput(myList) << nl;
diff --git a/applications/test/List/Test-List.C b/applications/test/List/Test-List.C
index a1bb92efd7..63ef615003 100644
--- a/applications/test/List/Test-List.C
+++ b/applications/test/List/Test-List.C
@@ -214,8 +214,8 @@ int main(int argc, char *argv[])
     forAllReverseIters(list2, iter) { *iter *= 0.5; Info<< " " << *iter; }
     Info<< endl;
 
-    list1.append(list2);
-    Info<< "list1.append(list2): " << list1 << endl;
+    list1.push_back(list2);
+    Info<< "list1.push_back(list2): " << list1 << endl;
 
     for (const vector& val : { vector(3, 4, 5), vector(10,11, 12)} )
     {
diff --git a/applications/test/PackedList1/Test-PackedList1.C b/applications/test/PackedList1/Test-PackedList1.C
index 812a82b811..4a700fde55 100644
--- a/applications/test/PackedList1/Test-PackedList1.C
+++ b/applications/test/PackedList1/Test-PackedList1.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2018-2021 OpenCFD Ltd.
+    Copyright (C) 2018-2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -245,10 +245,10 @@ int main(int argc, char *argv[])
     list1.resize(8);
     report(list1);
 
-    Info<< "\ntest append() operation\n";
-    list1.append(2);
-    list1.append(3);
-    list1.append(4);
+    Info<< "\ntest push_back() operation\n";
+    list1.push_back(2);
+    list1.push_back(3);
+    list1.push_back(4);
     report(list1);
 
     Info<< "\ntest reserve() operation\n";
@@ -326,9 +326,9 @@ int main(int argc, char *argv[])
     report(list1);
 
 
-    Info<< "\ntest copy constructor + append\n";
+    Info<< "\ntest copy constructor + push_back\n";
     PackedList<3> list2(list1);
-    list2.append(4);
+    list2.push_back(4);
     Info<< "source list:\n";
     report(list1);
 
diff --git a/applications/test/SLList/Test-SLList.C b/applications/test/SLList/Test-SLList.C
index df990ebcf7..1ede1c4e9b 100644
--- a/applications/test/SLList/Test-SLList.C
+++ b/applications/test/SLList/Test-SLList.C
@@ -67,11 +67,11 @@ int main(int argc, char *argv[])
 
     for (int i = 0; i<10; i++)
     {
-        myList.append(1.3*i);
+        myList.push_back(1.3*i);
     }
 
-    myList.append(100.3);
-    myList.append(500.3);
+    myList.push_back(100.3);
+    myList.push_back(500.3);
 
     Info<< "SLList<scalar>" << myList << nl;
     Info<< nl << "flat-output: " << flatOutput(myList) << nl;
@@ -103,11 +103,11 @@ int main(int argc, char *argv[])
 
     for (int i = 0; i<10; i++)
     {
-        myList.append(1.3*i);
+        myList.push_back(1.3*i);
     }
 
-    myList.append(100.3);
-    myList.append(500.3);
+    myList.push_back(100.3);
+    myList.push_back(500.3);
 
     Info<< nl << "Transfer: " << nl;
     Info<< "original: " << flatOutput(myList) << endl;
@@ -143,7 +143,7 @@ int main(int argc, char *argv[])
 
         for (int i = 0; i<5; i++)
         {
-            labList.append(identity(6));
+            labList.push_back(identity(6));
         }
 
         Info<< nl
@@ -164,16 +164,16 @@ int main(int argc, char *argv[])
         List<label> content1 = identity(10);
 
         Info<< nl
-            << " move append ";
+            << " move push_back ";
         printAddress(content1);
 
-        labList.append(std::move(content1));
+        labList.push_back(std::move(content1));
 
         Info<< " content " << flatOutput(content1) << nl
             << " list" << labList  << nl;
 
         printAddresses(labList);
-        // labList.append(content1);
+        // labList.push_back(content1);
     }
 
     Info<< nl << "Done." << endl;
diff --git a/applications/test/boolList/Test-boolList.C b/applications/test/boolList/Test-boolList.C
index f3eac1bd62..a55fe67a9b 100644
--- a/applications/test/boolList/Test-boolList.C
+++ b/applications/test/boolList/Test-boolList.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2020 OpenCFD Ltd.
+    Copyright (C) 2020-2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -165,24 +165,24 @@ int main(int argc, char *argv[])
 
         // Use predicate, or test() method
 
-        if (list2(1))
+        if (list2.test(1))
         {
             Info<< "1 is on (original)" << nl;
         }
-        if (!list2(2))
+        if (!list2.test(2))
         {
             Info<< "2 is off (original)" << nl;
         }
-        if (!list2(100))
+        if (!list2.test(100))
         {
             Info<< "100 is off (original)" << nl;
         }
 
-        if (wrapper(1))
+        if (wrapper.test(1))
         {
             Info<< "1 is on (wrapped)" << nl;
         }
-        if (!wrapper(2))
+        if (!wrapper.test(2))
         {
             Info<< "2 is off (wrapped)" << nl;
         }
diff --git a/applications/test/boolList/bitSetOrBoolList.H b/applications/test/boolList/bitSetOrBoolList.H
index 98ee9fbac3..40e3c4b244 100644
--- a/applications/test/boolList/bitSetOrBoolList.H
+++ b/applications/test/boolList/bitSetOrBoolList.H
@@ -72,13 +72,13 @@ public:
     // Member Functions
 
         //- Is empty
-        bool empty() const
+        bool empty() const noexcept
         {
             return bits_.empty() && bools_.empty();
         }
 
         //- Size
-        label size() const
+        label size() const noexcept
         {
             return bits_.size() + bools_.size();
         }
@@ -93,7 +93,7 @@ public:
         bool operator()(const label i) const
         {
             // Can also use test(i) etc...
-            return bits_(i) || bools_(i);
+            return bits_.test(i) || bools_.test(i);
         }
 };
 
diff --git a/applications/test/coordinateSystem/Test-coordinateSystem.C b/applications/test/coordinateSystem/Test-coordinateSystem.C
index d105eca379..87de9f270b 100644
--- a/applications/test/coordinateSystem/Test-coordinateSystem.C
+++ b/applications/test/coordinateSystem/Test-coordinateSystem.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2018-2021 OpenCFD Ltd.
+    Copyright (C) 2018-2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -59,7 +59,7 @@ void basicTests(const coordinateSystem& cs)
 {
     cs.writeEntry(cs.name(), Info);
 
-    if ((const auto* cartptr = isA<coordSystem::cartesian>(cs)) != nullptr)
+    if (const auto* cartptr = isA<coordSystem::cartesian>(cs))
     {
         if (!cartptr->valid())
         {
diff --git a/applications/test/rigidBodyDynamics/spring/spring.C b/applications/test/rigidBodyDynamics/spring/spring.C
index 61c923a051..e8a23ed114 100644
--- a/applications/test/rigidBodyDynamics/spring/spring.C
+++ b/applications/test/rigidBodyDynamics/spring/spring.C
@@ -31,6 +31,8 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
+#include "argList.H"
+#include "Time.H"
 #include "rigidBodyMotion.H"
 #include "masslessBody.H"
 #include "sphere.H"
@@ -46,10 +48,14 @@ using namespace RBD;
 
 int main(int argc, char *argv[])
 {
+    #include "setRootCase.H"
+
+    autoPtr<Time> dummyTimePtr(Time::New(args));
+
     dictionary springDict(IFstream("spring")());
 
     // Create the spring model from dictionary
-    rigidBodyMotion spring(springDict);
+    rigidBodyMotion spring(dummyTimePtr(), springDict);
 
     label nIter(springDict.get<label>("nIter"));
 
diff --git a/src/OpenFOAM/containers/PtrLists/PtrDynList/PtrDynList.H b/src/OpenFOAM/containers/PtrLists/PtrDynList/PtrDynList.H
index fac76f1846..e22efa3a46 100644
--- a/src/OpenFOAM/containers/PtrLists/PtrDynList/PtrDynList.H
+++ b/src/OpenFOAM/containers/PtrLists/PtrDynList/PtrDynList.H
@@ -103,7 +103,7 @@ public:
     // Sizing
 
         //- Size of the underlying storage.
-        inline label capacity() const noexcept;
+        label capacity() const noexcept { return capacity_; }
 
         //- Reserve allocation space for at least this size.
         inline void reserve(const label len);
@@ -268,7 +268,7 @@ public:
         template<int AnySizeMin>
         void append(PtrDynList<T, AnySizeMin>&& other)
         {
-            this->push_back(other);
+            this->push_back(std::move(other));
         }
 };
 
diff --git a/src/OpenFOAM/containers/PtrLists/PtrDynList/PtrDynListI.H b/src/OpenFOAM/containers/PtrLists/PtrDynList/PtrDynListI.H
index f33a1e2f16..e635e2ea44 100644
--- a/src/OpenFOAM/containers/PtrLists/PtrDynList/PtrDynListI.H
+++ b/src/OpenFOAM/containers/PtrLists/PtrDynList/PtrDynListI.H
@@ -94,13 +94,6 @@ inline Foam::PtrDynList<T, SizeMin>::PtrDynList(UList<T*>& list)
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-template<class T, int SizeMin>
-inline Foam::label Foam::PtrDynList<T, SizeMin>::capacity() const noexcept
-{
-    return capacity_;
-}
-
-
 template<class T, int SizeMin>
 inline void Foam::PtrDynList<T, SizeMin>::reserve(const label len)
 {