From 1328b5be0f42992f37a2b58d73594f067919bc37 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 3 May 2017 19:17:43 +0100
Subject: [PATCH] surfaceTensionModels: Resolved warning from Clang concerning
 virtual function overload

---
 .../liquidProperties/liquidPropertiesSurfaceTension.C           | 2 +-
 .../liquidProperties/liquidPropertiesSurfaceTension.H           | 2 +-
 src/transportModels/interfaceProperties/interfaceProperties.C   | 2 +-
 .../surfaceTensionModels/constant/constantSurfaceTension.C      | 2 +-
 .../surfaceTensionModels/constant/constantSurfaceTension.H      | 2 +-
 .../surfaceTensionModel/surfaceTensionModel.H                   | 2 +-
 .../temperatureDependent/temperatureDependentSurfaceTension.C   | 2 +-
 .../temperatureDependent/temperatureDependentSurfaceTension.H   | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/applications/solvers/multiphase/compressibleInterFoam/surfaceTensionModels/liquidProperties/liquidPropertiesSurfaceTension.C b/applications/solvers/multiphase/compressibleInterFoam/surfaceTensionModels/liquidProperties/liquidPropertiesSurfaceTension.C
index 71e1089802..7888ec2347 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/surfaceTensionModels/liquidProperties/liquidPropertiesSurfaceTension.C
+++ b/applications/solvers/multiphase/compressibleInterFoam/surfaceTensionModels/liquidProperties/liquidPropertiesSurfaceTension.C
@@ -127,7 +127,7 @@ Foam::surfaceTensionModels::liquidProperties::sigma() const
 }
 
 
-bool Foam::surfaceTensionModels::liquidProperties::read
+bool Foam::surfaceTensionModels::liquidProperties::readDict
 (
     const dictionary& dict
 )
diff --git a/applications/solvers/multiphase/compressibleInterFoam/surfaceTensionModels/liquidProperties/liquidPropertiesSurfaceTension.H b/applications/solvers/multiphase/compressibleInterFoam/surfaceTensionModels/liquidProperties/liquidPropertiesSurfaceTension.H
index b209dfc9d6..7c1e4940ac 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/surfaceTensionModels/liquidProperties/liquidPropertiesSurfaceTension.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/surfaceTensionModels/liquidProperties/liquidPropertiesSurfaceTension.H
@@ -104,7 +104,7 @@ public:
         virtual tmp<volScalarField> sigma() const;
 
         //- Update surface tension coefficient from given dictionary
-        virtual bool read(const dictionary& dict);
+        virtual bool readDict(const dictionary& dict);
 
         //- Write in dictionary format
         virtual bool writeData(Ostream& os) const;
diff --git a/src/transportModels/interfaceProperties/interfaceProperties.C b/src/transportModels/interfaceProperties/interfaceProperties.C
index 5d2008130b..b2fc80eb30 100644
--- a/src/transportModels/interfaceProperties/interfaceProperties.C
+++ b/src/transportModels/interfaceProperties/interfaceProperties.C
@@ -239,7 +239,7 @@ void Foam::interfaceProperties::correct()
 bool Foam::interfaceProperties::read()
 {
     alpha1_.mesh().solverDict(alpha1_.name()).lookup("cAlpha") >> cAlpha_;
-    sigmaPtr_->read(transportPropertiesDict_);
+    sigmaPtr_->readDict(transportPropertiesDict_);
 
     return true;
 }
diff --git a/src/transportModels/interfaceProperties/surfaceTensionModels/constant/constantSurfaceTension.C b/src/transportModels/interfaceProperties/surfaceTensionModels/constant/constantSurfaceTension.C
index bbe92e5196..9a19092e04 100644
--- a/src/transportModels/interfaceProperties/surfaceTensionModels/constant/constantSurfaceTension.C
+++ b/src/transportModels/interfaceProperties/surfaceTensionModels/constant/constantSurfaceTension.C
@@ -83,7 +83,7 @@ Foam::surfaceTensionModels::constant::sigma() const
 }
 
 
-bool Foam::surfaceTensionModels::constant::read(const dictionary& dict)
+bool Foam::surfaceTensionModels::constant::readDict(const dictionary& dict)
 {
     // Handle sub-dictionary format as a special case
     if (dict.isDict("sigma"))
diff --git a/src/transportModels/interfaceProperties/surfaceTensionModels/constant/constantSurfaceTension.H b/src/transportModels/interfaceProperties/surfaceTensionModels/constant/constantSurfaceTension.H
index feef36300c..fdc1f91b8d 100644
--- a/src/transportModels/interfaceProperties/surfaceTensionModels/constant/constantSurfaceTension.H
+++ b/src/transportModels/interfaceProperties/surfaceTensionModels/constant/constantSurfaceTension.H
@@ -98,7 +98,7 @@ public:
         virtual tmp<volScalarField> sigma() const;
 
         //- Update surface tension coefficient from given dictionary
-        virtual bool read(const dictionary& dict);
+        virtual bool readDict(const dictionary& dict);
 
         //- Write in dictionary format
         virtual bool writeData(Ostream& os) const;
diff --git a/src/transportModels/interfaceProperties/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.H b/src/transportModels/interfaceProperties/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.H
index 930a8444f1..a5cddff4ef 100644
--- a/src/transportModels/interfaceProperties/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.H
+++ b/src/transportModels/interfaceProperties/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.H
@@ -143,7 +143,7 @@ public:
         virtual tmp<volScalarField> sigma() const = 0;
 
         //- Update surface tension coefficient from given dictionary
-        virtual bool read(const dictionary& dict) = 0;
+        virtual bool readDict(const dictionary& dict) = 0;
 
         //- Write in dictionary format
         virtual bool writeData(Ostream& os) const = 0;
diff --git a/src/transportModels/interfaceProperties/surfaceTensionModels/temperatureDependent/temperatureDependentSurfaceTension.C b/src/transportModels/interfaceProperties/surfaceTensionModels/temperatureDependent/temperatureDependentSurfaceTension.C
index c56ac7f4a8..03fb3a106c 100644
--- a/src/transportModels/interfaceProperties/surfaceTensionModels/temperatureDependent/temperatureDependentSurfaceTension.C
+++ b/src/transportModels/interfaceProperties/surfaceTensionModels/temperatureDependent/temperatureDependentSurfaceTension.C
@@ -104,7 +104,7 @@ Foam::surfaceTensionModels::temperatureDependent::sigma() const
 }
 
 
-bool Foam::surfaceTensionModels::temperatureDependent::read
+bool Foam::surfaceTensionModels::temperatureDependent::readDict
 (
     const dictionary& dict
 )
diff --git a/src/transportModels/interfaceProperties/surfaceTensionModels/temperatureDependent/temperatureDependentSurfaceTension.H b/src/transportModels/interfaceProperties/surfaceTensionModels/temperatureDependent/temperatureDependentSurfaceTension.H
index c0bded7c31..e442fda63e 100644
--- a/src/transportModels/interfaceProperties/surfaceTensionModels/temperatureDependent/temperatureDependentSurfaceTension.H
+++ b/src/transportModels/interfaceProperties/surfaceTensionModels/temperatureDependent/temperatureDependentSurfaceTension.H
@@ -113,7 +113,7 @@ public:
         virtual tmp<volScalarField> sigma() const;
 
         //- Update surface tension coefficient from given dictionary
-        virtual bool read(const dictionary& dict);
+        virtual bool readDict(const dictionary& dict);
 
         //- Write in dictionary format
         virtual bool writeData(Ostream& os) const;
-- 
GitLab