From b0d32ce1b408cea35659bae0c070bc9ecccf38dc Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 30 Jul 2019 14:52:46 +0200
Subject: [PATCH] STYLE: use 'operator>>' instead of readLabel and readScalar

---
 .../multiphaseSystem/multiphaseSystem.C       |  2 +-
 .../twoPhaseSystem/twoPhaseSystem.C           |  4 +--
 .../solvers/MULES/CMULESTemplates.C           |  4 +--
 .../field/nearWallFields/findCellParticle.C   |  3 +--
 .../Templates/DSMCParcel/DSMCParcelIO.C       |  4 +--
 .../injectedParticle/injectedParticleIO.C     |  5 +---
 .../KinematicParcel/KinematicParcelIO.C       | 20 +++++++-------
 .../Templates/ThermoParcel/ThermoParcelIO.C   |  3 +--
 .../molecule/molecule/moleculeIO.C            | 24 ++++++++---------
 .../solidParticle/solidParticleIO.C           |  3 +--
 .../Templates/SprayParcel/SprayParcelIO.C     | 26 +++++++++----------
 .../trackedParticle/trackedParticle.C         |  6 +----
 .../multiphaseSystem/multiphaseSystem.C       |  2 +-
 .../twoPhaseSystem/twoPhaseSystem.C           |  4 +--
 .../triSurface/patches/surfacePatch.C         |  5 ++--
 15 files changed, 51 insertions(+), 64 deletions(-)

diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
index ebcd6caba8..8049e5bf21 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
@@ -831,7 +831,7 @@ void Foam::multiphaseSystem::solve()
     const Time& runTime = mesh_.time();
 
     const dictionary& alphaControls = mesh_.solverDict("alpha");
-    label nAlphaSubCycles(readLabel(alphaControls.lookup("nAlphaSubCycles")));
+    label nAlphaSubCycles(alphaControls.get<label>("nAlphaSubCycles"));
 
     if (nAlphaSubCycles > 1)
     {
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C
index bdab72d50c..284c39e77f 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C
@@ -363,8 +363,8 @@ void Foam::twoPhaseSystem::solve()
         alpha1.name()
     );
 
-    label nAlphaSubCycles(readLabel(alphaControls.lookup("nAlphaSubCycles")));
-    label nAlphaCorr(readLabel(alphaControls.lookup("nAlphaCorr")));
+    label nAlphaSubCycles(alphaControls.get<label>("nAlphaSubCycles"));
+    label nAlphaCorr(alphaControls.get<label>("nAlphaCorr"));
 
     word alphaScheme("div(phi," + alpha1.name() + ')');
     word alpharScheme("div(phir," + alpha1.name() + ')');
diff --git a/src/finiteVolume/fvMatrices/solvers/MULES/CMULESTemplates.C b/src/finiteVolume/fvMatrices/solvers/MULES/CMULESTemplates.C
index a616077b95..37f29a04fd 100644
--- a/src/finiteVolume/fvMatrices/solvers/MULES/CMULESTemplates.C
+++ b/src/finiteVolume/fvMatrices/solvers/MULES/CMULESTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           |
+    \\  /    A nd           | Copyright (C) 2019 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
                             | Copyright (C) 2013-2017 OpenFOAM Foundation
@@ -222,7 +222,7 @@ void Foam::MULES::limiterCorr
 
     const label nLimiterIter
     (
-        readLabel(MULEScontrols.lookup("nLimiterIter"))
+        MULEScontrols.get<label>("nLimiterIter")
     );
 
     const scalar smoothLimiter
