From 3554f2140e4dbcd547b39867c7e4760bbb8377e2 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 2 Sep 2021 07:55:49 +0100
Subject: [PATCH] Test-IOField: Updated and improved to use typeIOobject

---
 applications/test/IOField/Test-IOField.C | 37 +++++++++---------------
 1 file changed, 13 insertions(+), 24 deletions(-)

diff --git a/applications/test/IOField/Test-IOField.C b/applications/test/IOField/Test-IOField.C
index 99ef13e895..b1220e1b36 100644
--- a/applications/test/IOField/Test-IOField.C
+++ b/applications/test/IOField/Test-IOField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2017-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2017-2021 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -38,7 +38,7 @@ using namespace Foam;
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-void write(const IOobject& io, const label sz)
+void write(const typeIOobject<IOField<label>>& io, const label sz)
 {
     IOField<label> fld(io, sz);
     forAll(fld, i)
@@ -50,7 +50,7 @@ void write(const IOobject& io, const label sz)
 }
 
 
-void read(const IOobject& io, const label sz)
+void read(const typeIOobject<IOField<label>>& io, const label sz)
 {
     bool valid = (sz > 0);
     Pout<< "    valid:" << valid << endl;
@@ -59,14 +59,14 @@ void read(const IOobject& io, const label sz)
 
     if (fld.size() != sz)
     {
-        FatalErrorInFunction<< "io:" << io.objectPath() << exit(FatalError);
+        FatalErrorInFunction<< "io:" << fld.objectPath() << exit(FatalError);
     }
 }
 
 
 void writeAndRead
 (
-    const IOobject& io,
+    const typeIOobject<IOField<label>>& io,
     const label sz,
     const word& writeType,
     const IOobject::readOption readOpt,
@@ -83,11 +83,11 @@ void writeAndRead
     fileHandler(writeHandler);
 
     // Delete
-    Pout<< "Deleting:" << fileHandler().filePath(io.objectPath()) << endl;
-    fileHandler().rm(fileHandler().filePath(io.objectPath()));
+    Pout<< "Deleting:" << io.filePath() << endl;
+    fileHandler().rm(io.objectPath());
 
     // Write
-    Pout<< "Writing:" << fileHandler().objectPath(io, word::null) << endl;
+    Pout<< "Writing:" << io.objectPath() << endl;
     write(io, sz);
 
     autoPtr<fileOperation> readHandler
@@ -97,9 +97,9 @@ void writeAndRead
     fileHandler(readHandler);
 
     // Read
-    IOobject readIO(io);
+    typeIOobject<IOField<label>> readIO(io);
     readIO.readOpt() = readOpt;
-    Pout<< "Reading:" << fileHandler().filePath(readIO.objectPath()) << endl;
+    Pout<< "Reading:" << readIO.filePath() << endl;
     read(readIO, sz);
 
     Pout<< "** Done writing:" << writeType
@@ -109,7 +109,7 @@ void writeAndRead
 
 void readIfPresent
 (
-    IOobject& io,
+    typeIOobject<IOField<label>>& io,
     const label sz,
     const word& readType
 )
@@ -121,7 +121,7 @@ void readIfPresent
     fileHandler(readHandler);
 
     // Read
-    Pout<< "Reading:" << fileHandler().filePath(io.objectPath()) << endl;
+    Pout<< "Reading:" << io.filePath() << endl;
     io.readOpt() = IOobject::READ_IF_PRESENT;
     read(io, sz);
 }
@@ -142,7 +142,7 @@ int main(int argc, char *argv[])
         sz = 1;
     }
 
-    IOobject io
+    typeIOobject<IOField<label>> io
     (
         "bla",
         runTime.timeName(),
@@ -158,17 +158,6 @@ int main(int argc, char *argv[])
 
     Info<< "Found handlers:" << handlers << endl;
 
-
-/*
-    forAll(handlers, readi)
-    {
-        const word& readHandler = handlers[readi];
-
-        readIfPresent(io, sz, readHandler);
-    }
-*/
-
-
     forAll(handlers, writei)
     {
         const word& writeHandler = handlers[writei];