zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

BUG: Corrections identified after testing gcc 4.7

Browse Source
This commit is contained in:
andy
2012-05-01 10:26:23 +01:00
parent fbb477070a
commit b65c84bb22
9 changed files with 22 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
View File

@ -70,8 +70,7 @@ void Foam::KinematicCloud<CloudType>::setModels()
SurfaceFilmModel<KinematicCloud<CloudType> >::New SurfaceFilmModel<KinematicCloud<CloudType> >::New
( (
subModelProperties_, subModelProperties_,
*this, *this
g_
).ptr() ).ptr()
); );

4
src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/CellZoneInjection/CellZoneInjection.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-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -62,7 +62,7 @@ class CellZoneInjection
// Private data // Private data
//- Name of cell zone //- Name of cell zone
const word& cellZoneName_; const word cellZoneName_;
//- Number density //- Number density
const scalar numberDensity_; const scalar numberDensity_;

5
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 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -32,8 +32,7 @@ template<class CloudType>
Foam::NoSurfaceFilm<CloudType>::NoSurfaceFilm Foam::NoSurfaceFilm<CloudType>::NoSurfaceFilm
( (
const dictionary&, const dictionary&,
CloudType& owner, CloudType& owner
const dimensionedVector&
) )
: :
SurfaceFilmModel<CloudType>(owner) SurfaceFilmModel<CloudType>(owner)

4
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 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -68,7 +68,7 @@ public:
// Constructors // Constructors
//- Construct from dictionary //- Construct from dictionary
NoSurfaceFilm(const dictionary&, CloudType&, const dimensionedVector&); NoSurfaceFilm(const dictionary&, CloudType&);
//- Construct copy //- Construct copy
NoSurfaceFilm(const NoSurfaceFilm<CloudType>& dm); NoSurfaceFilm(const NoSurfaceFilm<CloudType>& dm);

7
src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.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-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -36,7 +36,7 @@ template<class CloudType>
Foam::SurfaceFilmModel<CloudType>::SurfaceFilmModel(CloudType& owner) Foam::SurfaceFilmModel<CloudType>::SurfaceFilmModel(CloudType& owner)
: :
SubModelBase<CloudType>(owner), SubModelBase<CloudType>(owner),
g_(dimensionedVector("zero", dimAcceleration, vector::zero)), g_(owner.g()),
ejectedParcelType_(0), ejectedParcelType_(0),
massParcelPatch_(0), massParcelPatch_(0),
diameterParcelPatch_(0), diameterParcelPatch_(0),
@ -53,12 +53,11 @@ Foam::SurfaceFilmModel<CloudType>::SurfaceFilmModel
( (
const dictionary& dict, const dictionary& dict,
CloudType& owner, CloudType& owner,
const dimensionedVector& g,
const word& type const word& type
) )
: :
SubModelBase<CloudType>(owner, dict, typeName, type), SubModelBase<CloudType>(owner, dict, typeName, type),
g_(g), g_(owner.g()),
ejectedParcelType_ ejectedParcelType_
( (
this->coeffDict().lookupOrDefault("ejectedParcelType", -1) this->coeffDict().lookupOrDefault("ejectedParcelType", -1)

11
src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.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-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -140,10 +140,9 @@ public:
dictionary, dictionary,
( (
const dictionary& dict, const dictionary& dict,
CloudType& owner, CloudType& owner
const dimensionedVector& g
), ),
(dict, owner, g) (dict, owner)
); );
@ -157,7 +156,6 @@ public:
( (
const dictionary& dict, const dictionary& dict,
CloudType& owner, CloudType& owner,
const dimensionedVector& g,
const word& type const word& type
); );
@ -182,8 +180,7 @@ public:
static autoPtr<SurfaceFilmModel<CloudType> > New static autoPtr<SurfaceFilmModel<CloudType> > New
( (
const dictionary& dict, const dictionary& dict,
CloudType& owner, CloudType& owner
const dimensionedVector& g
); );

7
src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModelNew.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-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -32,8 +32,7 @@ Foam::autoPtr<Foam::SurfaceFilmModel<CloudType> >
Foam::SurfaceFilmModel<CloudType>::New Foam::SurfaceFilmModel<CloudType>::New
( (
const dictionary& dict, const dictionary& dict,
CloudType& owner, CloudType& owner
const dimensionedVector& g
) )
{ {
const word modelType(dict.lookup("surfaceFilmModel")); const word modelType(dict.lookup("surfaceFilmModel"));
@ -59,7 +58,7 @@ Foam::SurfaceFilmModel<CloudType>::New
<< exit(FatalError); << exit(FatalError);
} }
return autoPtr<SurfaceFilmModel<CloudType> >(cstrIter()(dict, owner, g)); return autoPtr<SurfaceFilmModel<CloudType> >(cstrIter()(dict, owner));
} }

7
src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.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-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -487,11 +487,10 @@ template<class CloudType>
Foam::ThermoSurfaceFilm<CloudType>::ThermoSurfaceFilm Foam::ThermoSurfaceFilm<CloudType>::ThermoSurfaceFilm
( (
const dictionary& dict, const dictionary& dict,
CloudType& owner, CloudType& owner
const dimensionedVector& g
) )
: :
SurfaceFilmModel<CloudType>(dict, owner, g, typeName), SurfaceFilmModel<CloudType>(dict, owner, typeName),
rndGen_(owner.rndGen()), rndGen_(owner.rndGen()),
thermo_ thermo_
( (

9
src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.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-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -248,12 +248,7 @@ public:
// Constructors // Constructors
//- Construct from components //- Construct from components
ThermoSurfaceFilm ThermoSurfaceFilm(const dictionary& dict, CloudType& owner);
(
const dictionary& dict,
CloudType& owner,
const dimensionedVector& g
);
//- Construct copy //- Construct copy
ThermoSurfaceFilm(const ThermoSurfaceFilm<CloudType>& sfm); ThermoSurfaceFilm(const ThermoSurfaceFilm<CloudType>& sfm);