diff --git a/src/functionObjects/field/nearWallFields/findCellParticle.C b/src/functionObjects/field/nearWallFields/findCellParticle.C
index 8bbc09f855..1c266b7a1b 100644
--- a/src/functionObjects/field/nearWallFields/findCellParticle.C
+++ b/src/functionObjects/field/nearWallFields/findCellParticle.C
@@ -77,8 +77,7 @@ Foam::findCellParticle::findCellParticle
     {
         if (is.format() == IOstream::ASCII)
         {
-            is >> start_ >> end_;
-            data_ = readLabel(is);
+            is >> start_ >> end_ >> data_;
         }
         else
         {
diff --git a/src/lagrangian/DSMC/parcels/Templates/DSMCParcel/DSMCParcelIO.C b/src/lagrangian/DSMC/parcels/Templates/DSMCParcel/DSMCParcelIO.C
index 556b0a8f28..783550c378 100644
--- a/src/lagrangian/DSMC/parcels/Templates/DSMCParcel/DSMCParcelIO.C
+++ b/src/lagrangian/DSMC/parcels/Templates/DSMCParcel/DSMCParcelIO.C
@@ -59,9 +59,7 @@ Foam::DSMCParcel<ParcelType>::DSMCParcel
     {
         if (is.format() == IOstream::ASCII)
         {
-            is >> U_;
-            Ei_ = readScalar(is);
-            typeId_ = readLabel(is);
+            is  >> U_ >> Ei_ >> typeId_;
         }
         else
         {
diff --git a/src/lagrangian/basic/injectedParticle/injectedParticleIO.C b/src/lagrangian/basic/injectedParticle/injectedParticleIO.C
index 59c2540b54..4eb9f940d7 100644
--- a/src/lagrangian/basic/injectedParticle/injectedParticleIO.C
+++ b/src/lagrangian/basic/injectedParticle/injectedParticleIO.C
@@ -67,10 +67,7 @@ Foam::injectedParticle::injectedParticle
 
         if (is.format() == IOstream::ASCII)
         {
-            tag_ = readLabel(is);
-            soi_ = readScalar(is);
-            d_ = readScalar(is);
-            is >> U_;
+            is  >> tag_ >> soi_ >> d_ >> U_;
         }
         else
         {
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelIO.C
index 3432ce6314..907846f2f4 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelIO.C
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelIO.C
@@ -72,16 +72,16 @@ Foam::KinematicParcel<ParcelType>::KinematicParcel
     {
         if (is.format() == IOstream::ASCII)
         {
-            active_ = readBool(is);
-            typeId_ = readLabel(is);
-            nParticle_ = readScalar(is);
-            d_ = readScalar(is);
-            dTarget_ = readScalar(is);
-            is >> U_;
-            rho_ = readScalar(is);
-            age_ = readScalar(is);
-            tTurb_ = readScalar(is);
-            is >> UTurb_;
+            is  >> active_
+                >> typeId_
+                >> nParticle_
+                >> d_
+                >> dTarget_
+                >> U_
+                >> rho_
+                >> age_
+                >> tTurb_
+                >> UTurb_;
         }
         else
         {
diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelIO.C
index 1574dd5765..4c0a5cfb6b 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelIO.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelIO.C
@@ -62,8 +62,7 @@ Foam::ThermoParcel<ParcelType>::ThermoParcel
     {
         if (is.format() == IOstream::ASCII)
         {
-            T_ = readScalar(is);
-            Cp_ = readScalar(is);
+            is  >> T_ >> Cp_;
         }
         else
         {
diff --git a/src/lagrangian/molecularDynamics/molecule/molecule/moleculeIO.C b/src/lagrangian/molecularDynamics/molecule/molecule/moleculeIO.C
index a210a2c55e..74640543a5 100644
--- a/src/lagrangian/molecularDynamics/molecule/molecule/moleculeIO.C
+++ b/src/lagrangian/molecularDynamics/molecule/molecule/moleculeIO.C
@@ -65,18 +65,18 @@ Foam::molecule::molecule
     {
         if (is.format() == IOstream::ASCII)
         {
-            is  >> Q_;
-            is  >> v_;
-            is  >> a_;
-            is  >> pi_;
-            is  >> tau_;
-            is  >> specialPosition_;
-            potentialEnergy_ = readScalar(is);
-            is  >> rf_;
-            special_ = readLabel(is);
-            id_ = readLabel(is);
-            is  >> siteForces_;
-            is  >> sitePositions_;
+            is  >> Q_
+                >> v_
+                >> a_
+                >> pi_
+                >> tau_
+                >> specialPosition_
+                >> potentialEnergy_
+                >> rf_
+                >> special_
+                >> id_
+                >> siteForces_
+                >> sitePositions_;
         }
         else
         {
diff --git a/src/lagrangian/solidParticle/solidParticleIO.C b/src/lagrangian/solidParticle/solidParticleIO.C
index 5544f4a16e..14d171f91b 100644
--- a/src/lagrangian/solidParticle/solidParticleIO.C
+++ b/src/lagrangian/solidParticle/solidParticleIO.C
@@ -52,8 +52,7 @@ Foam::solidParticle::solidParticle
     {
         if (is.format() == IOstream::ASCII)
         {
-            d_ = readScalar(is);
-            is >> U_;
+            is  >> d_ >> U_;
         }
         else
         {
diff --git a/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcelIO.C b/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcelIO.C
index 93cf283629..c10525a99a 100644
--- a/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcelIO.C
+++ b/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcelIO.C
@@ -72,19 +72,19 @@ Foam::SprayParcel<ParcelType>::SprayParcel
     {
         if (is.format() == IOstream::ASCII)
         {
-            d0_ = readScalar(is);
-            is >> position0_;
-            sigma_ = readScalar(is);
-            mu_ = readScalar(is);
-            liquidCore_ = readScalar(is);
-            KHindex_ = readScalar(is);
-            y_ = readScalar(is);
-            yDot_ = readScalar(is);
-            tc_ = readScalar(is);
-            ms_ = readScalar(is);
-            injector_ = readScalar(is);
-            tMom_ = readScalar(is);
-            user_ = readScalar(is);
+            is  >> d0_
+                >> position0_
+                >> sigma_
+                >> mu_
+                >> liquidCore_
+                >> KHindex_
+                >> y_
+                >> yDot_
+                >> tc_
+                >> ms_
+                >> injector_
+                >> tMom_
+                >> user_;
         }
         else
         {
diff --git a/src/mesh/snappyHexMesh/trackedParticle/trackedParticle.C b/src/mesh/snappyHexMesh/trackedParticle/trackedParticle.C
index 19942e5f38..e4187f63dc 100644
--- a/src/mesh/snappyHexMesh/trackedParticle/trackedParticle.C
+++ b/src/mesh/snappyHexMesh/trackedParticle/trackedParticle.C
@@ -98,11 +98,7 @@ Foam::trackedParticle::trackedParticle
     {
         if (is.format() == IOstream::ASCII)
         {
-            is >> start_ >> end_;
-            level_ = readLabel(is);
-            i_ = readLabel(is);
-            j_ = readLabel(is);
-            k_ = readLabel(is);
+            is >> start_ >> end_ >> level_ >> i_ >> j_ >> k_;
         }
         else
         {
diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C b/src/phaseSystemModels/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
index 600212ecac..6516f713de 100644
--- a/src/phaseSystemModels/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
+++ b/src/phaseSystemModels/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
@@ -624,7 +624,7 @@ void Foam::multiphaseSystem::solve()
     const Time& runTime = mesh_.time();
 
     const dictionary& alphaControls = mesh_.solverDict("alpha");
-    label nAlphaSubCycles(readLabel(alphaControls.lookup("nAlphaSubCycles")));
+    label nAlphaSubCycles(alphaControls.get<label>("nAlphaSubCycles"));
 
     bool LTS = fv::localEulerDdt::enabled(mesh_);
 
diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C b/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C
index af8ad970e6..cae968af0e 100644
--- a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C
+++ b/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C
@@ -127,8 +127,8 @@ void Foam::twoPhaseSystem::solve()
 
     const dictionary& alphaControls = mesh_.solverDict(alpha1.name());
 
-    label nAlphaSubCycles(readLabel(alphaControls.lookup("nAlphaSubCycles")));
-    label nAlphaCorr(readLabel(alphaControls.lookup("nAlphaCorr")));
+    label nAlphaSubCycles(alphaControls.get<label>("nAlphaSubCycles"));
+    label nAlphaCorr(alphaControls.get<label>("nAlphaCorr"));
 
     bool LTS = fv::localEulerDdt::enabled(mesh_);
 
diff --git a/src/surfMesh/triSurface/patches/surfacePatch.C b/src/surfMesh/triSurface/patches/surfacePatch.C
index fdeb7e0bbf..3ecbe58532 100644
--- a/src/surfMesh/triSurface/patches/surfacePatch.C
+++ b/src/surfMesh/triSurface/patches/surfacePatch.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2016-2019 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
                             | Copyright (C) 2011-2016 OpenFOAM Foundation
@@ -76,8 +76,7 @@ Foam::surfacePatch::surfacePatch(Istream& is, const label index)
     size_(0),
     start_(0)
 {
-    size_ = readLabel(is);
-    start_ = readLabel(is);
+    is >> size_ >> start_;
 }