zhyang-dev/OpenFOAM-12
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolved issues with virtual function inheritance and warning from clang

Browse Source 
Also removed __GNUC__ conditional compilation statements which are no
longer needed.
This commit is contained in:
Henry Weller
2015-07-17 12:11:37 +01:00
parent 8ef5d1a0ad
commit 77bf182edc
87 changed files with 428 additions and 325 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.H
View File

@ -155,6 +155,9 @@ public:
//- Return the momentum drag turbulence generation rate //- Return the momentum drag turbulence generation rate
virtual tmp<volScalarField> Gk() const = 0; virtual tmp<volScalarField> Gk() const = 0;
//- Inherit read from regIOobject
using regIOobject::read;
//- Update properties from given dictionary //- Update properties from given dictionary
virtual bool read(const dictionary& PDRProperties) = 0; virtual bool read(const dictionary& PDRProperties) = 0;

5
applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/phaseModel/phaseModel.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -211,6 +211,9 @@ public:
//- Correct the phase properties //- Correct the phase properties
void correct(); void correct();
//-Inherit read from volScalarField
using volScalarField::read;
//- Read base transportProperties dictionary //- Read base transportProperties dictionary
bool read(const dictionary& phaseDict); bool read(const dictionary& phaseDict);
}; };

5
applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/phase/phase.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -144,6 +144,9 @@ public:
//- Correct the phase properties //- Correct the phase properties
void correct(); void correct();
//-Inherit read from volScalarField
using volScalarField::read;
//- Read base transportProperties dictionary //- Read base transportProperties dictionary
bool read(const dictionary& phaseDict); bool read(const dictionary& phaseDict);
}; };

5
applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L
View File

@ -186,7 +186,6 @@ mtype {space}"MTYPE:"{space}
label curNumberOfNodes = 0; label curNumberOfNodes = 0;
label curNumberOfCells = 0; label curNumberOfCells = 0;
label curGroupID = 0; label curGroupID = 0;
label nFlagsForStream = 0;
label curBoundaryPatch = 0; label curBoundaryPatch = 0;
label curPatchFace = 0; label curPatchFace = 0;
%} %}
@ -478,7 +477,7 @@ mtype {space}"MTYPE:"{space}
IStringStream nFlagsStream(YYText()); IStringStream nFlagsStream(YYText());
nFlagsForStream = readLabel(nFlagsStream); readLabel(nFlagsStream);
BEGIN(cellStreamTitle); BEGIN(cellStreamTitle);
} }
@ -510,7 +509,6 @@ mtype {space}"MTYPE:"{space}
// reset current group ID and a number of flags // reset current group ID and a number of flags
curGroupID = 0; curGroupID = 0;
nFlagsForStream = 0;
} }
@ -522,7 +520,6 @@ mtype {space}"MTYPE:"{space}
// reset current group ID and a number of flags // reset current group ID and a number of flags
curGroupID = 0; curGroupID = 0;
nFlagsForStream = 0;
BEGIN(INITIAL); BEGIN(INITIAL);
} }

3
applications/utilities/mesh/conversion/kivaToFoam/readKivaGrid.H
View File

