diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.H b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.H
index 4cf94228048c24fcf88b56f2c636207a9ce61b67..e7bd21a628890462f56b14060511b819a92c7095 100644
--- a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.H
+++ b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.H
@@ -155,6 +155,9 @@ public:
//- Return the momentum drag turbulence generation rate
virtual tmp<volScalarField> Gk() const = 0;
+ //- Inherit read from regIOobject
+ using regIOobject::read;
+
//- Update properties from given dictionary
virtual bool read(const dictionary& PDRProperties) = 0;
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/phaseModel/phaseModel.H b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/phaseModel/phaseModel.H
index abaab320f6c1df894cfdb372ed3b86c80d4a5f99..54d6119e493e72b1208413cc6312df9a2150371f 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/phaseModel/phaseModel.H
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/phaseModel/phaseModel.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -211,6 +211,9 @@ public:
//- Correct the phase properties
void correct();
+ //-Inherit read from volScalarField
+ using volScalarField::read;
+
//- Read base transportProperties dictionary
bool read(const dictionary& phaseDict);
};
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/phase/phase.H b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/phase/phase.H
index 74c0aaba834a568ea68e10988f39e2050b66e8b8..91341fcf5c1bc182ee8c862102d70390e88bbb2c 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/phase/phase.H
+++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/phase/phase.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -144,6 +144,9 @@ public:
//- Correct the phase properties
void correct();
+ //-Inherit read from volScalarField
+ using volScalarField::read;
+
//- Read base transportProperties dictionary
bool read(const dictionary& phaseDict);
};
diff --git a/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L b/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L
index ef3f3c3b2aaa0222367ba828b50ec59acd2b2c3d..9f3f615dc6741cdea95c4e889177c48130114699 100644
--- a/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L
+++ b/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L
@@ -186,7 +186,6 @@ mtype {space}"MTYPE:"{space}
label curNumberOfNodes = 0;
label curNumberOfCells = 0;
label curGroupID = 0;
- label nFlagsForStream = 0;
label curBoundaryPatch = 0;
label curPatchFace = 0;
%}
@@ -478,7 +477,7 @@ mtype {space}"MTYPE:"{space}
IStringStream nFlagsStream(YYText());
- nFlagsForStream = readLabel(nFlagsStream);
+ readLabel(nFlagsStream);
BEGIN(cellStreamTitle);
}
@@ -510,7 +509,6 @@ mtype {space}"MTYPE:"{space}
// reset current group ID and a number of flags
curGroupID = 0;
- nFlagsForStream = 0;
}
@@ -522,7 +520,6 @@ mtype {space}"MTYPE:"{space}
// reset current group ID and a number of flags
curGroupID = 0;
- nFlagsForStream = 0;
BEGIN(INITIAL);
}
diff --git a/applications/utilities/mesh/conversion/kivaToFoam/readKivaGrid.H b/applications/utilities/mesh/conversion/kivaToFoam/readKivaGrid.H
index 585282235ab0e6a84bbde9c2a8183774a26e8076..1505b74e457fc4f437c407b415a060502503cded 100644
--- a/applications/utilities/mesh/conversion/kivaToFoam/readKivaGrid.H
+++ b/applications/utilities/mesh/conversion/kivaToFoam/readKivaGrid.H
@@ -426,7 +426,7 @@ if (pFaces[WEDGE].size() && pFaces[WEDGE][0].size())
for
(
;
- iterf != pFaces[WEDGE][0].end(), iterb != pFaces[WEDGE][1].end();
+ iterf != pFaces[WEDGE][0].end() && iterb != pFaces[WEDGE][1].end();
++iterf, ++iterb
)
{
@@ -585,4 +585,3 @@ Info << "Writing cell zoning info to file: " << czPath << endl;
OFstream cz(czPath);
cz << cellZoning << endl;
-
diff --git a/applications/utilities/miscellaneous/patchSummary/patchSummaryTemplates.C b/applications/utilities/miscellaneous/patchSummary/patchSummaryTemplates.C
index 4f130eedf1199336a51681c19e72a6b6d5ddc29c..c0cc32b25cbb744c70b5c903cc928ad629a35066 100644
--- a/applications/utilities/miscellaneous/patchSummary/patchSummaryTemplates.C
+++ b/applications/utilities/miscellaneous/patchSummary/patchSummaryTemplates.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -37,8 +37,6 @@ void Foam::addToFieldList
const typename GeoField::Mesh& mesh
)
{
- typedef GeoField fieldType;
-
if (obj.headerClassName() == GeoField::typeName)
{
fieldList.set
diff --git a/src/ODE/ODESolvers/Euler/Euler.H b/src/ODE/ODESolvers/Euler/Euler.H
index 3cefc425be0751a2bb5e4eefe0a09ddc53d186bf..fecfc57fa03bc9c73a19c37c08bd22f8fa57804d 100644
--- a/src/ODE/ODESolvers/Euler/Euler.H
+++ b/src/ODE/ODESolvers/Euler/Euler.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -81,6 +81,9 @@ public:
// Member Functions
+ //- Inherit solve from ODESolver
+ using ODESolver::solve;
+
//- Solve a single step dx and return the error
scalar solve
(
diff --git a/src/ODE/ODESolvers/EulerSI/EulerSI.H b/src/ODE/ODESolvers/EulerSI/EulerSI.H
index 656e3df0a4d0aa995d04d035a1ec2c8dcc168860..a6703cc20c7e61ed85f84da530e74aacc1981a19 100644
--- a/src/ODE/ODESolvers/EulerSI/EulerSI.H
+++ b/src/ODE/ODESolvers/EulerSI/EulerSI.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -88,6 +88,9 @@ public:
// Member Functions
+ //- Inherit solve from ODESolver
+ using ODESolver::solve;
+
//- Solve a single step dx and return the error
scalar solve
(
diff --git a/src/ODE/ODESolvers/RKCK45/RKCK45.H b/src/ODE/ODESolvers/RKCK45/RKCK45.H
index 5402c6efbd0a7c1822d62c7032bb54cc46da69ac..c376a5f423f491013f81dc7a60b202a3e17f9f22 100644
--- a/src/ODE/ODESolvers/RKCK45/RKCK45.H
+++ b/src/ODE/ODESolvers/RKCK45/RKCK45.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -104,6 +104,9 @@ public:
// Member Functions
+ //- Inherit solve from ODESolver
+ using ODESolver::solve;
+
//- Solve a single step dx and return the error
scalar solve
(
diff --git a/src/ODE/ODESolvers/RKDP45/RKDP45.H b/src/ODE/ODESolvers/RKDP45/RKDP45.H
index e9ac93592a17b92d0c5af7ea10eea430ff8c0b14..b3f5c7bca4ae0a8d36396c31039c5e43a714bea2 100644
--- a/src/ODE/ODESolvers/RKDP45/RKDP45.H
+++ b/src/ODE/ODESolvers/RKDP45/RKDP45.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -108,6 +108,9 @@ public:
// Member Functions
+ //- Inherit solve from ODESolver
+ using ODESolver::solve;
+
//- Solve a single step dx and return the error
scalar solve
(
diff --git a/src/ODE/ODESolvers/RKF45/RKF45.H b/src/ODE/ODESolvers/RKF45/RKF45.H
index 7567adc9590570e2509645fd6d3aca85a8c095c2..5198d5553f214c847eea1a645f2fa3777d5833f4 100644
--- a/src/ODE/ODESolvers/RKF45/RKF45.H
+++ b/src/ODE/ODESolvers/RKF45/RKF45.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -108,6 +108,9 @@ public:
// Member Functions
+ //- Inherit solve from ODESolver
+ using ODESolver::solve;
+
//- Solve a single step dx and return the error
scalar solve
(
diff --git a/src/ODE/ODESolvers/Rosenbrock12/Rosenbrock12.H b/src/ODE/ODESolvers/Rosenbrock12/Rosenbrock12.H
index 7635e9a250028d2e0b1fc9170f878390a733f36d..b0bf1c79efffd9bb9cc437960d8e997f88c9ab1a 100644
--- a/src/ODE/ODESolvers/Rosenbrock12/Rosenbrock12.H
+++ b/src/ODE/ODESolvers/Rosenbrock12/Rosenbrock12.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -98,6 +98,9 @@ public:
// Member Functions
+ //- Inherit solve from ODESolver
+ using ODESolver::solve;
+
//- Solve a single step dx and return the error
scalar solve
(
diff --git a/src/ODE/ODESolvers/Rosenbrock23/Rosenbrock23.H b/src/ODE/ODESolvers/Rosenbrock23/Rosenbrock23.H
index ec9fb76504e6282586d0fb3d00877eda4c428932..38541a7c99c422143ecb478e4fddff41aee6b23a 100644
--- a/src/ODE/ODESolvers/Rosenbrock23/Rosenbrock23.H
+++ b/src/ODE/ODESolvers/Rosenbrock23/Rosenbrock23.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2013-2014 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -102,6 +102,9 @@ public:
// Member Functions
+ //- Inherit solve from ODESolver
+ using ODESolver::solve;
+
//- Solve a single step dx and return the error
scalar solve
(
diff --git a/src/ODE/ODESolvers/Rosenbrock34/Rosenbrock34.H b/src/ODE/ODESolvers/Rosenbrock34/Rosenbrock34.H
index 17da8dad05f60b39b52331539b29ec00ebb2ab36..2af18e5d409d4b8d568897d452451b18d69804e8 100644
--- a/src/ODE/ODESolvers/Rosenbrock34/Rosenbrock34.H
+++ b/src/ODE/ODESolvers/Rosenbrock34/Rosenbrock34.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -110,6 +110,9 @@ public:
// Member Functions
+ //- Inherit solve from ODESolver
+ using ODESolver::solve;
+
//- Solve a single step dx and return the error
scalar solve
(
diff --git a/src/ODE/ODESolvers/Trapezoid/Trapezoid.H b/src/ODE/ODESolvers/Trapezoid/Trapezoid.H
index c52d80f51de2fe2c22a0efbe0932b27071ddd8a2..667b6ee2adc517fcb51d576df2e13527951432a3 100644
--- a/src/ODE/ODESolvers/Trapezoid/Trapezoid.H
+++ b/src/ODE/ODESolvers/Trapezoid/Trapezoid.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -71,6 +71,9 @@ public:
// Member Functions
+ //- Inherit solve from ODESolver
+ using ODESolver::solve;
+
//- Solve a single step dx and return the error
scalar solve
(
diff --git a/src/ODE/ODESolvers/rodas23/rodas23.H b/src/ODE/ODESolvers/rodas23/rodas23.H
index eceb512bbbd72e3a9495ca3600546d4b39078e2f..75f0262813b5d2d2aa3606c005a36ac6fb84b93a 100644
--- a/src/ODE/ODESolvers/rodas23/rodas23.H
+++ b/src/ODE/ODESolvers/rodas23/rodas23.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -102,6 +102,9 @@ public:
// Member Functions
+ //- Inherit solve from ODESolver
+ using ODESolver::solve;
+
//- Solve a single step dx and return the error
scalar solve
(
diff --git a/src/ODE/ODESolvers/rodas34/rodas34.H b/src/ODE/ODESolvers/rodas34/rodas34.H
index 68631bb020bb753a37d746bd5dd624b06b97c408..35cb468f6a4bfc70840c003dcd97cae51df94381 100644
--- a/src/ODE/ODESolvers/rodas34/rodas34.H
+++ b/src/ODE/ODESolvers/rodas34/rodas34.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -103,6 +103,9 @@ public:
// Member Functions
+ //- Inherit solve from ODESolver
+ using ODESolver::solve;
+
//- Solve a single step dx and return the error
scalar solve
(
diff --git a/src/OSspecific/POSIX/signals/sigFpe.H b/src/OSspecific/POSIX/signals/sigFpe.H
index 4129749cc7ff5d75d2c991362950d1f3edb8bc07..c9e9b40f9a7608988e73e56fbd160fb08020c471 100644
--- a/src/OSspecific/POSIX/signals/sigFpe.H
+++ b/src/OSspecific/POSIX/signals/sigFpe.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -71,25 +71,21 @@ class sigFpe
//- Saved old signal trapping setting
static struct sigaction oldAction_;
-# ifdef LINUX
-
+ #ifdef LINUX
//- Saved old malloc
static void *(*oldMallocHook_)(size_t, const void *);
//- NaN malloc function. From malloc_hook manpage.
static void* nanMallocHook_(size_t size, const void *caller);
-
-# endif
+ #endif
// Static data members
-# ifdef LINUX_GNUC
-
+ #ifdef LINUX_GNUC
//- Handler for caught signals
static void sigHandler(int);
-
-# endif
+ #endif
public:
@@ -113,7 +109,6 @@ public:
//- Helper: fill block of data with NaN
static void fillSignallingNan(UList<scalar>&);
-
};
diff --git a/src/OpenFOAM/db/IOobject/IOobject.H b/src/OpenFOAM/db/IOobject/IOobject.H
index 5052f66310b8b8a98faa497279ca10410bf88a7d..da8f443447f58ba724308b591ba690be2b25b858 100644
--- a/src/OpenFOAM/db/IOobject/IOobject.H
+++ b/src/OpenFOAM/db/IOobject/IOobject.H
@@ -431,9 +431,7 @@ public:
};
-#if defined (__GNUC__)
template<>
-#endif
Ostream& operator<<(Ostream& os, const InfoProxy<IOobject>& ip);
diff --git a/src/OpenFOAM/db/IOobject/IOobjectIO.C b/src/OpenFOAM/db/IOobject/IOobjectIO.C
index 0bd52beb6edfa998ca36de572b72a146955deefe..58664653dc51429d2b8b2a5c8f94ed593e3715bf 100644
--- a/src/OpenFOAM/db/IOobject/IOobjectIO.C
+++ b/src/OpenFOAM/db/IOobject/IOobjectIO.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -21,11 +21,6 @@ License
You should have received a copy of the GNU General Public License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
-Description
- Print a summary of the data described by the IOobject (for
- use in erroring, etc.) via the global 'Info' error
- mechanism.
-
\*---------------------------------------------------------------------------*/
#include "IOobject.H"
@@ -33,9 +28,7 @@ Description
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-#if defined (__GNUC__)
template<>
-#endif
Foam::Ostream& Foam::operator<<(Ostream& os, const InfoProxy<IOobject>& ip)
{
const IOobject& io = ip.t_;
diff --git a/src/OpenFOAM/db/IOstreams/IOstreams/IOstream.C b/src/OpenFOAM/db/IOstreams/IOstreams/IOstream.C
index 0a28f44e097f579f80c233f8be3847285f24bb2d..5b8dd83c354855a1cbaf23da05f37136295c6d06 100644
--- a/src/OpenFOAM/db/IOstreams/IOstreams/IOstream.C
+++ b/src/OpenFOAM/db/IOstreams/IOstreams/IOstream.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -227,20 +227,12 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const IOstream::versionNumber& vn)
}
-
-namespace Foam
+template<>
+Foam::Ostream& Foam::operator<<(Ostream& os, const InfoProxy<IOstream>& ip)
{
-
-# if defined (__GNUC__)
- template<>
-# endif
- Ostream& operator<<(Ostream& os, const InfoProxy<IOstream>& ip)
- {
- ip.t_.print(os);
- return os;
- }
-
-} // end namespace
+ ip.t_.print(os);
+ return os;
+}
// ************************************************************************* //
diff --git a/src/OpenFOAM/db/IOstreams/IOstreams/IOstream.H b/src/OpenFOAM/db/IOstreams/IOstreams/IOstream.H
index 95d4a5f3117bdc5319fc8f99f56af3d64bb2a180..0fe6ede26a8aad3d3b78cdfeec42ff3677ec43c4 100644
--- a/src/OpenFOAM/db/IOstreams/IOstreams/IOstream.H
+++ b/src/OpenFOAM/db/IOstreams/IOstreams/IOstream.H
@@ -52,10 +52,6 @@ SourceFiles
#include <iostream>
-#if __GNUC__ < 3
-# define ios_base ios
-#endif
-
using std::ios_base;
using std::istream;
using std::ostream;
@@ -543,6 +539,9 @@ public:
Ostream& operator<<(Ostream& os, const IOstream::streamFormat& sf);
Ostream& operator<<(Ostream& os, const IOstream::versionNumber& vn);
+template<>
+Ostream& operator<<(Ostream& os, const InfoProxy<IOstream>& ip);
+
// --------------------------------------------------------------------
// ------ Manipulators (not taking arguments)
diff --git a/src/OpenFOAM/db/IOstreams/StringStreams/OStringStream.H b/src/OpenFOAM/db/IOstreams/StringStreams/OStringStream.H
index 57a789bbcf581a2d4a5f03b1bb9968a3e5bfa5fc..896f3cfc5df79f86cfa01f4aa2c082acdd2cb973 100644
--- a/src/OpenFOAM/db/IOstreams/StringStreams/OStringStream.H
+++ b/src/OpenFOAM/db/IOstreams/StringStreams/OStringStream.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -119,11 +119,7 @@ public:
//- Rewind the OStringStream
void rewind()
{
- #if __GNUC__ < 4 && __GNUC_MINOR__ < 4
- stdStream().rdbuf()->pubsetbuf(" ", 1);
- #else
stdStream().rdbuf()->pubseekpos(0);
- #endif
}
diff --git a/src/OpenFOAM/db/IOstreams/token/token.H b/src/OpenFOAM/db/IOstreams/token/token.H
index a1523fd3ffd5194b3e309457c7a069abb5026998..3b5775b9553310e8e71c57d92285a01e8de08ac0 100644
--- a/src/OpenFOAM/db/IOstreams/token/token.H
+++ b/src/OpenFOAM/db/IOstreams/token/token.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -433,9 +433,12 @@ public:
Ostream& operator<<(Ostream&, const token::punctuationToken&);
ostream& operator<<(ostream&, const token::punctuationToken&);
-ostream& operator<<(ostream&, const InfoProxy<token>&);
Ostream& operator<<(Ostream&, const token::compound&);
+ostream& operator<<(ostream&, const InfoProxy<token>&);
+
+template<>
+Ostream& operator<<(Ostream& os, const InfoProxy<token>& ip);
#define defineCompoundTypeName(Type, Name) \
defineTemplateTypeNameAndDebugWithName(token::Compound<Type>, #Type, 0);
diff --git a/src/OpenFOAM/db/IOstreams/token/tokenIO.C b/src/OpenFOAM/db/IOstreams/token/tokenIO.C
index f45386d8a6e0f2684603334ce7f830a4b2cec7f6..7dc65240b88c38e1393f19b6ceecd50cdd7dc8b4 100644
--- a/src/OpenFOAM/db/IOstreams/token/tokenIO.C
+++ b/src/OpenFOAM/db/IOstreams/token/tokenIO.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -21,9 +21,6 @@ License
You should have received a copy of the GNU General Public License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
-Description
- Stream operators for token
-
\*---------------------------------------------------------------------------*/
#include "error.H"
@@ -209,14 +206,8 @@ ostream& Foam::operator<<(ostream& os, const InfoProxy<token>& ip)
}
-// template specialization
-namespace Foam
-{
-
-#if defined (__GNUC__)
template<>
-#endif
-Ostream& operator<<(Ostream& os, const InfoProxy<token>& ip)
+Foam::Ostream& Foam::operator<<(Ostream& os, const InfoProxy<token>& ip)
{
const token& t = ip.t_;
@@ -287,8 +278,4 @@ Ostream& operator<<(Ostream& os, const InfoProxy<token>& ip)
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/OpenFOAM/db/dictionary/dictionaryEntry/dictionaryEntryIO.C b/src/OpenFOAM/db/dictionary/dictionaryEntry/dictionaryEntryIO.C
index 0dbc25e36e19822902bd6f909193c644e696efd7..677d5beaaca5aced998c9468822c714e2305024e 100644
--- a/src/OpenFOAM/db/dictionary/dictionaryEntry/dictionaryEntryIO.C
+++ b/src/OpenFOAM/db/dictionary/dictionaryEntry/dictionaryEntryIO.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -21,9 +21,6 @@ License
You should have received a copy of the GNU General Public License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
-Description
- DictionaryEntry constructor from Istream and Ostream output operator.
-
\*---------------------------------------------------------------------------*/
#include "keyType.H"
@@ -87,9 +84,7 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const dictionaryEntry& de)
}
-#if defined (__GNUC__)
template<>
-#endif
Foam::Ostream& Foam::operator<<
(
Ostream& os,
diff --git a/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.H b/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.H
index aa2c2ed36a4b1e46b994cb9dcd2d62c2677a9f43..2930e5f1213acf768656af3991bc9808ecfc5cba 100644
--- a/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.H
+++ b/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -127,6 +127,9 @@ public:
// Member functions
+ //- Inherit read from ITstream
+ using ITstream::read;
+
//- Return the dictionary name
const fileName& name() const
{
@@ -163,7 +166,7 @@ public:
dictionary& dict();
//- Read tokens from the given stream
- bool read(const dictionary&, Istream&);
+ virtual bool read(const dictionary&, Istream&);
//- Write
void write(Ostream&) const;
diff --git a/src/OpenFOAM/db/functionObjects/IOOutputFilter/IOOutputFilter.H b/src/OpenFOAM/db/functionObjects/IOOutputFilter/IOOutputFilter.H
index ab8872798af9cff3aa94b9caec2741fe1fd3afbc..f466832690b3669086e93313203a1c952587a56d 100644
--- a/src/OpenFOAM/db/functionObjects/IOOutputFilter/IOOutputFilter.H
+++ b/src/OpenFOAM/db/functionObjects/IOOutputFilter/IOOutputFilter.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -119,9 +119,15 @@ public:
return IOdictionary::name();
}
+ //- Inherit read from OutputFilter
+ using OutputFilter::read;
+
//- Read output filter properties
virtual bool read();
+ //- Inherit write from regIOobject
+ using regIOobject::write;
+
//- Sample and write
virtual void write();
diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/LduInterfaceField.H b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/LduInterfaceField.H
index 3d497e93fa955a05b42152b79437ada784b0d84d..aa21af6b4302b563ba5588614f90e2500845b953 100644
--- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/LduInterfaceField.H
+++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/LduInterfaceField.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -90,6 +90,9 @@ public:
// Coupled interface functionality
+ //- Inherit initInterfaceMatrixUpdate from lduInterfaceField
+ using lduInterfaceField::initInterfaceMatrixUpdate;
+
//- Initialise neighbour matrix update
virtual void initInterfaceMatrixUpdate
(
@@ -100,6 +103,9 @@ public:
) const
{}
+ //- Inherit updateInterfaceMatrix from lduInterfaceField
+ using lduInterfaceField::updateInterfaceMatrix;
+
//- Update result field based on interface functionality
virtual void updateInterfaceMatrix
(
diff --git a/src/OpenFOAM/memory/tmp/tmp.H b/src/OpenFOAM/memory/tmp/tmp.H
index 845199717ff6e58786db7d5e0b5ca64052e22219..fd6a0c0335cf0fd05c4bb11a46bd76f3989e3bd0 100644
--- a/src/OpenFOAM/memory/tmp/tmp.H
+++ b/src/OpenFOAM/memory/tmp/tmp.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -38,7 +38,7 @@ SourceFiles
#include "refCount.H"
#include <cstddef>
-#if defined(__GNUC__) && !defined(__INTEL_COMPILER)
+#ifndef __INTEL_COMPILER
# define ConstructFromTmp
#endif
diff --git a/src/OpenFOAM/meshes/meshShapes/cellModel/cellModel.H b/src/OpenFOAM/meshes/meshShapes/cellModel/cellModel.H
index 1a165ce50593a622e806dcb8dae60f1bb6df7060..b78d05f04024d89f1ba10985ff2368ae235b7930 100644
--- a/src/OpenFOAM/meshes/meshShapes/cellModel/cellModel.H
+++ b/src/OpenFOAM/meshes/meshShapes/cellModel/cellModel.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -175,6 +175,10 @@ public:
};
+template<>
+Ostream& operator<<(Ostream& os, const InfoProxy<cellModel>& ip);
+
+
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
diff --git a/src/OpenFOAM/meshes/meshShapes/cellModel/cellModelIO.C b/src/OpenFOAM/meshes/meshShapes/cellModel/cellModelIO.C
index f9f7f77b2f5cdeaa4fd09dbe7e0fe4666eea49b1..1cd60ab8d26266979c9bde59c2139cd5d0844ae1 100644
--- a/src/OpenFOAM/meshes/meshShapes/cellModel/cellModelIO.C
+++ b/src/OpenFOAM/meshes/meshShapes/cellModel/cellModelIO.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -21,10 +21,6 @@ License
You should have received a copy of the GNU General Public License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
-Description
- Read construct cellPrimitiveModel from Istream.
- Write cellPrimitiveModel to Ostream
-
\*---------------------------------------------------------------------------*/
#include "cellModel.H"
@@ -32,12 +28,7 @@ Description
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-cellModel::cellModel(Istream& is)
+Foam::cellModel::cellModel(Istream& is)
{
dictionaryEntry entry(dictionary::null, is);
name_ = entry.keyword();
@@ -48,7 +39,7 @@ cellModel::cellModel(Istream& is)
}
-Ostream& operator<<(Ostream& os, const cellModel& c)
+Foam::Ostream& Foam::operator<<(Ostream& os, const cellModel& c)
{
os << "name" << tab << c.name_ << tab
<< "index" << tab << c.index_ << tab
@@ -60,10 +51,8 @@ Ostream& operator<<(Ostream& os, const cellModel& c)
}
-#if defined (__GNUC__)
template<>
-#endif
-Ostream& operator<<(Ostream& os, const InfoProxy<cellModel>& ip)
+Foam::Ostream& Foam::operator<<(Ostream& os, const InfoProxy<cellModel>& ip)
{
const cellModel& cm = ip.t_;
@@ -78,8 +67,4 @@ Ostream& operator<<(Ostream& os, const InfoProxy<cellModel>& ip)
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/meshShapes/cellShape/cellShape.H b/src/OpenFOAM/meshes/meshShapes/cellShape/cellShape.H
index 49e3a4231dd1a1e91b7baad64fdc7b519bd76b4d..371d95a0632d1a0de12d9b91109eef9de8eb9c4d 100644
--- a/src/OpenFOAM/meshes/meshShapes/cellShape/cellShape.H
+++ b/src/OpenFOAM/meshes/meshShapes/cellShape/cellShape.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -164,6 +164,10 @@ public:
};
+template<>
+Ostream& operator<<(Ostream& os, const InfoProxy<cellShape>& ip);
+
+
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
diff --git a/src/OpenFOAM/meshes/meshShapes/cellShape/cellShapeIO.C b/src/OpenFOAM/meshes/meshShapes/cellShape/cellShapeIO.C
index eeb054549c6aa9266cf62f39894524287daef90b..9a2854cdb7331007d71ed34b7afc1a8552b8980d 100644
--- a/src/OpenFOAM/meshes/meshShapes/cellShape/cellShapeIO.C
+++ b/src/OpenFOAM/meshes/meshShapes/cellShape/cellShapeIO.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -21,9 +21,6 @@ License
You should have received a copy of the GNU General Public License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
-Description
- Reads a cellShape
-
\*---------------------------------------------------------------------------*/
#include "cellShape.H"
@@ -32,12 +29,7 @@ Description
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-Istream& operator>>(Istream& is, cellShape& s)
+Foam::Istream& Foam::operator>>(Istream& is, cellShape& s)
{
bool readEndBracket = false;
@@ -100,7 +92,7 @@ Istream& operator>>(Istream& is, cellShape& s)
}
-Ostream& operator<<(Ostream& os, const cellShape & s)
+Foam::Ostream& Foam::operator<<(Ostream& os, const cellShape & s)
{
// Write beginning of record
os << token::BEGIN_LIST;
@@ -121,10 +113,8 @@ Ostream& operator<<(Ostream& os, const cellShape & s)
}
-#if defined (__GNUC__)
template<>
-#endif
-Ostream& operator<<(Ostream& os, const InfoProxy<cellShape>& ip)
+Foam::Ostream& Foam::operator<<(Ostream& os, const InfoProxy<cellShape>& ip)
{
const cellShape& cs = ip.t_;
@@ -148,8 +138,4 @@ Ostream& operator<<(Ostream& os, const InfoProxy<cellShape>& ip)
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.H
index 357e81c9327ebb2788e98aa60ee0f3ecfec21d00..b13faf0968f96576e3f96cf29cb17488215e71c3 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -91,6 +91,9 @@ protected:
// Protected Member Functions
+ //- Inherit movePoints from primitivePatch
+ using primitivePatch::movePoints;
+
// The polyPatch geometry initialisation is called by polyBoundaryMesh
friend class polyBoundaryMesh;
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/Table/Table.H b/src/OpenFOAM/primitives/functions/DataEntry/Table/Table.H
index e89234cfa93b87492edbdefa57c4ef307d252d63..950c3790a6238932ba93fab00d198e0cc2daf6ad 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/Table/Table.H
+++ b/src/OpenFOAM/primitives/functions/DataEntry/Table/Table.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -108,42 +108,23 @@ public:
// Manipulation
- //- Convert time
- virtual void convertTimeBase(const Time& t)
- {
- TableBase<Type>::convertTimeBase(t);
- }
+ //- Inherit convertTimeBase from TableBase
+ using TableBase<Type>::convertTimeBase;
// Evaluation
- //- Return Table value
- virtual Type value(const scalar x) const
- {
- return TableBase<Type>::value(x);
- }
-
- //- Integrate between two (scalar) values
- virtual Type integrate(const scalar x1, const scalar x2) const
- {
- return TableBase<Type>::integrate(x1, x2);
- }
-
- //- Return dimensioned constant value
- virtual dimensioned<Type> dimValue(const scalar x) const
- {
- return TableBase<Type>::dimValue(x);
- }
-
- //- Integrate between two values and return dimensioned type
- virtual dimensioned<Type> dimIntegrate
- (
- const scalar x1,
- const scalar x2
- )
- {
- return TableBase<Type>::dimIntegrate(x1, x2);
- }
+ //- Inherit value from TableBase
+ using TableBase<Type>::value;
+
+ //- Inherit integrate from TableBase
+ using TableBase<Type>::integrate;
+
+ //- Inherit dimValue from TableBase
+ using TableBase<Type>::dimValue;
+
+ //- Inherit dimIntegrate from TableBase
+ using TableBase<Type>::dimIntegrate;
// I/O
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/TableFile/TableFile.H b/src/OpenFOAM/primitives/functions/DataEntry/TableFile/TableFile.H
index 23cb53f4e893b99bc35983684f5b8df914e47cb3..537fa20a70f8e0f737d76c2dd2b87bccec41c288 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/TableFile/TableFile.H
+++ b/src/OpenFOAM/primitives/functions/DataEntry/TableFile/TableFile.H
@@ -126,42 +126,23 @@ public:
// Manipulation
- //- Convert time
- virtual void convertTimeBase(const Time& t)
- {
- TableBase<Type>::convertTimeBase(t);
- }
+ //- Inherit convertTimeBase from TableBase
+ using TableBase<Type>::convertTimeBase;
// Evaluation
- //- Return TableFile value
- virtual Type value(const scalar x) const
- {
- return TableBase<Type>::value(x);
- }
-
- //- Integrate between two (scalar) values
- virtual Type integrate(const scalar x1, const scalar x2) const
- {
- return TableBase<Type>::integrate(x1, x2);
- }
-
- //- Return dimensioned constant value
- virtual dimensioned<Type> dimValue(const scalar x) const
- {
- return TableBase<Type>::dimValue(x);
- }
-
- //- Integrate between two values and return dimensioned type
- virtual dimensioned<Type> dimIntegrate
- (
- const scalar x1,
- const scalar x2
- )
- {
- return TableBase<Type>::dimIntegrate(x1, x2);
- }
+ //- Inherit value from TableBase
+ using TableBase<Type>::value;
+
+ //- Inherit integrate from TableBase
+ using TableBase<Type>::integrate;
+
+ //- Inherit dimValue from TableBase
+ using TableBase<Type>::dimValue;
+
+ //- Inherit dimIntegrate from TableBase
+ using TableBase<Type>::dimIntegrate;
// I/O
diff --git a/src/OpenFOAM/primitives/hashes/SHA1/SHA1.C b/src/OpenFOAM/primitives/hashes/SHA1/SHA1.C
index 134e2f3af56d911e0c3ae403d8efb1607fc5b2c3..f9caa9b586b1c16a1fe565819ac60c040f0489b4 100644
--- a/src/OpenFOAM/primitives/hashes/SHA1/SHA1.C
+++ b/src/OpenFOAM/primitives/hashes/SHA1/SHA1.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -56,10 +56,10 @@ static const unsigned char fillbuf[64] = { 0x80, 0 /* , 0, 0, ... */ };
inline uint32_t Foam::SHA1::swapBytes(uint32_t n)
{
-#ifdef __BYTE_ORDER
-# if (__BYTE_ORDER == __BIG_ENDIAN)
+ #ifdef __BYTE_ORDER
+ # if (__BYTE_ORDER == __BIG_ENDIAN)
return n;
-# else
+ # else
return
(
((n) << 24)
@@ -67,9 +67,9 @@ inline uint32_t Foam::SHA1::swapBytes(uint32_t n)
| (((n) >> 8) & 0xff00)
| ((n) >> 24)
);
-# endif
+ # endif
-#else
+ #else
const short x = 0x0100;
@@ -88,12 +88,11 @@ inline uint32_t Foam::SHA1::swapBytes(uint32_t n)
| ((n) >> 24)
);
}
-#endif
+ #endif
}
-inline void
-Foam::SHA1::set_uint32(unsigned char *cp, uint32_t v)
+inline void Foam::SHA1::set_uint32(unsigned char *cp, uint32_t v)
{
memcpy(cp, &v, sizeof(uint32_t));
}
@@ -101,7 +100,6 @@ Foam::SHA1::set_uint32(unsigned char *cp, uint32_t v)
// * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * //
-
void Foam::SHA1::processBytes(const void *data, size_t len)
{
// already finalized, thus need to restart from nothing
@@ -141,29 +139,12 @@ void Foam::SHA1::processBytes(const void *data, size_t len)
}
// Process available complete blocks
-// if (len >= 64)
-// {
-//#if !_STRING_ARCH_unaligned
-//# define alignof(type) offsetof (struct { char c; type x; }, x)
-//# define UNALIGNED_P(p) (((size_t) p) % alignof (uint32_t) != 0)
-// if (UNALIGNED_P (data))
-// {
-// while (len > 64)
- while (len >= 64)
- {
- processBlock(memcpy(buffer_, data, 64), 64);
- data = reinterpret_cast<const unsigned char*>(data) + 64;
- len -= 64;
- }
-// }
-// else
-//#endif
-// {
-// processBlock(data, len & ~63);
-// data = reinterpret_cast<const unsigned char*>(data) + (len & ~63);
-// len &= 63;
-// }
-// }
+ while (len >= 64)
+ {
+ processBlock(memcpy(buffer_, data, 64), 64);
+ data = reinterpret_cast<const unsigned char*>(data) + 64;
+ len -= 64;
+ }
// Move remaining bytes in internal buffer.
if (len > 0)
@@ -199,8 +180,7 @@ void Foam::SHA1::processBytes(const void *data, size_t len)
// Process LEN bytes of BUFFER, it is assumed that LEN % 64 == 0.
// Most of this code comes from GnuPG's cipher/sha1.c
-void
-Foam::SHA1::processBlock(const void *data, size_t len)
+void Foam::SHA1::processBlock(const void *data, size_t len)
{
const uint32_t *words = reinterpret_cast<const uint32_t*>(data);
size_t nwords = len / sizeof(uint32_t);
@@ -224,19 +204,18 @@ Foam::SHA1::processBlock(const void *data, size_t len)
}
// rotate left uint32_t by n bits
-#define rol_uint32(x, nbits) (((x) << (nbits)) | ((x) >> (32 - (nbits))))
+ #define rol_uint32(x, nbits) (((x) << (nbits)) | ((x) >> (32 - (nbits))))
-#define M(I) ( tm = x[I & 0x0F] ^ x[(I-14) & 0x0F] \
+ #define M(I) ( tm = x[I & 0x0F] ^ x[(I-14) & 0x0F] \
^ x[(I-8) & 0x0F] ^ x[(I-3) & 0x0F] \
, (x[I & 0x0F] = rol_uint32(tm, 1)) )
-
-#define R(A,B,C,D,E,F,K,M) \
- do \
- { \
- E += rol_uint32(A, 5) + F(B, C, D) + K + M; \
- B = rol_uint32(B, 30); \
- } while (0)
+ #define R(A,B,C,D,E,F,K,M) \
+ do \
+ { \
+ E += rol_uint32(A, 5) + F(B, C, D) + K + M; \
+ B = rol_uint32(B, 30); \
+ } while (0)
while (words < endp)
{
@@ -357,19 +336,8 @@ void Foam::SHA1::calcDigest(SHA1Digest& dig) const
}
-// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-
-// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
-
-// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-
-
-// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * //
-
-
// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * //
-
void Foam::SHA1::clear()
{
hashsumA_ = 0x67452301;
@@ -446,18 +414,4 @@ Foam::SHA1Digest Foam::SHA1::digest() const
}
-// * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * * //
-
-// void Foam::SHA1::operator=(const SHA1& rhs)
-// {
-// // Check for assignment to self
-// if (this == &rhs)
-// {
-// FatalErrorIn("Foam::SHA1::operator=(const Foam::SHA1&)")
-// << "Attempted assignment to self"
-// << abort(FatalError);
-// }
-// }
-
-
// ************************************************************************* //
diff --git a/src/Pstream/mpi/UPstream.C b/src/Pstream/mpi/UPstream.C
index 0c78f86514f7487fef08105f4a754cb0ef51ee15..74edc518b285094d59b451421acd136abdca38a2 100644
--- a/src/Pstream/mpi/UPstream.C
+++ b/src/Pstream/mpi/UPstream.C
@@ -304,9 +304,9 @@ void Foam::UPstream::allocatePstreamCommunicator
if (index == PstreamGlobals::MPIGroups_.size())
{
// Extend storage with dummy values
- MPI_Group newGroup;
+ MPI_Group newGroup = MPI_GROUP_NULL;
PstreamGlobals::MPIGroups_.append(newGroup);
- MPI_Comm newComm;
+ MPI_Comm newComm = MPI_COMM_NULL;
PstreamGlobals::MPICommunicators_.append(newComm);
}
else if (index > PstreamGlobals::MPIGroups_.size())
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonLowReWallFunction/epsilonLowReWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonLowReWallFunction/epsilonLowReWallFunctionFvPatchScalarField.C
index 77e45418a8d3dfbad46dea47ac702865acd03693..87ff8cd80095d2a18054990b1eada2281dac210f 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonLowReWallFunction/epsilonLowReWallFunctionFvPatchScalarField.C
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonLowReWallFunction/epsilonLowReWallFunctionFvPatchScalarField.C
@@ -77,8 +77,6 @@ void Foam::epsilonLowReWallFunctionFvPatchScalarField::calculate
const scalarField magGradUw(mag(Uw.snGrad()));
- typedef DimensionedField<scalar, volMesh> FieldType;
-
const DimensionedField<scalar, volMesh>& G =
db().lookupObject<DimensionedField<scalar, volMesh> >
(
diff --git a/src/conversion/ensight/file/ensightFile.C b/src/conversion/ensight/file/ensightFile.C
index f2b61d4607c357310625fd53568fa5d944ba4994..09269edd329f3a59ce04ad2a8ea15259f52b9f26 100644
--- a/src/conversion/ensight/file/ensightFile.C
+++ b/src/conversion/ensight/file/ensightFile.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -143,6 +143,12 @@ Foam::Ostream& Foam::ensightFile::write
}
+Foam::Ostream& Foam::ensightFile::write(const char* value)
+{
+ return write(string(value));
+}
+
+
Foam::Ostream& Foam::ensightFile::write(const string& value)
{
char buf[80];
@@ -270,7 +276,7 @@ Foam::Ostream& Foam::ensightFile::writeKeyword(const string& key)
{
if (allowUndef_)
{
- write(key + " undef");
+ write(string(key + " undef"));
newline();
write(undefValue_);
newline();
diff --git a/src/conversion/ensight/file/ensightFile.H b/src/conversion/ensight/file/ensightFile.H
index 18c71fa02f5fc98827d97eef347c4d13a326f0d1..c9ed78157547a9cea1d13e17f5986397210fda7d 100644
--- a/src/conversion/ensight/file/ensightFile.H
+++ b/src/conversion/ensight/file/ensightFile.H
@@ -120,6 +120,9 @@ public:
// Output
+ //- Inherit write from Ostream
+ using Ostream::write;
+
//- Binary write
virtual Ostream& write(const char* buf, std::streamsize count);
@@ -132,6 +135,9 @@ public:
//- Write undef value
Ostream& writeUndef();
+ //- Write C-string as "%80s" or as binary
+ Ostream& write(const char* value);
+
//- Write string as "%80s" or as binary
Ostream& write(const string& value);
diff --git a/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModel.H b/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModel.H
index a3b4b0f0e098f3c355da07ba810e6002bf500b81..3a76645d998591699a54fc0f7ac1041cd2ac08bc 100644
--- a/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModel.H
+++ b/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModel.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2012-2014 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -261,6 +261,9 @@ public:
//- Write
virtual bool writeData(Ostream& os) const;
+ //- Inherit read from regIOobject
+ using regIOobject::read;
+
//- Read porosity dictionary
virtual bool read(const dictionary& dict);
};
diff --git a/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/solutionControl.C b/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/solutionControl.C
index 8e3dd89075ca97321c44299375fe9970b4aefecd..1d028e8c4db95e1b1c7e34d5c69a84dfad4cc856 100644
--- a/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/solutionControl.C
+++ b/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/solutionControl.C
@@ -133,6 +133,12 @@ void Foam::solutionControl::read(const bool absTolOnly)
}
+void Foam::solutionControl::read()
+{
+ read(false);
+}
+
+
Foam::label Foam::solutionControl::applyToField
(
const word& fieldName,
diff --git a/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/solutionControl.H b/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/solutionControl.H
index 9cd6cbbf16ddfb5ea6f53fe2db50a73f89516277..3517f7121f52e4c418dd7e60596004064f4af72c 100644
--- a/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/solutionControl.H
+++ b/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/solutionControl.H
@@ -102,6 +102,9 @@ protected:
//- Read controls from fvSolution dictionary
virtual void read(const bool absTolOnly);
+ //- Read controls from fvSolution dictionary
+ virtual void read();
+
//- Return index of field in residualControl_ if present
virtual label applyToField
(
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/totalPressure/totalPressureFvPatchScalarField.H b/src/finiteVolume/fields/fvPatchFields/derived/totalPressure/totalPressureFvPatchScalarField.H
index 5887bbc3fa9e92e6752aefcfac7e9f6e1b4a4040..edf53bcede1c0a885b4d705d0642f77f0e29f9e4 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/totalPressure/totalPressureFvPatchScalarField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/totalPressure/totalPressureFvPatchScalarField.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -333,6 +333,9 @@ public:
// Evaluation functions
+ //- Inherit updateCoeffs from fixedValueFvPatchScalarField
+ using fixedValueFvPatchScalarField::updateCoeffs;
+
//- Update the coefficients associated with the patch field
// using the given patch total pressure and velocity fields
virtual void updateCoeffs
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.H b/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.H
index 8d8bc415a8bb86822cebac92de6b985829ab9c94..1e50c82e2992206bb19c08c4ed690136b32965a2 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -214,6 +214,9 @@ public:
// Evaluation functions
+ //- Inherit updateCoeffs from fixedValueFvPatchScalarField
+ using fixedValueFvPatchScalarField::updateCoeffs;
+
//- Update the coefficients associated with the patch field
// using the given patch velocity field
virtual void updateCoeffs(const vectorField& Up);
diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/empty/emptyFvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/constraint/empty/emptyFvsPatchField.H
index 3a460569c6d6dc2ffcb501e265d0539db9264cb8..a2c4f2c0cc967b08c82d08cda3438a1b214c162b 100644
--- a/src/finiteVolume/fields/fvsPatchFields/constraint/empty/emptyFvsPatchField.H
+++ b/src/finiteVolume/fields/fvsPatchFields/constraint/empty/emptyFvsPatchField.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -134,7 +134,7 @@ public:
//- Reverse map the given fvsPatchField onto this fvsPatchField
virtual void rmap
(
- const fvPatchField<Type>&,
+ const fvsPatchField<Type>&,
const labelList&
)
{}
diff --git a/src/finiteVolume/fvMesh/fvPatches/basic/coupled/coupledFvPatch.H b/src/finiteVolume/fvMesh/fvPatches/basic/coupled/coupledFvPatch.H
index 7fc59ffb9502b3e2785d9281f2361db190a7e4bc..c5ff5b874a5a29381f4ffe16a234763b7d47bfd9 100644
--- a/src/finiteVolume/fvMesh/fvPatches/basic/coupled/coupledFvPatch.H
+++ b/src/finiteVolume/fvMesh/fvPatches/basic/coupled/coupledFvPatch.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -128,6 +128,9 @@ public:
const labelUList& internalData
) const = 0;
+ //- Inherit initInternalFieldTransfer from lduInterface
+ using lduInterface::initInternalFieldTransfer;
+
//- Initialise neighbour field transfer
virtual void initInternalFieldTransfer
(
diff --git a/src/finiteVolume/fvMesh/fvPatches/constraint/processor/processorFvPatch.H b/src/finiteVolume/fvMesh/fvPatches/constraint/processor/processorFvPatch.H
index 5336d9e071352dc7257504c11a33270fd5a9397b..e61d122d1107bac28203af823215a785602a1827 100644
--- a/src/finiteVolume/fvMesh/fvPatches/constraint/processor/processorFvPatch.H
+++ b/src/finiteVolume/fvMesh/fvPatches/constraint/processor/processorFvPatch.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -157,6 +157,9 @@ public:
const labelUList& internalData
) const;
+ //- Inherit initInternalFieldTransfer from coupledFvPatch
+ using coupledFvPatch::initInternalFieldTransfer;
+
//- Initialise neighbour field transfer
virtual void initInternalFieldTransfer
(
diff --git a/src/finiteVolume/fvMesh/fvPatches/derived/regionCoupled/regionCoupledFvPatch.H b/src/finiteVolume/fvMesh/fvPatches/derived/regionCoupled/regionCoupledFvPatch.H
index 9c22929437c72b4a97eb35e9081d520b01ac11ce..3a15e78b44f4dd6c522110e8b26f5ef662906552 100644
--- a/src/finiteVolume/fvMesh/fvPatches/derived/regionCoupled/regionCoupledFvPatch.H
+++ b/src/finiteVolume/fvMesh/fvPatches/derived/regionCoupled/regionCoupledFvPatch.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -132,6 +132,9 @@ public:
const labelUList& internalData
) const;
+ //- Inherit initInternalFieldTransfer from lduInterface
+ using lduInterface::initInternalFieldTransfer;
+
//- Initialise neighbour field transfer
virtual void initInternalFieldTransfer
(
diff --git a/src/finiteVolume/fvMesh/fvPatches/derived/regionCoupled/regionCoupledWallFvPatch.H b/src/finiteVolume/fvMesh/fvPatches/derived/regionCoupled/regionCoupledWallFvPatch.H
index 486c5c693d2c33752422b096971cacb14fe93d5f..6cd9b3ecec7d8205f11563839643250333aed2cf 100644
--- a/src/finiteVolume/fvMesh/fvPatches/derived/regionCoupled/regionCoupledWallFvPatch.H
+++ b/src/finiteVolume/fvMesh/fvPatches/derived/regionCoupled/regionCoupledWallFvPatch.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -136,6 +136,9 @@ public:
const labelUList& internalData
) const;
+ //- Inherit initInternalFieldTransfer from lduInterface
+ using lduInterface::initInternalFieldTransfer;
+
//- Initialise neighbour field transfer
virtual void initInternalFieldTransfer
(
diff --git a/src/finiteVolume/interpolation/interpolation/interpolationPointMVC/interpolationPointMVC.H b/src/finiteVolume/interpolation/interpolation/interpolationPointMVC/interpolationPointMVC.H
index 7e9c4aa8937323b32256e77fa964efbc7bfc2a93..134e2ade9721f654283e8ef0ab5b17503d76447e 100644
--- a/src/finiteVolume/interpolation/interpolation/interpolationPointMVC/interpolationPointMVC.H
+++ b/src/finiteVolume/interpolation/interpolation/interpolationPointMVC/interpolationPointMVC.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -75,6 +75,9 @@ public:
// Member Functions
+ //- Inherit interpolate from interpolation
+ using interpolation<Type>::interpolate;
+
//- Interpolate field for the given cellPointWeight
inline Type interpolate(const pointMVCWeight& cpw) const;
diff --git a/src/fvOptions/fvOption/fvIOoptionList.H b/src/fvOptions/fvOption/fvIOoptionList.H
index 2723b583bd87ea712606b70d7b24ed513a500b22..135c3367fac155d480d6a0e60df94090e32ab77f 100644
--- a/src/fvOptions/fvOption/fvIOoptionList.H
+++ b/src/fvOptions/fvOption/fvIOoptionList.H
@@ -77,13 +77,16 @@ public:
IOoptionList(const fvMesh& mesh);
- //- Destructor
- virtual ~IOoptionList()
- {}
+ //- Destructor
+ virtual ~IOoptionList()
+ {}
// Member Functions
+ //- Inherit read from optionList
+ using optionList::read;
+
//- Read dictionary
virtual bool read();
};
diff --git a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModel.H b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModel.H
index 9066ce40e1490d2af886c8b66cdb9ae9dc05a1f8..f24bbad67060e3e9bcd4915494cbb5250b8e3a72 100644
--- a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModel.H
+++ b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModel.H
@@ -90,6 +90,9 @@ protected:
//- Set the neighbour interRegionHeatTransferModel
void setNbrModel();
+ //- Inherit correct from interRegionOption
+ using interRegionOption::correct;
+
//- Correct to calculate the inter-region heat transfer coefficient
void correct();
diff --git a/src/lagrangian/basic/IOPosition/IOPosition.H b/src/lagrangian/basic/IOPosition/IOPosition.H
index e4836f556d096cc24ef5f117a6b9b60bdea6d0c7..4eff22391feedaf35cc24f1ea110aa2edff8351c 100644
--- a/src/lagrangian/basic/IOPosition/IOPosition.H
+++ b/src/lagrangian/basic/IOPosition/IOPosition.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -66,7 +66,6 @@ public:
virtual const word& type() const
{
return Cloud<typename CloudType::particleType>::typeName;
- //cloud_.type();
}
@@ -78,6 +77,9 @@ public:
// Member functions
+ //- Inherit readData from regIOobject
+ using regIOobject::readData;
+
virtual void readData(CloudType& c, bool checkClass);
virtual bool write() const;
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObject.H b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObject.H
index 616e6314be7b0e09a05a04972ff23282d1752bd8..523f818e0610b6344eb2ddee0af8790d620aa73f 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObject.H
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObject.H
@@ -66,6 +66,9 @@ class CloudFunctionObject
// Private Member Functions
+ //- Inherite write from CloudSubModelBase
+ using CloudSubModelBase<CloudType>::write;
+
//- Write post-processing info
virtual void write();
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.H
index c666a9264853c2e05bc771d14bd4eaa5b97abb0f..72ea50e261b0da8c4a64ec245b8255206ad0f067 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -122,6 +122,9 @@ public:
// Member Functions
+ //- Inherit updateMesh from patchInjectionBase
+ using patchInjectionBase::updateMesh;
+
//- Set injector locations when mesh is updated
virtual void updateMesh();
@@ -140,6 +143,9 @@ public:
// Injection geometry
+ //- Inherit setPositionAndCell from patchInjectionBase
+ using patchInjectionBase::setPositionAndCell;
+
//- Set the injection position and owner cell, tetFace and tetPt
virtual void setPositionAndCell
(
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H
index 95a6b50b71ed563e64a343fdc7047b8a82c0842c..c782ad860d8024c95b28f09d10966e1f5d851d41 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -119,6 +119,9 @@ public:
// Member Functions
+ //- Inherit updateMesh from patchInjectionBase
+ using patchInjectionBase::updateMesh;
+
//- Set injector locations when mesh is updated
virtual void updateMesh();
@@ -134,6 +137,9 @@ public:
// Injection geometry
+ //- Inherit setPositionAndCell from patchInjectionBase
+ using patchInjectionBase::setPositionAndCell;
+
//- Set the injection position and owner cell, tetFace and tetPt
virtual void setPositionAndCell
(
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/NoSurfaceFilm/NoSurfaceFilm.C b/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/NoSurfaceFilm/NoSurfaceFilm.C
index 399730c95088ccfb0ce125cf0d0046291ec101e5..9a3636619dfd4ea7badb79ae8cda0829514e1c8d 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/NoSurfaceFilm/NoSurfaceFilm.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/NoSurfaceFilm/NoSurfaceFilm.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -82,17 +82,13 @@ void Foam::NoSurfaceFilm<CloudType>::setParcelProperties
(
parcelType&,
const label
-)
-{
- // do nothing
-}
+) const
+{}
template<class CloudType>
-void Foam::NoSurfaceFilm<CloudType>::info(Ostream&) const
-{
- // do nothing
-}
+void Foam::NoSurfaceFilm<CloudType>::info(Ostream&)
+{}
// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/NoSurfaceFilm/NoSurfaceFilm.H b/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/NoSurfaceFilm/NoSurfaceFilm.H
index b67136aa6af5d77f49ee387f0a225b5c49d9d728..b2fd4e7cd20b80888dd0c620642447de1ea879ae 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/NoSurfaceFilm/NoSurfaceFilm.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/NoSurfaceFilm/NoSurfaceFilm.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -108,13 +108,13 @@ public:
(
parcelType& p,
const label filmCellI
- );
+ ) const;
// I-O
//- Write surface film info to stream
- virtual void info(Ostream& os) const;
+ virtual void info(Ostream& os);
};
diff --git a/src/meshTools/coordinateSystems/coordinateSystems.C b/src/meshTools/coordinateSystems/coordinateSystems.C
index 1739ecd8e2218ca429eb75b7819e95500c5af38f..34d1b83715535c78df724727df889af9da2f6088 100644
--- a/src/meshTools/coordinateSystems/coordinateSystems.C
+++ b/src/meshTools/coordinateSystems/coordinateSystems.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -174,14 +174,14 @@ Foam::wordList Foam::coordinateSystems::toc() const
}
-bool Foam::coordinateSystems::writeData(Ostream& os, bool subDict) const
+bool Foam::coordinateSystems::writeData(Ostream& os) const
{
os << nl << size() << nl << token::BEGIN_LIST;
forAll(*this, i)
{
os << nl;
- operator[](i).writeDict(os, subDict);
+ operator[](i).writeDict(os, true);
}
os << token::END_LIST << nl;
diff --git a/src/meshTools/coordinateSystems/coordinateSystems.H b/src/meshTools/coordinateSystems/coordinateSystems.H
index 7ed818c1ab327413e54e964725dc2c1266c24fa6..a27629aa6c8cfd3c419259858c8383e85b0f98a4 100644
--- a/src/meshTools/coordinateSystems/coordinateSystems.H
+++ b/src/meshTools/coordinateSystems/coordinateSystems.H
@@ -133,7 +133,7 @@ public:
wordList toc() const;
//- Write data
- bool writeData(Ostream&, bool subDict=true) const;
+ bool writeData(Ostream&) const;
};
diff --git a/src/meshTools/searchableSurface/searchableBox.H b/src/meshTools/searchableSurface/searchableBox.H
index d677c1b87de1f59b4c884d1b1fd74c8638095450..81e47680df58d0897f55901c2f384ca8bdd8ac0d 100644
--- a/src/meshTools/searchableSurface/searchableBox.H
+++ b/src/meshTools/searchableSurface/searchableBox.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -71,6 +71,9 @@ private:
pointIndexHit& info
) const;
+ //- Inherit findNearest from searchableSurface
+ using searchableSurface::findNearest;
+
//- Returns miss or hit with face (0..5)
pointIndexHit findNearest
(
diff --git a/src/meshTools/searchableSurface/searchableCylinder.H b/src/meshTools/searchableSurface/searchableCylinder.H
index 2ec3c6671efa1fe44d793248813677f1180df497..fe00bc42581991836a80a95204f49b59fa89e24c 100644
--- a/src/meshTools/searchableSurface/searchableCylinder.H
+++ b/src/meshTools/searchableSurface/searchableCylinder.H
@@ -78,6 +78,9 @@ private:
// Private Member Functions
+ //- Inherit findNearest from searchableSurface
+ using searchableSurface::findNearest;
+
//- Find nearest point on cylinder.
pointIndexHit findNearest
(
diff --git a/src/meshTools/searchableSurface/searchableDisk.H b/src/meshTools/searchableSurface/searchableDisk.H
index 7bebdbf76a516c0cf60e9c2e292143809d392ccd..c31ad42c4a06741bc7af9f72ab0f3075231374d5 100644
--- a/src/meshTools/searchableSurface/searchableDisk.H
+++ b/src/meshTools/searchableSurface/searchableDisk.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2014 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2014-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -71,6 +71,9 @@ private:
// Private Member Functions
+ //- Inherit findNearest from searchableSurface
+ using searchableSurface::findNearest;
+
//- Find nearest point on disk
pointIndexHit findNearest
(
diff --git a/src/meshTools/searchableSurface/searchablePlate.H b/src/meshTools/searchableSurface/searchablePlate.H
index af2d732ff635ecbc0aaa4f1ce3272138568e08aa..0cbea9e01a817fce22311f8effff40dbe5d6639e 100644
--- a/src/meshTools/searchableSurface/searchablePlate.H
+++ b/src/meshTools/searchableSurface/searchablePlate.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -80,6 +80,9 @@ private:
//- Calculate normal direction from span
static direction calcNormal(const point&);
+ //- Inherit findNearest from searchableSurface
+ using searchableSurface::findNearest;
+
pointIndexHit findNearest
(
const point& sample,
diff --git a/src/meshTools/searchableSurface/searchableSphere.H b/src/meshTools/searchableSurface/searchableSphere.H
index 50900f936185c9a884fca3ef3d338452d2be1aee..d30b83e8da01f62050e77b98309e3cb3ea30f667 100644
--- a/src/meshTools/searchableSurface/searchableSphere.H
+++ b/src/meshTools/searchableSurface/searchableSphere.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -69,6 +69,9 @@ private:
// Private Member Functions
+ //- Inherit findNearest from searchableSurface
+ using searchableSurface::findNearest;
+
//- Find nearest point on sphere.
pointIndexHit findNearest
(
diff --git a/src/meshTools/searchableSurface/searchableSurfaceCollection.H b/src/meshTools/searchableSurface/searchableSurfaceCollection.H
index 7d9c663121104c96e2e2160988bf42e2c64bdde8..b3153b6576c68a0e7c3d47b0a3564bd80342d3ac 100644
--- a/src/meshTools/searchableSurface/searchableSurfaceCollection.H
+++ b/src/meshTools/searchableSurface/searchableSurfaceCollection.H
@@ -88,6 +88,9 @@ private:
// Private Member Functions
+ //- Inherit findNearest from searchableSurface
+ using searchableSurface::findNearest;
+
//- Find point nearest to sample. Updates minDistSqr. Sets nearestInfo
// and surface index
void findNearest
diff --git a/src/parallel/decompose/decompositionMethods/multiLevelDecomp/multiLevelDecomp.H b/src/parallel/decompose/decompositionMethods/multiLevelDecomp/multiLevelDecomp.H
index 795cf2632a5cc261bfe6da52af146af2468f17d5..dbdd582295c9bf660d36de424f137d530dc00a2b 100644
--- a/src/parallel/decompose/decompositionMethods/multiLevelDecomp/multiLevelDecomp.H
+++ b/src/parallel/decompose/decompositionMethods/multiLevelDecomp/multiLevelDecomp.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -111,6 +111,9 @@ public:
// proc boundaries)
virtual bool parallelAware() const;
+ //- Inherit decompose from decompositionMethod
+ using decompositionMethod::decompose;
+
//- Return for every coordinate the wanted processor number. Use the
// mesh connectivity (if needed)
virtual labelList decompose
diff --git a/src/parallel/decompose/metisDecomp/metisDecomp.H b/src/parallel/decompose/metisDecomp/metisDecomp.H
index 9ea73fab9f85cc3c5413edef98f3126a4bdbacd3..5f928161249c1514c3ae26bd25f4ddb503150a5e 100644
--- a/src/parallel/decompose/metisDecomp/metisDecomp.H
+++ b/src/parallel/decompose/metisDecomp/metisDecomp.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -89,6 +89,9 @@ public:
return false;
}
+ //- Inherit decompose from decompositionMethod
+ using decompositionMethod::decompose;
+
//- Return for every coordinate the wanted processor number. Use the
// mesh connectivity (if needed)
// Weights get normalised so the minimum value is 1 before truncation
diff --git a/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.H b/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.H
index 2ae75b29600d77a689ffaf7590c6c9ef5a678691..e0ae30e5cc2f5532dfdd136ef232abc298f8f28d 100644
--- a/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.H
+++ b/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -112,6 +112,9 @@ public:
return true;
}
+ //- Inherit decompose from decompositionMethod
+ using decompositionMethod::decompose;
+
//- Return for every coordinate the wanted processor number. Use the
// mesh connectivity (if needed). See note on weights in scotchDecomp.H
virtual labelList decompose
diff --git a/src/parallel/decompose/scotchDecomp/scotchDecomp.H b/src/parallel/decompose/scotchDecomp/scotchDecomp.H
index 55b3172ce2fd6047074d315f3ee90867b80064ea..714bdb76fce8ceaf965b5847732596d135f0d444 100644
--- a/src/parallel/decompose/scotchDecomp/scotchDecomp.H
+++ b/src/parallel/decompose/scotchDecomp/scotchDecomp.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -105,6 +105,9 @@ public:
return true;
}
+ //- Inherit decompose from decompositionMethod
+ using decompositionMethod::decompose;
+
//- Return for every coordinate the wanted processor number. Use the
// mesh connectivity (if needed)
// Weights get normalised with minimum weight and truncated to
diff --git a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.H b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.H
index 5aba10529a1324a0ee666904fc497bc7b85a444e..1a8cc16d2e1b9aebae6450dbacd43b6a2787ceab 100644
--- a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.H
+++ b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -316,6 +316,9 @@ public:
const labelHashSet& include
) const;
+ //- Inherit reset from MeshedSurface<Face>
+ using MeshedSurface<Face>::reset;
+
//- Transfer components (points, faces, zone ids).
virtual void reset
(
diff --git a/src/surfMesh/surfaceFormats/obj/OBJstream.H b/src/surfMesh/surfaceFormats/obj/OBJstream.H
index 47da27c51b6d08e5bcf45cca5c641b53fe19abb8..a2188a913613ec10194a9f08fab763fd6a496ddb 100644
--- a/src/surfMesh/surfaceFormats/obj/OBJstream.H
+++ b/src/surfMesh/surfaceFormats/obj/OBJstream.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2012-2014 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -101,6 +101,9 @@ public:
// Ostream implementation
+ //- Inherit write from Ostream
+ using Ostream::write;
+
//- Write character
virtual Ostream& write(const char);
diff --git a/src/thermophysicalModels/basic/heThermo/heThermo.C b/src/thermophysicalModels/basic/heThermo/heThermo.C
index 0cc1354ffa30e7999a6581b680bed8eff9c61e3e..23441a9b79194e66a7c8c872699340e1186697f9 100644
--- a/src/thermophysicalModels/basic/heThermo/heThermo.C
+++ b/src/thermophysicalModels/basic/heThermo/heThermo.C
@@ -799,6 +799,60 @@ Foam::heThermo<BasicThermo, MixtureType>::alphaEff
}
+template<class BasicThermo, class MixtureType>
+Foam::scalar
+Foam::heThermo<BasicThermo, MixtureType>::Cp
+(
+ const label speciei,
+ const scalar p,
+ const scalar T
+) const
+{
+ notImplemented
+ (
+ "heThermo<BasicThermo, MixtureType>::"
+ "Cp(const label speciei, const scalar p, const scalar T)"
+ );
+ return 0;
+}
+
+
+template<class BasicThermo, class MixtureType>
+Foam::scalar
+Foam::heThermo<BasicThermo, MixtureType>::Cv
+(
+ const label speciei,
+ const scalar p,
+ const scalar T
+) const
+{
+ notImplemented
+ (
+ "heThermo<BasicThermo, MixtureType>::"
+ "Cv(const label speciei, const scalar p, const scalar T)"
+ );
+ return 0;
+}
+
+
+template<class BasicThermo, class MixtureType>
+Foam::scalar
+Foam::heThermo<BasicThermo, MixtureType>::kappa
+(
+ const label speciei,
+ const scalar p,
+ const scalar T
+) const
+{
+ notImplemented
+ (
+ "heThermo<BasicThermo, MixtureType>::"
+ "kappa(const label speciei, const scalar p, const scalar T)"
+ );
+ return 0;
+}
+
+
template<class BasicThermo, class MixtureType>
bool Foam::heThermo<BasicThermo, MixtureType>::read()
{
diff --git a/src/thermophysicalModels/basic/heThermo/heThermo.H b/src/thermophysicalModels/basic/heThermo/heThermo.H
index 9858f16a31fdfedcd50c29fdb833a342667fb106..5bf3bdc93590fab97d8aa7d3aa416907bebe0b35 100644
--- a/src/thermophysicalModels/basic/heThermo/heThermo.H
+++ b/src/thermophysicalModels/basic/heThermo/heThermo.H
@@ -292,6 +292,34 @@ public:
) const;
+ // Dummy per-specie thermo properties to avoid problems
+ // with virtual function inheritance
+
+ //- Heat capacity at constant pressure [J/(kg K)]
+ virtual scalar Cp
+ (
+ const label speciei,
+ const scalar p,
+ const scalar T
+ ) const;
+
+ //- Heat capacity at constant volume [J/(kg K)]
+ virtual scalar Cv
+ (
+ const label speciei,
+ const scalar p,
+ const scalar T
+ ) const;
+
+ //- Thermal conductivity [W/m/K]
+ virtual scalar kappa
+ (
+ const label speciei,
+ const scalar p,
+ const scalar T
+ ) const;
+
+
//- Read thermophysical properties dictionary
virtual bool read();
};
diff --git a/wmake/rules/linux64Clang/c++ b/wmake/rules/linux64Clang/c++
index b4dd352444252e3f40d8f57d746da8651c66b031..300983dc58e647cc28ee189a7070f868a59e346b 100644
--- a/wmake/rules/linux64Clang/c++
+++ b/wmake/rules/linux64Clang/c++
@@ -1,7 +1,6 @@
SUFFIXES += .C
-# -Woverloaded-virtual may produce spurious warnings, disable for now
-c++WARN = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast -Wnon-virtual-dtor -Wno-overloaded-virtual -Wno-unused-comparison -Wno-invalid-offsetof -Wno-c++11-extensions
+c++WARN = -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor -Wno-unused-parameter -Wno-invalid-offsetof -Wno-c++11-extensions
# Suppress CGAL warnings
c++CGALWARN = -Wno-sometimes-uninitialized -Wno-mismatched-tags
diff --git a/wmake/rules/linux64Gcc/c++ b/wmake/rules/linux64Gcc/c++
index a23dd820efe39e2ae1b3365700e5822d5bcac7e1..4b4f637e253a7681eb3ed570eea9902abf3683bf 100644
--- a/wmake/rules/linux64Gcc/c++
+++ b/wmake/rules/linux64Gcc/c++
@@ -1,9 +1,9 @@
SUFFIXES += .C
-c++WARN = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast -Wnon-virtual-dtor -Wno-invalid-offsetof
+c++WARN = -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor -Wno-unused-parameter -Wno-invalid-offsetof
# Suppress CGAL warnings
-c++CGALWARN = -Wall -Wextra -Wno-unused-parameter -Wno-old-style-cast -Wnon-virtual-dtor
+c++CGALWARN =
CC = g++ -m64
diff --git a/wmake/rules/linuxARM7Gcc/c++ b/wmake/rules/linuxARM7Gcc/c++
index 408abf76656871e859ab4e19bc99cff75421252f..67bd5ff30c2d1cba08d9e787153e58dede3f566c 100644
--- a/wmake/rules/linuxARM7Gcc/c++
+++ b/wmake/rules/linuxARM7Gcc/c++
@@ -1,6 +1,9 @@
SUFFIXES += .C
-c++WARN = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast -Wno-invalid-offsetof
+c++WARN = -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor -Wno-unused-parameter -Wno-invalid-offsetof
+
+# Suppress CGAL warnings
+c++CGALWARN =
CC = g++
diff --git a/wmake/rules/linuxClang/c++ b/wmake/rules/linuxClang/c++
index ab4226f7a6bf5af6fde339f10c0bcefb870c85be..c3fe9e6d9c4385c61ed0a01ac40711d2cb632942 100644
--- a/wmake/rules/linuxClang/c++
+++ b/wmake/rules/linuxClang/c++
@@ -1,7 +1,6 @@
SUFFIXES += .C
-# -Woverloaded-virtual may produce spurious warnings, disable for now
-c++WARN = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast -Wnon-virtual-dtor -Wno-overloaded-virtual -Wno-unused-comparison -Wno-invalid-offsetof -Wno-c++11-extensions
+c++WARN = -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor -Wno-unused-parameter -Wno-invalid-offsetof -Wno-c++11-extensions
# Suppress CGAL warnings
c++CGALWARN = -Wno-sometimes-uninitialized -Wno-mismatched-tags
diff --git a/wmake/rules/linuxGcc/c++ b/wmake/rules/linuxGcc/c++
index b00d78f9848f52d3a3e213b6a0b1d757e8bddd2e..2ebcd45d5a1f0a96e8914295d7d258f39a0de801 100644
--- a/wmake/rules/linuxGcc/c++
+++ b/wmake/rules/linuxGcc/c++
@@ -1,9 +1,9 @@
SUFFIXES += .C
-c++WARN = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast -Wnon-virtual-dtor -Wno-invalid-offsetof
+c++WARN = -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor -Wno-unused-parameter -Wno-invalid-offsetof
# Suppress CGAL warnings
-c++CGALWARN = -Wall -Wextra -Wno-unused-parameter -Wno-old-style-cast -Wnon-virtual-dtor
+c++CGALWARN =
CC = g++ -m32
diff --git a/wmake/rules/linuxIA64Gcc/c++ b/wmake/rules/linuxIA64Gcc/c++
index 1d60843b704b94e204a517e304885cbbb283712c..df6b4d8d17a789f8a2ed1f37dbdf91646957d082 100644
--- a/wmake/rules/linuxIA64Gcc/c++
+++ b/wmake/rules/linuxIA64Gcc/c++
@@ -1,6 +1,9 @@
SUFFIXES += .C
-c++WARN = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast -Wno-invalid-offsetof
+c++WARN = -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor -Wno-unused-parameter -Wno-invalid-offsetof
+
+# Suppress CGAL warnings
+c++CGALWARN =
CC = g++
diff --git a/wmake/rules/linuxPPC64Gcc/c++ b/wmake/rules/linuxPPC64Gcc/c++
index 809364deb78056f94621efec6f987e0fe88fa618..3dadf71c0b9bd1133eae2ea46d96bc8d9761d38a 100644
--- a/wmake/rules/linuxPPC64Gcc/c++
+++ b/wmake/rules/linuxPPC64Gcc/c++
@@ -1,6 +1,9 @@
SUFFIXES += .C
-c++WARN = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast -Wno-invalid-offsetof
+c++WARN = -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor -Wno-unused-parameter -Wno-invalid-offsetof
+
+# Suppress CGAL warnings
+c++CGALWARN =
CC = g++ -m64 -mcpu=power5+
diff --git a/wmake/rules/linuxPPC64leGcc/c++ b/wmake/rules/linuxPPC64leGcc/c++
index 65a63430c38f35e038ca6c41d80ae61d23e0ac87..2e9ad46fe91f33759380daf6cc5ece800a9aed9b 100644
--- a/wmake/rules/linuxPPC64leGcc/c++
+++ b/wmake/rules/linuxPPC64leGcc/c++
@@ -1,6 +1,9 @@
SUFFIXES += .C
-c++WARN = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast
+c++WARN = -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor -Wno-unused-parameter -Wno-invalid-offsetof
+
+# Suppress CGAL warnings
+c++CGALWARN =
CC = g++ -m64 -mcpu=power8
diff --git a/wmake/rules/solaris64Gcc/c++ b/wmake/rules/solaris64Gcc/c++
index 33cdad290dea93210eb570ca96e1d53b77859d53..c156dd9e874b85425a54a339bee601beca9f9846 100644
--- a/wmake/rules/solaris64Gcc/c++
+++ b/wmake/rules/solaris64Gcc/c++
@@ -1,6 +1,9 @@
SUFFIXES += .C
-c++WARN = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast -Wno-invalid-offsetof
+c++WARN = -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor -Wno-unused-parameter -Wno-invalid-offsetof
+
+# Suppress CGAL warnings
+c++CGALWARN =
CC = g++ -m64
diff --git a/wmake/rules/solarisGcc/c++ b/wmake/rules/solarisGcc/c++
index 4cb29df20f2fd623015dff215a86768a61b58fc4..df6b4d8d17a789f8a2ed1f37dbdf91646957d082 100644
--- a/wmake/rules/solarisGcc/c++
+++ b/wmake/rules/solarisGcc/c++
@@ -1,6 +1,9 @@
SUFFIXES += .C
-c++WARN = -Wall -Wextra -Wno-unused-parameter -Wno-invalid-offsetof
+c++WARN = -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor -Wno-unused-parameter -Wno-invalid-offsetof
+
+# Suppress CGAL warnings
+c++CGALWARN =
CC = g++