GIT: Initial commit after latest foundation merge

This commit is contained in:
andy
2016-04-25 11:40:48 +01:00
4003 changed files with 74634 additions and 37783 deletions

View File

@ -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 | Copyright (C) 2015 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
@ -208,9 +208,9 @@ Foam::forceCoeffs::forceCoeffs
)
:
forces(name, obr, dict, loadFromFiles, false),
liftDir_(vector::zero),
dragDir_(vector::zero),
pitchAxis_(vector::zero),
liftDir_(Zero),
dragDir_(Zero),
pitchAxis_(Zero),
magUInf_(0.0),
lRef_(0.0),
Aref_(0.0),

View File

@ -2,8 +2,8 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2015-2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -288,13 +288,13 @@ void Foam::forces::initialiseBins()
void Foam::forces::resetFields()
{
force_[0] = vector::zero;
force_[1] = vector::zero;
force_[2] = vector::zero;
force_[0] = Zero;
force_[1] = Zero;
force_[2] = Zero;
moment_[0] = vector::zero;
moment_[1] = vector::zero;
moment_[2] = vector::zero;
moment_[0] = Zero;
moment_[1] = Zero;
moment_[2] = Zero;
if (writeFields_)
{
@ -717,8 +717,8 @@ void Foam::forces::writeBins()
if (localSystem_)
{
List<Field<vector> > lf(3);
List<Field<vector> > lm(3);
List<Field<vector>> lf(3);
List<Field<vector>> lm(3);
lf[0] = coordSys_.localVector(force_[0]);
lf[1] = coordSys_.localVector(force_[1]);
lf[2] = coordSys_.localVector(force_[2]);
@ -769,7 +769,7 @@ Foam::forces::forces
localSystem_(false),
porosity_(false),
nBin_(1),
binDir_(vector::zero),
binDir_(Zero),
binDx_(0.0),
binMin_(GREAT),
binPoints_(),
@ -828,7 +828,7 @@ Foam::forces::forces
localSystem_(false),
porosity_(false),
nBin_(1),
binDir_(vector::zero),
binDir_(Zero),
binDx_(0.0),
binMin_(GREAT),
binPoints_(),
@ -1110,7 +1110,7 @@ void Foam::forces::calcForcesMoment()
vectorField fT(sA*fD.boundaryField()[patchI] - fN);
//- Porous force
vectorField fP(Md.size(), vector::zero);
vectorField fP(Md.size(), Zero);
addToFields(patchI, Md, fN, fT, fP);
@ -1150,7 +1150,7 @@ void Foam::forces::calcForcesMoment()
vectorField fT(Sfb[patchI] & devRhoReffb[patchI]);
vectorField fP(Md.size(), vector::zero);
vectorField fP(Md.size(), Zero);
addToFields(patchI, Md, fN, fT, fP);
@ -1195,7 +1195,7 @@ void Foam::forces::calcForcesMoment()
const vectorField fP(fPTot, cZone);
const vectorField Md(d - coordSys_.origin());
const vectorField fDummy(Md.size(), vector::zero);
const vectorField fDummy(Md.size(), Zero);
addToFields(cZone, Md, fDummy, fDummy, fP);

View File

@ -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 | Copyright (C) 2015 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
@ -173,10 +173,10 @@ protected:
Switch log_;
//- Pressure, viscous and porous force per bin
List<Field<vector> > force_;
List<Field<vector>> force_;
//- Pressure, viscous and porous moment per bin
List<Field<vector> > moment_;
List<Field<vector>> moment_;
// File streams