@ -426,7 +426,7 @@ if (pFaces[WEDGE].size() && pFaces[WEDGE][0].size())
for for
( (
; ;
iterf != pFaces[WEDGE][0].end(), iterb != pFaces[WEDGE][1].end(); iterf != pFaces[WEDGE][0].end() && iterb != pFaces[WEDGE][1].end();
++iterf, ++iterb ++iterf, ++iterb
) )
{ {
@ -585,4 +585,3 @@ Info << "Writing cell zoning info to file: " << czPath << endl;
OFstream cz(czPath); OFstream cz(czPath);
cz << cellZoning << endl; cz << cellZoning << endl;

4
applications/utilities/miscellaneous/patchSummary/patchSummaryTemplates.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -37,8 +37,6 @@ void Foam::addToFieldList
const typename GeoField::Mesh& mesh const typename GeoField::Mesh& mesh
) )
{ {
typedef GeoField fieldType;
if (obj.headerClassName() == GeoField::typeName) if (obj.headerClassName() == GeoField::typeName)
{ {
fieldList.set fieldList.set

5
src/ODE/ODESolvers/Euler/Euler.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -81,6 +81,9 @@ public:
// Member Functions // Member Functions
//- Inherit solve from ODESolver
using ODESolver::solve;
//- Solve a single step dx and return the error //- Solve a single step dx and return the error
scalar solve scalar solve
( (

5
src/ODE/ODESolvers/EulerSI/EulerSI.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -88,6 +88,9 @@ public:
// Member Functions // Member Functions
//- Inherit solve from ODESolver
using ODESolver::solve;
//- Solve a single step dx and return the error //- Solve a single step dx and return the error
scalar solve scalar solve
( (

5
src/ODE/ODESolvers/RKCK45/RKCK45.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -104,6 +104,9 @@ public:
// Member Functions // Member Functions
//- Inherit solve from ODESolver
using ODESolver::solve;
//- Solve a single step dx and return the error //- Solve a single step dx and return the error
scalar solve scalar solve
( (

5
src/ODE/ODESolvers/RKDP45/RKDP45.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -108,6 +108,9 @@ public:
// Member Functions // Member Functions
//- Inherit solve from ODESolver
using ODESolver::solve;
//- Solve a single step dx and return the error //- Solve a single step dx and return the error
scalar solve scalar solve
( (

5
src/ODE/ODESolvers/RKF45/RKF45.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -108,6 +108,9 @@ public:
// Member Functions // Member Functions
//- Inherit solve from ODESolver
using ODESolver::solve;
//- Solve a single step dx and return the error //- Solve a single step dx and return the error
scalar solve scalar solve
( (

5
src/ODE/ODESolvers/Rosenbrock12/Rosenbrock12.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -98,6 +98,9 @@ public:
// Member Functions // Member Functions
//- Inherit solve from ODESolver
using ODESolver::solve;
//- Solve a single step dx and return the error //- Solve a single step dx and return the error
scalar solve scalar solve
( (

5
src/ODE/ODESolvers/Rosenbrock23/Rosenbrock23.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2013-2014 OpenFOAM Foundation \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -102,6 +102,9 @@ public:
// Member Functions // Member Functions
//- Inherit solve from ODESolver
using ODESolver::solve;
//- Solve a single step dx and return the error //- Solve a single step dx and return the error
scalar solve scalar solve
( (

5
src/ODE/ODESolvers/Rosenbrock34/Rosenbrock34.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -110,6 +110,9 @@ public:
// Member Functions // Member Functions
//- Inherit solve from ODESolver
using ODESolver::solve;
//- Solve a single step dx and return the error //- Solve a single step dx and return the error
scalar solve scalar solve
( (

5
src/ODE/ODESolvers/Trapezoid/Trapezoid.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -71,6 +71,9 @@ public:
// Member Functions // Member Functions
//- Inherit solve from ODESolver
using ODESolver::solve;
//- Solve a single step dx and return the error //- Solve a single step dx and return the error
scalar solve scalar solve
( (

5
src/ODE/ODESolvers/rodas23/rodas23.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -102,6 +102,9 @@ public:
// Member Functions // Member Functions
//- Inherit solve from ODESolver
using ODESolver::solve;
//- Solve a single step dx and return the error //- Solve a single step dx and return the error
scalar solve scalar solve
( (

5
src/ODE/ODESolvers/rodas34/rodas34.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -103,6 +103,9 @@ public:
// Member Functions // Member Functions
//- Inherit solve from ODESolver
using ODESolver::solve;
//- Solve a single step dx and return the error //- Solve a single step dx and return the error
scalar solve scalar solve
( (

7
src/OSspecific/POSIX/signals/sigFpe.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -72,23 +72,19 @@ class sigFpe
static struct sigaction oldAction_; static struct sigaction oldAction_;
#ifdef LINUX #ifdef LINUX
//- Saved old malloc //- Saved old malloc
static void *(*oldMallocHook_)(size_t, const void *); static void *(*oldMallocHook_)(size_t, const void *);
//- NaN malloc function. From malloc_hook manpage. //- NaN malloc function. From malloc_hook manpage.
static void* nanMallocHook_(size_t size, const void *caller); static void* nanMallocHook_(size_t size, const void *caller);
#endif #endif
// Static data members // Static data members
#ifdef LINUX_GNUC #ifdef LINUX_GNUC
//- Handler for caught signals //- Handler for caught signals
static void sigHandler(int); static void sigHandler(int);
#endif #endif
@ -113,7 +109,6 @@ public:
//- Helper: fill block of data with NaN //- Helper: fill block of data with NaN
static void fillSignallingNan(UList<scalar>&); static void fillSignallingNan(UList<scalar>&);
}; };

2
src/OpenFOAM/db/IOobject/IOobject.H
View File

@ -431,9 +431,7 @@ public:
}; };
#if defined (__GNUC__)
template<> template<>
#endif
Ostream& operator<<(Ostream& os, const InfoProxy<IOobject>& ip); Ostream& operator<<(Ostream& os, const InfoProxy<IOobject>& ip);

9
src/OpenFOAM/db/IOobject/IOobjectIO.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -21,11 +21,6 @@ License
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>. 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" #include "IOobject.H"
@ -33,9 +28,7 @@ Description
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#if defined (__GNUC__)
template<> template<>
#endif
Foam::Ostream& Foam::operator<<(Ostream& os, const InfoProxy<IOobject>& ip) Foam::Ostream& Foam::operator<<(Ostream& os, const InfoProxy<IOobject>& ip)
{ {
const IOobject& io = ip.t_; const IOobject& io = ip.t_;

12
src/OpenFOAM/db/IOstreams/IOstreams/IOstream.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -227,20 +227,12 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const IOstream::versionNumber& vn)
} }
namespace Foam
{
# if defined (__GNUC__)
template<> template<>
# endif Foam::Ostream& Foam::operator<<(Ostream& os, const InfoProxy<IOstream>& ip)
Ostream& operator<<(Ostream& os, const InfoProxy<IOstream>& ip)
{ {
ip.t_.print(os); ip.t_.print(os);
return os; return os;
} }
} // end namespace
// ************************************************************************* // // ************************************************************************* //

7
src/OpenFOAM/db/IOstreams/IOstreams/IOstream.H
View File

@ -52,10 +52,6 @@ SourceFiles
#include <iostream> #include <iostream>
#if __GNUC__ < 3
# define ios_base ios
#endif
using std::ios_base; using std::ios_base;
using std::istream; using std::istream;
using std::ostream; using std::ostream;
@ -543,6 +539,9 @@ public:
Ostream& operator<<(Ostream& os, const IOstream::streamFormat& sf); Ostream& operator<<(Ostream& os, const IOstream::streamFormat& sf);
Ostream& operator<<(Ostream& os, const IOstream::versionNumber& vn); Ostream& operator<<(Ostream& os, const IOstream::versionNumber& vn);
template<>
Ostream& operator<<(Ostream& os, const InfoProxy<IOstream>& ip);
// -------------------------------------------------------------------- // --------------------------------------------------------------------
// ------ Manipulators (not taking arguments) // ------ Manipulators (not taking arguments)

6
src/OpenFOAM/db/IOstreams/StringStreams/OStringStream.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -119,11 +119,7 @@ public:
//- Rewind the OStringStream //- Rewind the OStringStream
void rewind() void rewind()
{ {
#if __GNUC__ < 4 && __GNUC_MINOR__ < 4
stdStream().rdbuf()->pubsetbuf(" ", 1);
#else
stdStream().rdbuf()->pubseekpos(0); stdStream().rdbuf()->pubseekpos(0);
#endif
} }

7
src/OpenFOAM/db/IOstreams/token/token.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -433,9 +433,12 @@ public:
Ostream& operator<<(Ostream&, const token::punctuationToken&); Ostream& operator<<(Ostream&, const token::punctuationToken&);
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 token::compound&);
ostream& operator<<(ostream&, const InfoProxy<token>&);
template<>
Ostream& operator<<(Ostream& os, const InfoProxy<token>& ip);
#define defineCompoundTypeName(Type, Name) \ #define defineCompoundTypeName(Type, Name) \
defineTemplateTypeNameAndDebugWithName(token::Compound<Type>, #Type, 0); defineTemplateTypeNameAndDebugWithName(token::Compound<Type>, #Type, 0);

17
src/OpenFOAM/db/IOstreams/token/tokenIO.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -21,9 +21,6 @@ License
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>. along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Description
Stream operators for token
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "error.H" #include "error.H"
@ -209,14 +206,8 @@ ostream& Foam::operator<<(ostream& os, const InfoProxy<token>& ip)
} }
// template specialization
namespace Foam
{
#if defined (__GNUC__)
template<> template<>
#endif Foam::Ostream& Foam::operator<<(Ostream& os, const InfoProxy<token>& ip)
Ostream& operator<<(Ostream& os, const InfoProxy<token>& ip)
{ {
const token& t = ip.t_; const token& t = ip.t_;
@ -287,8 +278,4 @@ Ostream& operator<<(Ostream& os, const InfoProxy<token>& ip)
} }
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
// ************************************************************************* // // ************************************************************************* //

7
src/OpenFOAM/db/dictionary/dictionaryEntry/dictionaryEntryIO.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -21,9 +21,6 @@ License
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>. along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Description
DictionaryEntry constructor from Istream and Ostream output operator.
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "keyType.H" #include "keyType.H"
@ -87,9 +84,7 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const dictionaryEntry& de)
} }
#if defined (__GNUC__)
template<> template<>
#endif
Foam::Ostream& Foam::operator<< Foam::Ostream& Foam::operator<<
( (
Ostream& os, Ostream& os,

7
src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -127,6 +127,9 @@ public:
// Member functions // Member functions
//- Inherit read from ITstream
using ITstream::read;
//- Return the dictionary name //- Return the dictionary name
const fileName& name() const const fileName& name() const
{ {
@ -163,7 +166,7 @@ public:
dictionary& dict(); dictionary& dict();
//- Read tokens from the given stream //- Read tokens from the given stream
bool read(const dictionary&, Istream&); virtual bool read(const dictionary&, Istream&);
//- Write //- Write
void write(Ostream&) const; void write(Ostream&) const;

8
src/OpenFOAM/db/functionObjects/IOOutputFilter/IOOutputFilter.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -119,9 +119,15 @@ public:
return IOdictionary::name(); return IOdictionary::name();
} }
//- Inherit read from OutputFilter
using OutputFilter::read;
//- Read output filter properties //- Read output filter properties
virtual bool read(); virtual bool read();
//- Inherit write from regIOobject
using regIOobject::write;
//- Sample and write //- Sample and write
virtual void write(); virtual void write();

8
src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/LduInterfaceField.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -90,6 +90,9 @@ public:
// Coupled interface functionality // Coupled interface functionality
//- Inherit initInterfaceMatrixUpdate from lduInterfaceField
using lduInterfaceField::initInterfaceMatrixUpdate;
//- Initialise neighbour matrix update //- Initialise neighbour matrix update
virtual void initInterfaceMatrixUpdate virtual void initInterfaceMatrixUpdate
( (
@ -100,6 +103,9 @@ public:
) const ) const
{} {}
//- Inherit updateInterfaceMatrix from lduInterfaceField
using lduInterfaceField::updateInterfaceMatrix;
//- Update result field based on interface functionality //- Update result field based on interface functionality
virtual void updateInterfaceMatrix virtual void updateInterfaceMatrix
( (

4
src/OpenFOAM/memory/tmp/tmp.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -38,7 +38,7 @@ SourceFiles
#include "refCount.H" #include "refCount.H"
#include <cstddef> #include <cstddef>
#if defined(__GNUC__) && !defined(__INTEL_COMPILER) #ifndef __INTEL_COMPILER
# define ConstructFromTmp # define ConstructFromTmp
#endif #endif

6
src/OpenFOAM/meshes/meshShapes/cellModel/cellModel.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -175,6 +175,10 @@ public:
}; };
template<>
Ostream& operator<<(Ostream& os, const InfoProxy<cellModel>& ip);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam } // End namespace Foam

23
src/OpenFOAM/meshes/meshShapes/cellModel/cellModelIO.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -21,10 +21,6 @@ License
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>. along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Description
Read construct cellPrimitiveModel from Istream.
Write cellPrimitiveModel to Ostream
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "cellModel.H" #include "cellModel.H"
@ -32,12 +28,7 @@ Description
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam Foam::cellModel::cellModel(Istream& is)
{
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
cellModel::cellModel(Istream& is)
{ {
dictionaryEntry entry(dictionary::null, is); dictionaryEntry entry(dictionary::null, is);
name_ = entry.keyword(); 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 os << "name" << tab << c.name_ << tab
<< "index" << tab << c.index_ << tab << "index" << tab << c.index_ << tab
@ -60,10 +51,8 @@ Ostream& operator<<(Ostream& os, const cellModel& c)
} }
#if defined (__GNUC__)
template<> template<>
#endif Foam::Ostream& Foam::operator<<(Ostream& os, const InfoProxy<cellModel>& ip)
Ostream& operator<<(Ostream& os, const InfoProxy<cellModel>& ip)
{ {
const cellModel& cm = ip.t_; const cellModel& cm = ip.t_;
@ -78,8 +67,4 @@ Ostream& operator<<(Ostream& os, const InfoProxy<cellModel>& ip)
} }
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
// ************************************************************************* // // ************************************************************************* //

6
src/OpenFOAM/meshes/meshShapes/cellShape/cellShape.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -164,6 +164,10 @@ public:
}; };
template<>
Ostream& operator<<(Ostream& os, const InfoProxy<cellShape>& ip);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam } // End namespace Foam

22
src/OpenFOAM/meshes/meshShapes/cellShape/cellShapeIO.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -21,9 +21,6 @@ License
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>. along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Description
Reads a cellShape
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "cellShape.H" #include "cellShape.H"
@ -32,12 +29,7 @@ Description
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam Foam::Istream& Foam::operator>>(Istream& is, cellShape& s)
{
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
Istream& operator>>(Istream& is, cellShape& s)
{ {
bool readEndBracket = false; 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 // Write beginning of record
os << token::BEGIN_LIST; os << token::BEGIN_LIST;
@ -121,10 +113,8 @@ Ostream& operator<<(Ostream& os, const cellShape & s)
} }
#if defined (__GNUC__)
template<> template<>
#endif Foam::Ostream& Foam::operator<<(Ostream& os, const InfoProxy<cellShape>& ip)
Ostream& operator<<(Ostream& os, const InfoProxy<cellShape>& ip)
{ {
const cellShape& cs = ip.t_; const cellShape& cs = ip.t_;
@ -148,8 +138,4 @@ Ostream& operator<<(Ostream& os, const InfoProxy<cellShape>& ip)
} }
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
// ************************************************************************* // // ************************************************************************* //

5
src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -91,6 +91,9 @@ protected:
// Protected Member Functions // Protected Member Functions
//- Inherit movePoints from primitivePatch
using primitivePatch::movePoints;
// The polyPatch geometry initialisation is called by polyBoundaryMesh // The polyPatch geometry initialisation is called by polyBoundaryMesh
friend class polyBoundaryMesh; friend class polyBoundaryMesh;

41
src/OpenFOAM/primitives/functions/DataEntry/Table/Table.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -108,42 +108,23 @@ public:
// Manipulation // Manipulation
//- Convert time //- Inherit convertTimeBase from TableBase
virtual void convertTimeBase(const Time& t) using TableBase<Type>::convertTimeBase;
{
TableBase<Type>::convertTimeBase(t);
}
// Evaluation // Evaluation
//- Return Table value //- Inherit value from TableBase
virtual Type value(const scalar x) const using TableBase<Type>::value;
{
return TableBase<Type>::value(x);
}
//- Integrate between two (scalar) values //- Inherit integrate from TableBase
virtual Type integrate(const scalar x1, const scalar x2) const using TableBase<Type>::integrate;
{
return TableBase<Type>::integrate(x1, x2);
}
//- Return dimensioned constant value //- Inherit dimValue from TableBase
virtual dimensioned<Type> dimValue(const scalar x) const using TableBase<Type>::dimValue;
{
return TableBase<Type>::dimValue(x);
}
//- Integrate between two values and return dimensioned type //- Inherit dimIntegrate from TableBase
virtual dimensioned<Type> dimIntegrate using TableBase<Type>::dimIntegrate;
(
const scalar x1,
const scalar x2
)
{
return TableBase<Type>::dimIntegrate(x1, x2);
}
// I/O // I/O

39
src/OpenFOAM/primitives/functions/DataEntry/TableFile/TableFile.H
View File

@ -126,42 +126,23 @@ public:
// Manipulation // Manipulation
//- Convert time //- Inherit convertTimeBase from TableBase
virtual void convertTimeBase(const Time& t) using TableBase<Type>::convertTimeBase;
{
TableBase<Type>::convertTimeBase(t);
}
// Evaluation // Evaluation
//- Return TableFile value //- Inherit value from TableBase
virtual Type value(const scalar x) const using TableBase<Type>::value;
{
return TableBase<Type>::value(x);
}
//- Integrate between two (scalar) values //- Inherit integrate from TableBase
virtual Type integrate(const scalar x1, const scalar x2) const using TableBase<Type>::integrate;
{
return TableBase<Type>::integrate(x1, x2);
}
//- Return dimensioned constant value //- Inherit dimValue from TableBase
virtual dimensioned<Type> dimValue(const scalar x) const using TableBase<Type>::dimValue;
{
return TableBase<Type>::dimValue(x);
}
//- Integrate between two values and return dimensioned type //- Inherit dimIntegrate from TableBase
virtual dimensioned<Type> dimIntegrate using TableBase<Type>::dimIntegrate;
(
const scalar x1,
const scalar x2
)
{
return TableBase<Type>::dimIntegrate(x1, x2);
}
// I/O // I/O

52
src/OpenFOAM/primitives/hashes/SHA1/SHA1.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -92,8 +92,7 @@ inline uint32_t Foam::SHA1::swapBytes(uint32_t n)
} }
inline void inline void Foam::SHA1::set_uint32(unsigned char *cp, uint32_t v)
Foam::SHA1::set_uint32(unsigned char *cp, uint32_t v)
{ {
memcpy(cp, &v, sizeof(uint32_t)); memcpy(cp, &v, sizeof(uint32_t));
} }
@ -101,7 +100,6 @@ Foam::SHA1::set_uint32(unsigned char *cp, uint32_t v)
// * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * // // * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * //
void Foam::SHA1::processBytes(const void *data, size_t len) void Foam::SHA1::processBytes(const void *data, size_t len)
{ {
// already finalized, thus need to restart from nothing // 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 // 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) while (len >= 64)
{ {
processBlock(memcpy(buffer_, data, 64), 64); processBlock(memcpy(buffer_, data, 64), 64);
data = reinterpret_cast<const unsigned char*>(data) + 64; data = reinterpret_cast<const unsigned char*>(data) + 64;
len -= 64; len -= 64;
} }
// }
// else
//#endif
// {
// processBlock(data, len & ~63);
// data = reinterpret_cast<const unsigned char*>(data) + (len & ~63);
// len &= 63;
// }
// }
// Move remaining bytes in internal buffer. // Move remaining bytes in internal buffer.
if (len > 0) 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. // Process LEN bytes of BUFFER, it is assumed that LEN % 64 == 0.
// Most of this code comes from GnuPG's cipher/sha1.c // Most of this code comes from GnuPG's cipher/sha1.c
void void Foam::SHA1::processBlock(const void *data, size_t len)
Foam::SHA1::processBlock(const void *data, size_t len)
{ {
const uint32_t *words = reinterpret_cast<const uint32_t*>(data); const uint32_t *words = reinterpret_cast<const uint32_t*>(data);
size_t nwords = len / sizeof(uint32_t); size_t nwords = len / sizeof(uint32_t);
@ -230,7 +210,6 @@ Foam::SHA1::processBlock(const void *data, size_t len)
^ x[(I-8) & 0x0F] ^ x[(I-3) & 0x0F] \ ^ x[(I-8) & 0x0F] ^ x[(I-3) & 0x0F] \
, (x[I & 0x0F] = rol_uint32(tm, 1)) ) , (x[I & 0x0F] = rol_uint32(tm, 1)) )
#define R(A,B,C,D,E,F,K,M) \ #define R(A,B,C,D,E,F,K,M) \
do \ do \
{ \ { \
@ -357,19 +336,8 @@ void Foam::SHA1::calcDigest(SHA1Digest& dig) const
} }
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * //
// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * //
void Foam::SHA1::clear() void Foam::SHA1::clear()
{ {
hashsumA_ = 0x67452301; 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);
// }
// }
// ************************************************************************* // // ************************************************************************* //

4
src/Pstream/mpi/UPstream.C
View File

@ -304,9 +304,9 @@ void Foam::UPstream::allocatePstreamCommunicator
if (index == PstreamGlobals::MPIGroups_.size()) if (index == PstreamGlobals::MPIGroups_.size())
{ {
// Extend storage with dummy values // Extend storage with dummy values
MPI_Group newGroup; MPI_Group newGroup = MPI_GROUP_NULL;
PstreamGlobals::MPIGroups_.append(newGroup); PstreamGlobals::MPIGroups_.append(newGroup);
MPI_Comm newComm; MPI_Comm newComm = MPI_COMM_NULL;
PstreamGlobals::MPICommunicators_.append(newComm); PstreamGlobals::MPICommunicators_.append(newComm);
} }
else if (index > PstreamGlobals::MPIGroups_.size()) else if (index > PstreamGlobals::MPIGroups_.size())

2
src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonLowReWallFunction/epsilonLowReWallFunctionFvPatchScalarField.C
View File

@ -77,8 +77,6 @@ void Foam::epsilonLowReWallFunctionFvPatchScalarField::calculate
const scalarField magGradUw(mag(Uw.snGrad())); const scalarField magGradUw(mag(Uw.snGrad()));
typedef DimensionedField<scalar, volMesh> FieldType;
const DimensionedField<scalar, volMesh>& G = const DimensionedField<scalar, volMesh>& G =
db().lookupObject<DimensionedField<scalar, volMesh> > db().lookupObject<DimensionedField<scalar, volMesh> >
( (

10
src/conversion/ensight/file/ensightFile.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License 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) Foam::Ostream& Foam::ensightFile::write(const string& value)
{ {
char buf[80]; char buf[80];
@ -270,7 +276,7 @@ Foam::Ostream& Foam::ensightFile::writeKeyword(const string& key)
{ {
if (allowUndef_) if (allowUndef_)
{ {
write(key + " undef"); write(string(key + " undef"));
newline(); newline();
write(undefValue_); write(undefValue_);
newline(); newline();

6
src/conversion/ensight/file/ensightFile.H
View File

@ -120,6 +120,9 @@ public:
// Output // Output
//- Inherit write from Ostream
using Ostream::write;
//- Binary write //- Binary write
virtual Ostream& write(const char* buf, std::streamsize count); virtual Ostream& write(const char* buf, std::streamsize count);
@ -132,6 +135,9 @@ public:
//- Write undef value //- Write undef value
Ostream& writeUndef(); Ostream& writeUndef();
//- Write C-string as "%80s" or as binary
Ostream& write(const char* value);
//- Write string as "%80s" or as binary //- Write string as "%80s" or as binary
Ostream& write(const string& value); Ostream& write(const string& value);

5
src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModel.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2012-2014 OpenFOAM Foundation \\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -261,6 +261,9 @@ public:
//- Write //- Write
virtual bool writeData(Ostream& os) const; virtual bool writeData(Ostream& os) const;
//- Inherit read from regIOobject
using regIOobject::read;
//- Read porosity dictionary //- Read porosity dictionary
virtual bool read(const dictionary& dict); virtual bool read(const dictionary& dict);
}; };

6
src/finiteVolume/cfdTools/general/solutionControl/solutionControl/solutionControl.C
View File

@ -133,6 +133,12 @@ void Foam::solutionControl::read(const bool absTolOnly)
} }
void Foam::solutionControl::read()
{
read(false);
}
Foam::label Foam::solutionControl::applyToField Foam::label Foam::solutionControl::applyToField
( (
const word& fieldName, const word& fieldName,

3
src/finiteVolume/cfdTools/general/solutionControl/solutionControl/solutionControl.H
View File

@ -102,6 +102,9 @@ protected:
//- Read controls from fvSolution dictionary //- Read controls from fvSolution dictionary
virtual void read(const bool absTolOnly); virtual void read(const bool absTolOnly);
//- Read controls from fvSolution dictionary
virtual void read();
//- Return index of field in residualControl_ if present //- Return index of field in residualControl_ if present
virtual label applyToField virtual label applyToField
( (

5
src/finiteVolume/fields/fvPatchFields/derived/totalPressure/totalPressureFvPatchScalarField.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -333,6 +333,9 @@ public:
// Evaluation functions // Evaluation functions
//- Inherit updateCoeffs from fixedValueFvPatchScalarField
using fixedValueFvPatchScalarField::updateCoeffs;
//- Update the coefficients associated with the patch field //- Update the coefficients associated with the patch field
// using the given patch total pressure and velocity fields // using the given patch total pressure and velocity fields
virtual void updateCoeffs virtual void updateCoeffs

5
src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -214,6 +214,9 @@ public:
// Evaluation functions // Evaluation functions
//- Inherit updateCoeffs from fixedValueFvPatchScalarField
using fixedValueFvPatchScalarField::updateCoeffs;
//- Update the coefficients associated with the patch field //- Update the coefficients associated with the patch field
// using the given patch velocity field // using the given patch velocity field
virtual void updateCoeffs(const vectorField& Up); virtual void updateCoeffs(const vectorField& Up);

4
src/finiteVolume/fields/fvsPatchFields/constraint/empty/emptyFvsPatchField.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -134,7 +134,7 @@ public:
//- Reverse map the given fvsPatchField onto this fvsPatchField //- Reverse map the given fvsPatchField onto this fvsPatchField
virtual void rmap virtual void rmap
( (
const fvPatchField<Type>&, const fvsPatchField<Type>&,
const labelList& const labelList&
) )
{} {}

5
src/finiteVolume/fvMesh/fvPatches/basic/coupled/coupledFvPatch.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -128,6 +128,9 @@ public:
const labelUList& internalData const labelUList& internalData
) const = 0; ) const = 0;
//- Inherit initInternalFieldTransfer from lduInterface
using lduInterface::initInternalFieldTransfer;
//- Initialise neighbour field transfer //- Initialise neighbour field transfer
virtual void initInternalFieldTransfer virtual void initInternalFieldTransfer
( (

5
src/finiteVolume/fvMesh/fvPatches/constraint/processor/processorFvPatch.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -157,6 +157,9 @@ public:
const labelUList& internalData const labelUList& internalData
) const; ) const;
//- Inherit initInternalFieldTransfer from coupledFvPatch
using coupledFvPatch::initInternalFieldTransfer;
//- Initialise neighbour field transfer //- Initialise neighbour field transfer
virtual void initInternalFieldTransfer virtual void initInternalFieldTransfer
( (

5
src/finiteVolume/fvMesh/fvPatches/derived/regionCoupled/regionCoupledFvPatch.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -132,6 +132,9 @@ public:
const labelUList& internalData const labelUList& internalData
) const; ) const;
//- Inherit initInternalFieldTransfer from lduInterface
using lduInterface::initInternalFieldTransfer;
//- Initialise neighbour field transfer //- Initialise neighbour field transfer
virtual void initInternalFieldTransfer virtual void initInternalFieldTransfer
( (

5
src/finiteVolume/fvMesh/fvPatches/derived/regionCoupled/regionCoupledWallFvPatch.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -136,6 +136,9 @@ public:
const labelUList& internalData const labelUList& internalData
) const; ) const;
//- Inherit initInternalFieldTransfer from lduInterface
using lduInterface::initInternalFieldTransfer;
//- Initialise neighbour field transfer //- Initialise neighbour field transfer
virtual void initInternalFieldTransfer virtual void initInternalFieldTransfer
( (

5
src/finiteVolume/interpolation/interpolation/interpolationPointMVC/interpolationPointMVC.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -75,6 +75,9 @@ public:
// Member Functions // Member Functions
//- Inherit interpolate from interpolation
using interpolation<Type>::interpolate;
//- Interpolate field for the given cellPointWeight //- Interpolate field for the given cellPointWeight
inline Type interpolate(const pointMVCWeight& cpw) const; inline Type interpolate(const pointMVCWeight& cpw) const;

3
src/fvOptions/fvOption/fvIOoptionList.H
View File

@ -84,6 +84,9 @@ public:
// Member Functions // Member Functions
//- Inherit read from optionList
using optionList::read;
//- Read dictionary //- Read dictionary
virtual bool read(); virtual bool read();
}; };

3
src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModel.H
View File

@ -90,6 +90,9 @@ protected:
//- Set the neighbour interRegionHeatTransferModel //- Set the neighbour interRegionHeatTransferModel
void setNbrModel(); void setNbrModel();
//- Inherit correct from interRegionOption
using interRegionOption::correct;
//- Correct to calculate the inter-region heat transfer coefficient //- Correct to calculate the inter-region heat transfer coefficient
void correct(); void correct();

6
src/lagrangian/basic/IOPosition/IOPosition.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -66,7 +66,6 @@ public:
virtual const word& type() const virtual const word& type() const
{ {
return Cloud<typename CloudType::particleType>::typeName; return Cloud<typename CloudType::particleType>::typeName;
//cloud_.type();
} }
@ -78,6 +77,9 @@ public:
// Member functions // Member functions
//- Inherit readData from regIOobject
using regIOobject::readData;
virtual void readData(CloudType& c, bool checkClass); virtual void readData(CloudType& c, bool checkClass);
virtual bool write() const; virtual bool write() const;

3
src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudFunctionObject/CloudFunctionObject.H
View File

@ -66,6 +66,9 @@ class CloudFunctionObject
// Private Member Functions // Private Member Functions
//- Inherite write from CloudSubModelBase
using CloudSubModelBase<CloudType>::write;
//- Write post-processing info //- Write post-processing info
virtual void write(); virtual void write();

8
src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -122,6 +122,9 @@ public:
// Member Functions // Member Functions
//- Inherit updateMesh from patchInjectionBase
using patchInjectionBase::updateMesh;
//- Set injector locations when mesh is updated //- Set injector locations when mesh is updated
virtual void updateMesh(); virtual void updateMesh();
@ -140,6 +143,9 @@ public:
// Injection geometry // Injection geometry
//- Inherit setPositionAndCell from patchInjectionBase
using patchInjectionBase::setPositionAndCell;
//- Set the injection position and owner cell, tetFace and tetPt //- Set the injection position and owner cell, tetFace and tetPt
virtual void setPositionAndCell virtual void setPositionAndCell
( (

8
src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -119,6 +119,9 @@ public:
// Member Functions // Member Functions
//- Inherit updateMesh from patchInjectionBase
using patchInjectionBase::updateMesh;
//- Set injector locations when mesh is updated //- Set injector locations when mesh is updated
virtual void updateMesh(); virtual void updateMesh();
@ -134,6 +137,9 @@ public:
// Injection geometry // Injection geometry
//- Inherit setPositionAndCell from patchInjectionBase
using patchInjectionBase::setPositionAndCell;
//- Set the injection position and owner cell, tetFace and tetPt //- Set the injection position and owner cell, tetFace and tetPt
virtual void setPositionAndCell virtual void setPositionAndCell
( (

14
src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/NoSurfaceFilm/NoSurfaceFilm.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -82,17 +82,13 @@ void Foam::NoSurfaceFilm<CloudType>::setParcelProperties
( (
parcelType&, parcelType&,
const label const label
) ) const
{ {}
// do nothing
}
template<class CloudType> template<class CloudType>
void Foam::NoSurfaceFilm<CloudType>::info(Ostream&) const void Foam::NoSurfaceFilm<CloudType>::info(Ostream&)
{ {}
// do nothing
}
// ************************************************************************* // // ************************************************************************* //

6
src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/NoSurfaceFilm/NoSurfaceFilm.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -108,13 +108,13 @@ public:
( (
parcelType& p, parcelType& p,
const label filmCellI const label filmCellI
); ) const;
// I-O // I-O
//- Write surface film info to stream //- Write surface film info to stream
virtual void info(Ostream& os) const; virtual void info(Ostream& os);
}; };

6
src/meshTools/coordinateSystems/coordinateSystems.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License 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; os << nl << size() << nl << token::BEGIN_LIST;
forAll(*this, i) forAll(*this, i)
{ {
os << nl; os << nl;
operator[](i).writeDict(os, subDict); operator[](i).writeDict(os, true);
} }
os << token::END_LIST << nl; os << token::END_LIST << nl;

2
src/meshTools/coordinateSystems/coordinateSystems.H
View File

@ -133,7 +133,7 @@ public:
wordList toc() const; wordList toc() const;
//- Write data //- Write data
bool writeData(Ostream&, bool subDict=true) const; bool writeData(Ostream&) const;
}; };

5
src/meshTools/searchableSurface/searchableBox.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -71,6 +71,9 @@ private:
pointIndexHit& info pointIndexHit& info
) const; ) const;
//- Inherit findNearest from searchableSurface
using searchableSurface::findNearest;
//- Returns miss or hit with face (0..5) //- Returns miss or hit with face (0..5)
pointIndexHit findNearest pointIndexHit findNearest
( (

3
src/meshTools/searchableSurface/searchableCylinder.H
View File

@ -78,6 +78,9 @@ private:
// Private Member Functions // Private Member Functions
//- Inherit findNearest from searchableSurface
using searchableSurface::findNearest;
//- Find nearest point on cylinder. //- Find nearest point on cylinder.
pointIndexHit findNearest pointIndexHit findNearest
( (

5
src/meshTools/searchableSurface/searchableDisk.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2014 OpenFOAM Foundation \\ / A nd | Copyright (C) 2014-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -71,6 +71,9 @@ private:
// Private Member Functions // Private Member Functions
//- Inherit findNearest from searchableSurface
using searchableSurface::findNearest;
//- Find nearest point on disk //- Find nearest point on disk
pointIndexHit findNearest pointIndexHit findNearest
( (

5
src/meshTools/searchableSurface/searchablePlate.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -80,6 +80,9 @@ private:
//- Calculate normal direction from span //- Calculate normal direction from span
static direction calcNormal(const point&); static direction calcNormal(const point&);
//- Inherit findNearest from searchableSurface
using searchableSurface::findNearest;
pointIndexHit findNearest pointIndexHit findNearest
( (
const point& sample, const point& sample,

5
src/meshTools/searchableSurface/searchableSphere.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -69,6 +69,9 @@ private:
// Private Member Functions // Private Member Functions
//- Inherit findNearest from searchableSurface
using searchableSurface::findNearest;
//- Find nearest point on sphere. //- Find nearest point on sphere.
pointIndexHit findNearest pointIndexHit findNearest
( (

3
src/meshTools/searchableSurface/searchableSurfaceCollection.H
View File

@ -88,6 +88,9 @@ private:
// Private Member Functions // Private Member Functions
//- Inherit findNearest from searchableSurface
using searchableSurface::findNearest;
//- Find point nearest to sample. Updates minDistSqr. Sets nearestInfo //- Find point nearest to sample. Updates minDistSqr. Sets nearestInfo
// and surface index // and surface index
void findNearest void findNearest

5
src/parallel/decompose/decompositionMethods/multiLevelDecomp/multiLevelDecomp.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -111,6 +111,9 @@ public:
// proc boundaries) // proc boundaries)
virtual bool parallelAware() const; virtual bool parallelAware() const;
//- Inherit decompose from decompositionMethod
using decompositionMethod::decompose;
//- Return for every coordinate the wanted processor number. Use the //- Return for every coordinate the wanted processor number. Use the
// mesh connectivity (if needed) // mesh connectivity (if needed)
virtual labelList decompose virtual labelList decompose

5
src/parallel/decompose/metisDecomp/metisDecomp.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -89,6 +89,9 @@ public:
return false; return false;
} }
//- Inherit decompose from decompositionMethod
using decompositionMethod::decompose;
//- Return for every coordinate the wanted processor number. Use the //- Return for every coordinate the wanted processor number. Use the
// mesh connectivity (if needed) // mesh connectivity (if needed)
// Weights get normalised so the minimum value is 1 before truncation // Weights get normalised so the minimum value is 1 before truncation

5
src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -112,6 +112,9 @@ public:
return true; return true;
} }
//- Inherit decompose from decompositionMethod
using decompositionMethod::decompose;
//- Return for every coordinate the wanted processor number. Use the //- Return for every coordinate the wanted processor number. Use the
// mesh connectivity (if needed). See note on weights in scotchDecomp.H // mesh connectivity (if needed). See note on weights in scotchDecomp.H
virtual labelList decompose virtual labelList decompose

5
src/parallel/decompose/scotchDecomp/scotchDecomp.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -105,6 +105,9 @@ public:
return true; return true;
} }
//- Inherit decompose from decompositionMethod
using decompositionMethod::decompose;
//- Return for every coordinate the wanted processor number. Use the //- Return for every coordinate the wanted processor number. Use the
// mesh connectivity (if needed) // mesh connectivity (if needed)
// Weights get normalised with minimum weight and truncated to // Weights get normalised with minimum weight and truncated to

5
src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -316,6 +316,9 @@ public:
const labelHashSet& include const labelHashSet& include
) const; ) const;
//- Inherit reset from MeshedSurface<Face>
using MeshedSurface<Face>::reset;
//- Transfer components (points, faces, zone ids). //- Transfer components (points, faces, zone ids).
virtual void reset virtual void reset
( (

5
src/surfMesh/surfaceFormats/obj/OBJstream.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2012-2014 OpenFOAM Foundation \\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -101,6 +101,9 @@ public:
// Ostream implementation // Ostream implementation
//- Inherit write from Ostream
using Ostream::write;
//- Write character //- Write character
virtual Ostream& write(const char); virtual Ostream& write(const char);

54
src/thermophysicalModels/basic/heThermo/heThermo.C
View File

@ -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> template<class BasicThermo, class MixtureType>
bool Foam::heThermo<BasicThermo, MixtureType>::read() bool Foam::heThermo<BasicThermo, MixtureType>::read()
{ {

28
src/thermophysicalModels/basic/heThermo/heThermo.H
View File

@ -292,6 +292,34 @@ public:
) const; ) 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 //- Read thermophysical properties dictionary
virtual bool read(); virtual bool read();
}; };

3
wmake/rules/linux64Clang/c++
View File

@ -1,7 +1,6 @@
SUFFIXES += .C SUFFIXES += .C
# -Woverloaded-virtual may produce spurious warnings, disable for now c++WARN = -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor -Wno-unused-parameter -Wno-invalid-offsetof -Wno-c++11-extensions
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
# Suppress CGAL warnings # Suppress CGAL warnings
c++CGALWARN = -Wno-sometimes-uninitialized -Wno-mismatched-tags c++CGALWARN = -Wno-sometimes-uninitialized -Wno-mismatched-tags

4
wmake/rules/linux64Gcc/c++
View File

@ -1,9 +1,9 @@
SUFFIXES += .C 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 # Suppress CGAL warnings
c++CGALWARN = -Wall -Wextra -Wno-unused-parameter -Wno-old-style-cast -Wnon-virtual-dtor c++CGALWARN =
CC = g++ -m64 CC = g++ -m64

5
wmake/rules/linuxARM7Gcc/c++
View File

@ -1,6 +1,9 @@
SUFFIXES += .C 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++ CC = g++

3
wmake/rules/linuxClang/c++
View File

@ -1,7 +1,6 @@
SUFFIXES += .C SUFFIXES += .C
# -Woverloaded-virtual may produce spurious warnings, disable for now c++WARN = -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor -Wno-unused-parameter -Wno-invalid-offsetof -Wno-c++11-extensions
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
# Suppress CGAL warnings # Suppress CGAL warnings
c++CGALWARN = -Wno-sometimes-uninitialized -Wno-mismatched-tags c++CGALWARN = -Wno-sometimes-uninitialized -Wno-mismatched-tags

4
wmake/rules/linuxGcc/c++
View File

@ -1,9 +1,9 @@
SUFFIXES += .C 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 # Suppress CGAL warnings
c++CGALWARN = -Wall -Wextra -Wno-unused-parameter -Wno-old-style-cast -Wnon-virtual-dtor c++CGALWARN =
CC = g++ -m32 CC = g++ -m32

5
wmake/rules/linuxIA64Gcc/c++
View File

@ -1,6 +1,9 @@
SUFFIXES += .C 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++ CC = g++

5
wmake/rules/linuxPPC64Gcc/c++
View File

@ -1,6 +1,9 @@
SUFFIXES += .C 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+ CC = g++ -m64 -mcpu=power5+

5
wmake/rules/linuxPPC64leGcc/c++
View File

@ -1,6 +1,9 @@
SUFFIXES += .C 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 CC = g++ -m64 -mcpu=power8

5
wmake/rules/solaris64Gcc/c++
View File

@ -1,6 +1,9 @@
SUFFIXES += .C 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 CC = g++ -m64

5
wmake/rules/solarisGcc/c++
View File

@ -1,6 +1,9 @@
SUFFIXES += .C 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++ CC = g++