mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-12-28 03:37:59 +00:00
Update code to use the simpler C++11 template syntax removing spaces between closing ">"s
This commit is contained in:
@ -2,7 +2,7 @@
|
||||
========= |
|
||||
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
\\ / O peration |
|
||||
\\ / A nd | Copyright (C) 2014-2015 OpenFOAM Foundation
|
||||
\\ / A nd | Copyright (C) 2014-2016 OpenFOAM Foundation
|
||||
\\/ M anipulation |
|
||||
-------------------------------------------------------------------------------
|
||||
License
|
||||
@ -251,7 +251,7 @@ Foam::BlendedInterfacialModel<modelType>::Kf() const
|
||||
|
||||
template<class modelType>
|
||||
template<class Type>
|
||||
Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh> >
|
||||
Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh>>
|
||||
Foam::BlendedInterfacialModel<modelType>::F() const
|
||||
{
|
||||
tmp<volScalarField> f1, f2;
|
||||
@ -266,7 +266,7 @@ Foam::BlendedInterfacialModel<modelType>::F() const
|
||||
f2 = blending_.f2(pair1In2_.dispersed(), pair2In1_.dispersed());
|
||||
}
|
||||
|
||||
tmp<GeometricField<Type, fvPatchField, volMesh> > x
|
||||
tmp<GeometricField<Type, fvPatchField, volMesh>> x
|
||||
(
|
||||
new GeometricField<Type, fvPatchField, volMesh>
|
||||
(
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
========= |
|
||||
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
\\ / O peration |
|
||||
\\ / A nd | Copyright (C) 2014-2015 OpenFOAM Foundation
|
||||
\\ / A nd | Copyright (C) 2014-2016 OpenFOAM Foundation
|
||||
\\/ M anipulation |
|
||||
-------------------------------------------------------------------------------
|
||||
License
|
||||
@ -128,7 +128,7 @@ public:
|
||||
|
||||
//- Return the blended force
|
||||
template<class Type>
|
||||
tmp<GeometricField<Type, fvPatchField, volMesh> > F() const;
|
||||
tmp<GeometricField<Type, fvPatchField, volMesh>> F() const;
|
||||
|
||||
//- Return the face blended force
|
||||
tmp<surfaceScalarField> Ff() const;
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
========= |
|
||||
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
\\ / O peration |
|
||||
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
|
||||
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
|
||||
\\/ M anipulation |
|
||||
-------------------------------------------------------------------------------
|
||||
License
|
||||
@ -97,7 +97,7 @@ class phaseModel
|
||||
autoPtr<diameterModel> dPtr_;
|
||||
|
||||
//- Turbulence model
|
||||
autoPtr<PhaseCompressibleTurbulenceModel<phaseModel> > turbulence_;
|
||||
autoPtr<PhaseCompressibleTurbulenceModel<phaseModel>> turbulence_;
|
||||
|
||||
|
||||
public:
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
========= |
|
||||
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
\\ / O peration |
|
||||
\\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
|
||||
\\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation
|
||||
\\/ M anipulation |
|
||||
-------------------------------------------------------------------------------
|
||||
License
|
||||
@ -97,23 +97,23 @@ class twoPhaseSystem
|
||||
HashTable<autoPtr<blendingMethod>, word, word::hash> blendingMethods_;
|
||||
|
||||
//- Drag model
|
||||
autoPtr<BlendedInterfacialModel<dragModel> > drag_;
|
||||
autoPtr<BlendedInterfacialModel<dragModel>> drag_;
|
||||
|
||||
//- Virtual mass model
|
||||
autoPtr<BlendedInterfacialModel<virtualMassModel> > virtualMass_;
|
||||
autoPtr<BlendedInterfacialModel<virtualMassModel>> virtualMass_;
|
||||
|
||||
//- Heat transfer model
|
||||
autoPtr<BlendedInterfacialModel<heatTransferModel> > heatTransfer_;
|
||||
autoPtr<BlendedInterfacialModel<heatTransferModel>> heatTransfer_;
|
||||
|
||||
//- Lift model
|
||||
autoPtr<BlendedInterfacialModel<liftModel> > lift_;
|
||||
autoPtr<BlendedInterfacialModel<liftModel>> lift_;
|
||||
|
||||
//- Wall lubrication model
|
||||
autoPtr<BlendedInterfacialModel<wallLubricationModel> >
|
||||
autoPtr<BlendedInterfacialModel<wallLubricationModel>>
|
||||
wallLubrication_;
|
||||
|
||||
//- Wall lubrication model
|
||||
autoPtr<BlendedInterfacialModel<turbulentDispersionModel> >
|
||||
autoPtr<BlendedInterfacialModel<turbulentDispersionModel>>
|
||||
turbulentDispersion_;
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user