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

ENH: Consistency updates after Foundation merge and code tidying

Browse Source
This commit is contained in:
Andrew Heather
2016-04-25 16:46:56 +01:00
parent d3157ac905
commit b9313ef2fe
242 changed files with 923 additions and 1080 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
applications/solvers/combustion/XiFoam/XiDyMFoam/pEqn.H
View File

@ -2,9 +2,7 @@ rho = thermo.rho();
volScalarField rAU(1.0/UEqn.A());
surfaceScalarField rhorAUf("rhorAUf", fvc::interpolate(rho*rAU));
volVectorField HbyA("HbyA", U);
HbyA = rAU*UEqn.H();
volVectorField HbyA(constrainHbyA(rAU*UEqn.H(), U, p));
if (pimple.transonic())
{
@ -54,6 +52,9 @@ else
fvc::makeRelative(phiHbyA, rho, U);
MRF.makeRelative(phiHbyA);
// Update the pressure BCs to ensure flux consistency
constrainPressure(p, rho, U, phiHbyA, rhorAUf, MRF);
while (pimple.correctNonOrthogonal())
{
fvScalarMatrix pEqn

2
applications/solvers/heatTransfer/thermoFoam/setAlphaEff.H
View File

@ -27,7 +27,7 @@
IOobject::MUST_READ
);
if (turbulenceHeader.typeHeaderOk<IOdictionary>(true))
if (turbulencePropertiesHeader.typeHeaderOk<IOdictionary>(true))
{
autoPtr<compressible::turbulenceModel> turbulence
(

2
applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
View File

@ -1400,7 +1400,7 @@ int main(int argc, char *argv[])
if (faceZoneToPatches.size())
{
autoRefineDriver::addFaceZones
snappyRefineDriver::addFaceZones
(
meshRefiner,
refineParams,

9
applications/utilities/parallelProcessing/redistributePar/parFvFieldReconstructorReconstructFields.C
View File

@ -263,16 +263,13 @@ Foam::parFvFieldReconstructor::reconstructFvSurfaceField
);
// Create flat field of internalField + all patch fields
Field<Type> flatFld(fld.mesh().nFaces(), pTraits<Type>::zero);
SubList<Type>(flatFld, fld.internalField().size()).assign
(
fld.internalField()
);
Field<Type> flatFld(fld.mesh().nFaces(), Type(Zero));
SubList<Type>(flatFld, fld.internalField().size()) = fld.internalField();
forAll(fld.boundaryField(), patchI)
{
const fvsPatchField<Type>& fvp = fld.boundaryField()[patchI];
SubList<Type>(flatFld, fvp.size(), fvp.patch().start()).assign(fvp);
SubList<Type>(flatFld, fvp.size(), fvp.patch().start()) = fvp;
}
// Map all faces

4
applications/utilities/parallelProcessing/redistributePar/parLagrangianRedistributor.C
View File

@ -185,7 +185,7 @@ Foam::parLagrangianRedistributor::redistributeLagrangianPositions
// Start sending. Sets number of bytes transferred
labelListList allNTrans(Pstream::nProcs());
labelList allNTrans(Pstream::nProcs());
pBufs.finishedSends(allNTrans);
@ -208,7 +208,7 @@ Foam::parLagrangianRedistributor::redistributeLagrangianPositions
// Retrieve from receive buffers
forAll(allNTrans, procI)
{
label nRec = allNTrans[procI][Pstream::myProcNo()];
label nRec = allNTrans[procI];
//Pout<< "From processor " << procI << " receiving bytes " << nRec
// << endl;

10
applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.C
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
\\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -93,8 +93,8 @@ volField
zeroGradientFvPatchField<scalar>::typeName
)
);
tvf().internalField() = df;
tvf().correctBoundaryConditions();
tvf.ref().internalField() = df;
tvf.ref().correctBoundaryConditions();
const GeometricField<Type, fvPatchField, volMesh>& vf = tvf();
if (meshSubsetter.hasSubMesh())
@ -103,8 +103,8 @@ volField
(
meshSubsetter.interpolate(vf)
);
tfld().checkOut();
tfld().rename(vf.name());
tfld.ref().checkOut();
tfld.ref().rename(vf.name());
return tfld;
}
else

2
applications/utilities/postProcessing/dataConversion/foamToVTK/internalWriter.H
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
\\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.

2
applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamUpdateInfoFields.H
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
\\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.

6
applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C
View File

@ -74,7 +74,7 @@ Foam::tmp<Foam::volVectorField> createSimplifiedU(const volVectorField& U)
);
// Assign the internal value to the original field
tU() = U;
tU.ref() = U;
return tU;
}
@ -128,7 +128,7 @@ void blendField
false
);
if (fieldHeader.headerOk())
if (fieldHeader.typeHeaderOk<volScalarField>(true))
{
volScalarField fld(fieldHeader, mesh);
scalarField& internalField = fld.internalField();
@ -236,7 +236,7 @@ tmp<volScalarField> calcNut
basicThermo::dictName,
runTime.constant(),
mesh
).headerOk()
).typeHeaderOk<IOdictionary>(true)
)
{
// Compressible

11
applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C
View File

@ -413,14 +413,14 @@ int main(int argc, char *argv[])
(
availablePoints,
upp.faceCentres().size()
).assign(upp.faceCentres());
) = upp.faceCentres();
SubList<point>
(
availablePoints,
upp.localPoints().size(),
upp.faceCentres().size()
).assign(upp.localPoints());
) = upp.localPoints();
point cfo = cf;
scalar dist = GREAT;
@ -783,19 +783,12 @@ int main(int argc, char *argv[])
const labelList& agglom = finalAgglom[patchID];
if (agglom.size() > 0)
{
<<<<<<< HEAD
label nAgglom = max(agglom)+1;
labelListList coarseToFine(invertOneToMany(nAgglom, agglom));
const labelList& coarsePatchFace =
coarseMesh.patchFaceMap()[patchID];
forAll(coarseToFine, coarseI)
=======
const scalar Fij = sum(F[compactI]);
const label coarseFaceID = coarsePatchFace[coarseI];
const labelList& fineFaces = coarseToFine[coarseFaceID];
forAll(fineFaces, fineId)
>>>>>>> foundation
{
const scalar Fij = sum(F[compactI]);
const label coarseFaceID = coarsePatchFace[coarseI];

2
applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
\\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.

6
applications/utilities/surface/surfaceInflate/surfaceInflate.C
View File

@ -90,7 +90,7 @@ tmp<vectorField> calcVertexNormals(const triSurface& surf)
(
new pointField(surf.nPoints(), vector::zero)
);
vectorField& pointNormals = tpointNormals();
vectorField& pointNormals = tpointNormals.ref();
const pointField& points = surf.points();
const labelListList& pointFaces = surf.pointFaces();
@ -134,7 +134,7 @@ tmp<vectorField> calcPointNormals
{
//const pointField pointNormals(s.pointNormals());
tmp<vectorField> tpointNormals(calcVertexNormals(s));
vectorField& pointNormals = tpointNormals();
vectorField& pointNormals = tpointNormals.ref();
// feature edges: create edge normals from edgeFaces only.
@ -356,7 +356,7 @@ tmp<scalarField> avg
)
{
tmp<scalarField> tres(new scalarField(s.nPoints(), 0.0));
scalarField& res = tres();
scalarField& res = tres.ref();
scalarField sumWeight(s.nPoints(), 0.0);

2
etc/config.sh/settings
View File

@ -125,7 +125,7 @@ SunOS)
/bin/cat <<USAGE 1>&2
Your "$WM_ARCH" operating system is not supported by this release
of OpenFOAM. For further assistance, please contact www.OpenFOAM.org
of OpenFOAM. For further assistance, please contact www.OpenFOAM.com
USAGE
;;

1
src/OpenFOAM/containers/Lists/UPtrList/UPtrList.C
View File

@ -44,7 +44,6 @@ Foam::UPtrList<T>::UPtrList(const label s)
template<class T>
<<<<<<< HEAD
Foam::UPtrList<T>::UPtrList(UList<T>& lst)
:
ptrs_(lst.size())

2
src/OpenFOAM/db/IOobjects/GlobalIOField/GlobalIOField.C
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2015 OpenFOAM Foundation
\\/ M anipulation |
\\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.

2
src/OpenFOAM/db/IOobjects/GlobalIOField/GlobalIOField.H
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2015 OpenFOAM Foundation
\\/ M anipulation |
\\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.

2
src/OpenFOAM/db/IOobjects/GlobalIOList/GlobalIOList.C
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2015 OpenFOAM Foundation
\\/ M anipulation |
\\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.

2
src/OpenFOAM/db/IOobjects/IOField/IOField.C
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
\\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.

2
src/OpenFOAM/db/IOobjects/IOList/IOList.C
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
\\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.

2
src/OpenFOAM/db/Time/findInstance.C
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
\\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.

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

@ -134,7 +134,7 @@ public:
Type getProperty
(
const word& entryName,
const Type& defaultValue = pTraits<Type>::zero
const Type& defaultValue = Type(Zero)
) const;
//- Retrieve generic property
@ -151,7 +151,7 @@ public:
(
const word& objectName,
const word& entryName,
const Type& defaultValue = pTraits<Type>::zero
const Type& defaultValue = Type(Zero)
) const;
//- Retrieve generic property from named object
@ -197,7 +197,7 @@ public:
Type getResult
(
const word& entryName,
const Type& defaultValue = pTraits<Type>::zero
const Type& defaultValue = Type(Zero)
) const;
//- Retrieve result from named object
@ -206,7 +206,7 @@ public:
(
const word& objectName,
const word& entryName,
const Type& defaultValue = pTraits<Type>::zero
const Type& defaultValue = Type(Zero)
) const;
//- Retrieve result from named object

1
src/OpenFOAM/db/regIOobject/regIOobjectRead.C
View File

@ -365,6 +365,7 @@ bool Foam::regIOobject::read()
{
// Re-watch master file
addWatch();
}
return ok;
}

8
src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H
View File

@ -129,7 +129,7 @@ public:
const word&,
const dictionary&,
const dimensionSet& dims = dimless,
const Type& defaultValue = pTraits<Type>::zero
const Type& defaultValue = Type(Zero)
);
//- Construct from dictionary dimensionless with value.
@ -137,7 +137,7 @@ public:
(
const word&,
const dictionary&,
const Type& defaultValue = pTraits<Type>::zero
const Type& defaultValue = Type(Zero)
);
//- Construct from dictionary, with default value.
@ -147,7 +147,7 @@ public:
const word&,
dictionary&,
const dimensionSet& dims = dimless,
const Type& defaultValue = pTraits<Type>::zero
const Type& defaultValue = Type(Zero)
);
//- Construct from dictionary, dimensionless with default value.
@ -156,7 +156,7 @@ public:
(
const word&,
dictionary&,
const Type& defaultValue = pTraits<Type>::zero
const Type& defaultValue = Type(Zero)
);

12
src/OpenFOAM/fields/Fields/Field/Field.C
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
\\/ M anipulation | Copyright (C) 2015-2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -167,14 +167,9 @@ Foam::Field<Type>::Field
template<class Type>
Foam::Field<Type>::Field
(
<<<<<<< HEAD
const tmp<Field<Type>>& tmapF,
const FieldMapper& mapper,
const bool applyFlip
=======
const tmp<Field<Type>>& tmapF,
const FieldMapper& mapper
>>>>>>> foundation
)
:
List<Type>(mapper.size())
@ -504,14 +499,9 @@ void Foam::Field<Type>::map
template<class Type>
void Foam::Field<Type>::map
(
<<<<<<< HEAD
const tmp<Field<Type>>& tmapF,
const FieldMapper& mapper,
const bool applyFlip
=======
const tmp<Field<Type>>& tmapF,
const FieldMapper& mapper
>>>>>>> foundation
)
{
map(tmapF(), mapper, applyFlip);

12
src/OpenFOAM/fields/Fields/Field/Field.H
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
\\/ M anipulation | Copyright (C) 2015-2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -185,14 +185,9 @@ public:
//- Construct by mapping from the given tmp field
Field
(
<<<<<<< HEAD
const tmp<Field<Type>>& tmapF,
const FieldMapper& map,
const bool applyFlip = true
=======
const tmp<Field<Type>>& tmapF,
const FieldMapper& map
>>>>>>> foundation
);
//- Construct by mapping from the given tmp field. Supplied uniform
@ -290,14 +285,9 @@ public:
//- Map from the given tmp field
void map
(
<<<<<<< HEAD
const tmp<Field<Type>>& tmapF,
const FieldMapper& map,
const bool applyFlip = true
=======
const tmp<Field<Type>>& tmapF,
const FieldMapper& map
>>>>>>> foundation
);
//- Map from self

2
src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
\\/ M anipulation | Copyright (C) 2015-2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.

6
src/OpenFOAM/fields/pointPatchFields/derived/uniformFixedValue/uniformFixedValuePointPatchField.C
View File

@ -78,7 +78,7 @@ uniformFixedValuePointPatchField
)
:
fixedValuePointPatchField<Type>(ptf, p, iF, mapper),
uniformValue_(ptf.uniformValue_().clone().ptr())
uniformValue_(ptf.uniformValue_, false)
{
// For safety re-evaluate
const scalar t = this->db().time().timeOutputValue();
@ -94,7 +94,7 @@ uniformFixedValuePointPatchField
)
:
fixedValuePointPatchField<Type>(ptf),
uniformValue_(ptf.uniformValue_().clone().ptr())
uniformValue_(ptf.uniformValue_, false)
{}
@ -107,7 +107,7 @@ uniformFixedValuePointPatchField
)
:
fixedValuePointPatchField<Type>(ptf, iF),
uniformValue_(ptf.uniformValue_().clone().ptr())
uniformValue_(ptf.uniformValue_, false)
{
// For safety re-evaluate
const scalar t = this->db().time().timeOutputValue();

4
src/OpenFOAM/matrices/LduMatrix/LduMatrix/SolverPerformance.H
View File

@ -122,8 +122,8 @@ public:
(
const word& solverName,
const word& fieldName,
const Type& iRes = pTraits<Type>::zero,
const Type& fRes = pTraits<Type>::zero,
const Type& iRes = Type(Zero),
const Type& fRes = Type(Zero),
const label nIter = 0,
const bool converged = false,
const bool singular = false

4
src/OpenFOAM/matrices/scalarMatrices/scalarMatricesTemplates.C
View File

@ -139,7 +139,7 @@ void Foam::LUBacksubstitute
sum -= luMatrixi[j]*sourceSol[j];
}
}
else if (sum != pTraits<Type>::zero)
else if (sum != Type(Zero))
{
ii = i+1;
}
@ -185,7 +185,7 @@ void Foam::LUBacksubstitute
sum -= luMatrixi[j]*sourceSol[j];
}
}
else if (sum != pTraits<Type>::zero)
else if (sum != Type(Zero))
{
ii = i+1;
}

6
src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBase.C
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2015 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
\\/ M anipulation | Copyright (C) 2015-2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -446,12 +446,10 @@ void Foam::mapDistributeBase::exchangeAddressing
}
subMap_.setSize(Pstream::nProcs());
labelListList sendSizes;
Pstream::exchange<labelList, label>
(
wantedRemoteElements,
subMap_,
sendSizes,
tag,
Pstream::worldComm //TBD
);
@ -526,12 +524,10 @@ void Foam::mapDistributeBase::exchangeAddressing
}
subMap_.setSize(Pstream::nProcs());
labelListList sendSizes;
Pstream::exchange<labelList, label>
(
wantedRemoteElements,
subMap_,
sendSizes,
tag,
Pstream::worldComm //TBD
);

2
src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBase.H
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2015 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
\\/ M anipulation | Copyright (C) 2015-2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.

2
src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBaseTemplates.C
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2015 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
\\/ M anipulation | Copyright (C) 2015-2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.

2
src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
\\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.

30
src/OpenFOAM/primitives/functions/Function1/Constant/Constant.C
View File

@ -27,6 +27,18 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Type>
Foam::Function1Types::Constant<Type>::Constant
(
const word& entryName,
const Type& value
)
:
Function1<Type>(entryName),
value_(value)
{}
template<class Type>
Foam::Function1Types::Constant<Type>::Constant
(
@ -44,29 +56,11 @@ Foam::Function1Types::Constant<Type>::Constant
template<class Type>
<<<<<<< HEAD:src/OpenFOAM/primitives/functions/DataEntry/Constant/Constant.C
Foam::Constant<Type>::Constant
(
const word& entryName,
const Type& value,
const dimensionSet& dimensions
)
:
DataEntry<Type>(entryName),
value_(value),
dimensions_(dimensions)
{}
template<class Type>
Foam::Constant<Type>::Constant(const Constant<Type>& cnst)
=======
Foam::Function1Types::Constant<Type>::Constant
(
const word& entryName,
Istream& is
)
>>>>>>> foundation:src/OpenFOAM/primitives/functions/Function1/Constant/Constant.C
:
Function1<Type>(entryName),
value_(pTraits<Type>(is))

6
src/OpenFOAM/primitives/functions/Function1/Constant/Constant.H
View File

@ -78,17 +78,13 @@ public:
// Constructors
<<<<<<< HEAD:src/OpenFOAM/primitives/functions/DataEntry/Constant/Constant.H
//- Construct from components
Constant
(
const word& entryName,
const Type& value,
const dimensionSet& dimensions = dimless
const Type& value
);
=======
>>>>>>> foundation:src/OpenFOAM/primitives/functions/Function1/Constant/Constant.H
//- Construct from entry name and dictionary
Constant(const word& entryName, const dictionary& dict);

4
src/OpenFOAM/primitives/subModelBase/subModelBase.H
View File

@ -165,7 +165,7 @@ public:
Type getBaseProperty
(
const word& entryName,
const Type& defaultValue = pTraits<Type>::zero
const Type& defaultValue = Type(Zero)
) const;
//- Retrieve generic property from the base model
@ -188,7 +188,7 @@ public:
Type getModelProperty
(
const word& entryName,
const Type& defaultValue = pTraits<Type>::zero
const Type& defaultValue = Type(Zero)
) const;
//- Add generic property to the sub-model

2
src/TurbulenceModels/schemes/DEShybrid/DEShybrid.H
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2015 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
\\/ M anipulation | Copyright (C) 2015-2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.

4
src/TurbulenceModels/turbulenceModels/DES/SpalartAllmarasDES/SpalartAllmarasDES.C
View File

@ -175,7 +175,7 @@ tmp<volScalarField> SpalartAllmarasDES<BasicTurbulenceModel>::psi
if (lowReCorrection_)
{
volScalarField& psi = tpsi();
volScalarField& psi = tpsi.ref();
const volScalarField fv2(this->fv2(chi, fv1));
const volScalarField ft2(this->ft2(chi));
@ -477,7 +477,7 @@ tmp<volScalarField> SpalartAllmarasDES<BasicTurbulenceModel>::k() const
zeroGradientFvPatchField<vector>::typeName
)
);
volScalarField& dTildaF = tdTilda();
volScalarField& dTildaF = tdTilda.ref();
dTildaF = dTilda(chi, fv1, fvc::grad(this->U_));
dTildaF.correctBoundaryConditions();

2
src/TurbulenceModels/turbulenceModels/DES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C
View File

@ -98,7 +98,7 @@ tmp<volScalarField> SpalartAllmarasIDDES<BasicTurbulenceModel>::rd
scalar(10)
)
);
tr().boundaryField() == 0.0;
tr.ref().boundaryField() == 0.0;
return tr;
}

2
src/TurbulenceModels/turbulenceModels/DES/kOmegaSSTDDES/kOmegaSSTDDES.C
View File

@ -56,7 +56,7 @@ tmp<volScalarField> kOmegaSSTDDES<BasicTurbulenceModel>::rd
scalar(10)
)
);
tr().boundaryField() == 0.0;
tr.ref().boundaryField() == 0.0;
return tr;
}

8
src/TurbulenceModels/turbulenceModels/DES/kOmegaSSTDES/kOmegaSSTDES.C
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2015 OpenFOAM Foundation
\\/ M anipulation |
\\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -206,9 +206,9 @@ void kOmegaSSTDES<BasicTurbulenceModel>::correct()
+ this->omegaSource()
);
omegaEqn().relax();
omegaEqn.ref().relax();
omegaEqn().boundaryManipulate(omega.boundaryField());
omegaEqn.ref().boundaryManipulate(omega.boundaryField());
solve(omegaEqn);
bound(omega, this->omegaMin_);
@ -231,7 +231,7 @@ void kOmegaSSTDES<BasicTurbulenceModel>::correct()
+ this->kSource()
);
kEqn().relax();
kEqn.ref().relax();
solve(kEqn);
bound(k, this->kMin_);
}

2
src/TurbulenceModels/turbulenceModels/DES/kOmegaSSTDES/kOmegaSSTDES.H
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2015 OpenFOAM Foundation
\\/ M anipulation |
\\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.

2
src/TurbulenceModels/turbulenceModels/DES/kOmegaSSTIDDES/kOmegaSSTIDDES.C
View File

@ -98,7 +98,7 @@ tmp<volScalarField> kOmegaSSTIDDES<BasicTurbulenceModel>::rd
scalar(10)
)
);
tr().boundaryField() == 0.0;
tr.ref().boundaryField() == 0.0;
return tr;
}

5
src/TurbulenceModels/turbulenceModels/LES/LESeddyViscosity/LESeddyViscosity.C
View File

@ -24,6 +24,7 @@ License
\*---------------------------------------------------------------------------*/
#include "LESeddyViscosity.H"
#include "zeroGradientFvPatchField.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -107,10 +108,10 @@ tmp<volScalarField> LESeddyViscosity<BasicTurbulenceModel>::epsilon() const
IOobject::NO_WRITE
),
Ce_*tk()*sqrt(tk())/this->delta(),
zeroGradientFvPatchScalarField::typeName
zeroGradientFvPatchField<scalar>::typeName
)
);
volScalarField& epsilon = tepsilon();
volScalarField& epsilon = tepsilon.ref();
epsilon.correctBoundaryConditions();
return tepsilon;

6
src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSST.C
View File

@ -24,12 +24,6 @@ License
\*---------------------------------------------------------------------------*/
#include "kOmegaSST.H"
<<<<<<< HEAD
=======
#include "fvOptions.H"
#include "bound.H"
#include "wallDist.H"
>>>>>>> foundation
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

4
src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.C
View File

@ -56,8 +56,8 @@ Foam::porousBafflePressureFvPatchField::porousBafflePressureFvPatchField
fixedJumpFvPatchField<scalar>(p, iF),
phiName_(dict.lookupOrDefault<word>("phi", "phi")),
rhoName_(dict.lookupOrDefault<word>("rho", "rho")),
D_(DataEntry<scalar>::New("D", dict)),
I_(DataEntry<scalar>::New("I", dict)),
D_(Function1<scalar>::New("D", dict)),
I_(Function1<scalar>::New("I", dict)),
length_(readScalar(dict.lookup("length"))),
uniformJump_(dict.lookupOrDefault<bool>("uniformJump", false))
{

8
src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.H
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
\\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -89,7 +89,7 @@ SourceFiles
#define porousBafflePressureFvPatchField_H
#include "fixedJumpFvPatchField.H"
#include "DataEntry.H"
#include "Function1.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -113,10 +113,10 @@ class porousBafflePressureFvPatchField
const word rhoName_;
//- Darcy pressure loss coefficient
autoPtr<DataEntry<scalar> > D_;
autoPtr<Function1<scalar>> D_;
//- Inertia pressure lost coefficient
autoPtr<DataEntry<scalar> > I_;
autoPtr<Function1<scalar>> I_;
//- Porous media length
scalar length_;

6
src/combustionModels/diffusionMulticomponent/diffusionMulticomponent.C
View File

@ -411,7 +411,7 @@ R(volScalarField& Y) const
{
tmp<fvScalarMatrix> tSu(new fvScalarMatrix(Y, dimMass/dimTime));
fvScalarMatrix& Su = tSu();
fvScalarMatrix& Su = tSu.ref();
if (this->active())
{
@ -449,7 +449,7 @@ dQ() const
if (this->active())
{
volScalarField& dQ = tdQ();
volScalarField& dQ = tdQ.ref();
dQ = this->chemistryPtr_->dQ();
}
@ -483,7 +483,7 @@ Sh() const
if (this->active())
{
scalarField& Sh = tSh();
scalarField& Sh = tSh.ref();
Sh = this->chemistryPtr_->Sh();
}

4
src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
\\/ M anipulation | Copyright (C) 2015-2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -408,7 +408,7 @@ Foam::tmp<Foam::surfaceScalarField> Foam::fvMeshDistribute::generateTestField
dimensionedScalar("zero", dimless, 0.0)
)
);
surfaceScalarField& fld = tfld();
surfaceScalarField& fld = tfld.ref();
const surfaceVectorField n(mesh.Sf()/mesh.magSf());

2
src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.H
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
\\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.

2
src/dynamicMesh/fvMeshDistribute/fvMeshDistributeTemplates.C
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
\\/ M anipulation | Copyright (C) 2015-2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.

2
src/dynamicMesh/fvMeshSubset/fvMeshSubset.H
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
\\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.

4
src/dynamicMesh/fvMeshSubset/fvMeshSubsetInterpolate.C
View File

@ -2,11 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
<<<<<<< HEAD:src/dynamicMesh/fvMeshSubset/fvMeshSubsetInterpolate.C
\\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
=======
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
>>>>>>> foundation:src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubsetInterpolate.C
\\/ M anipulation |
-------------------------------------------------------------------------------
License

2
src/dynamicMesh/motionSolver/velocityDisplacement/velocityDisplacementMotionSolver.C
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2015 OpenFOAM Foundation
\\/ M anipulation |
\\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.

2
src/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
\\/ M anipulation | Copyright (C) 2015-2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.

5
src/finiteVolume/fields/fvPatchFields/derived/movingWallVelocity/movingWallVelocityFvPatchVectorField.H
View File

@ -39,12 +39,7 @@ Description
myPatch
{
type movingWallVelocity;
<<<<<<< HEAD
U U;
value uniform (0 0 0); // initial value
=======
value uniform (0 0 0); // Initial value
>>>>>>> foundation
}
\endverbatim

2
src/finiteVolume/fields/fvPatchFields/derived/pressurePIDControlInletVelocity/pressurePIDControlInletVelocityFvPatchVectorFieldTemplates.C
View File

@ -44,7 +44,7 @@ void Foam::pressurePIDControlInletVelocityFvPatchVectorField::faceZoneAverage
const faceZone& zone = mesh.faceZones()[name];
area = 0;
average = pTraits<Type>::zero;
average = Type(Zero);
forAll(zone, faceI)
{

4
src/finiteVolume/finiteVolume/fvc/fvcCellReduce.H
View File

@ -54,7 +54,7 @@ namespace fvc
(
const GeometricField<Type, fvsPatchField, surfaceMesh>&,
const CombineOp& cop,
const Type& nullValue = pTraits<Type>::zero
const Type& nullValue = Type(Zero)
);
template<class Type, class CombineOp>
@ -62,7 +62,7 @@ namespace fvc
(
const tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>&,
const CombineOp& cop,
const Type& nullValue = pTraits<Type>::zero
const Type& nullValue = Type(Zero)
);
}

28
src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolate.C
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
\\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -186,7 +186,7 @@ void Foam::volPointInterpolation::interpolateDimensionedInternalField
{
const labelList& ppc = pointCells[pointi];
pf[pointi] = pTraits<Type>::zero;
pf[pointi] = Type(Zero);
forAll(ppc, pointCelli)
{
@ -382,10 +382,10 @@ Foam::volPointInterpolation::interpolate
)
);
interpolateInternalField(vf, tpf());
interpolateInternalField(vf, tpf.ref());
// Interpolate to the patches overriding fixed value BCs
interpolateBoundaryField(vf, tpf(), true);
interpolateBoundaryField(vf, tpf.ref(), true);
return tpf;
}
@ -518,8 +518,8 @@ Foam::volPointInterpolation::interpolate
template<class Type>
tmp<DimensionedField<Type, pointMesh> >
volPointInterpolation::interpolate
Foam::tmp<Foam::DimensionedField<Type, Foam::pointMesh>>
Foam::volPointInterpolation::interpolate
(
const DimensionedField<Type, volMesh>& vf,
const word& name,
@ -565,7 +565,7 @@ volPointInterpolation::interpolate
)
);
interpolateDimensionedInternalField(vf, tpf());
interpolateDimensionedInternalField(vf, tpf.ref());
return tpf;
}
@ -603,8 +603,8 @@ volPointInterpolation::interpolate
template<class Type>
tmp<DimensionedField<Type, pointMesh> >
volPointInterpolation::interpolate
Foam::tmp<Foam::DimensionedField<Type, Foam::pointMesh>>
Foam::volPointInterpolation::interpolate
(
const DimensionedField<Type, volMesh>& vf
) const
@ -614,21 +614,17 @@ volPointInterpolation::interpolate
template<class Type>
tmp<DimensionedField<Type, pointMesh> >
volPointInterpolation::interpolate
Foam::tmp<Foam::DimensionedField<Type, Foam::pointMesh>>
Foam::volPointInterpolation::interpolate
(
const tmp<DimensionedField<Type, volMesh>>& tvf
) const
{
// Construct tmp<pointField>
tmp<DimensionedField<Type, pointMesh> > tpf = interpolate(tvf());
tmp<DimensionedField<Type, pointMesh>> tpf = interpolate(tvf.ref());
tvf.clear();
return tpf;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
// ************************************************************************* //

2
src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolation.H
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
\\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.

4
src/fvMotionSolver/fvMotionSolvers/displacement/surfaceAlignedSBRStress/surfaceAlignedSBRStressFvMotionSolver.C
View File

@ -324,7 +324,7 @@ void Foam::surfaceAlignedSBRStressFvMotionSolver::solve()
)
);
volVectorField& Ud = tUd();
volVectorField& Ud = tUd.ref();
const vectorList& C = fvMesh_.C();
forAll(Ud, i)
@ -364,7 +364,7 @@ void Foam::surfaceAlignedSBRStressFvMotionSolver::solve()
dimensionedScalar("zero", dimless, 0.0)
)
);
volScalarField& mu = tmu();
volScalarField& mu = tmu.ref();
const scalarList& V = fvMesh_.V();
mu.internalField() = (1.0/V);

4
src/fvMotionSolver/motionInterpolation/patchCorrected/patchCorrectedInterpolationTemplates.C
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2015 OpenFOAM Foundation
\\/ M anipulation |
\\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -106,7 +106,7 @@ void Foam::patchCorrectedInterpolation::interpolateDataFromPatchGroups
dimensionedScalar("zero", dimless, 0),
zeroGradientPointPatchField<scalar>::typeName
);
data = dimensioned<Type>("zero", data.dimensions(), pTraits<Type>::zero);
data = dimensioned<Type>("zero", data.dimensions(), Type(Zero));
forAll(patchGroups_, patchGroupI)
{

2
src/lagrangian/basic/particle/particleTemplates.C
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
\\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.

2
src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/PairCollisionRecord/PairCollisionRecord.H
View File

@ -111,7 +111,7 @@ public:
bool accessed,
label origProcOfOther,
label origIdOfOther,
const Type& data = pTraits<Type>::zero
const Type& data = Type(Zero)
);
//- Construct from Istream

2
src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecord.H
View File

@ -108,7 +108,7 @@ public:
(
bool accessed,
const vector& pRel,
const Type& data = pTraits<Type>::zero
const Type& data = Type(Zero)
);
//- Construct from Istream

2
src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudToVTK/CloudToVTK.C
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2015 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
\\/ M anipulation | Copyright (C) 2015-2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.

2
src/lagrangian/intermediate/submodels/CloudFunctionObjects/CloudToVTK/CloudToVTK.H
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2015 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
\\/ M anipulation | Copyright (C) 2015-2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.

6
src/mesh/blockMesh/curvedEdges/bezier.C
View File

@ -76,11 +76,9 @@ Foam::point Foam::bezier::position(const scalar lambda) const
{
--nWorking;
SubList<point>(working, nWorking).assign
(
SubList<point>(working, nWorking) =
(1 - lambda)*SubList<point>(working, nWorking)
+ lambda*SubList<point>(working, nWorking, 1)
);
+ lambda*SubList<point>(working, nWorking, 1);
}
return working[0];

2
src/mesh/snappyHexMesh/externalDisplacementMeshMover/externalDisplacementMeshMover.C
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
\\/ M anipulation | Copyright (C) 2015-2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.

50
src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.C
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2014-2015 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
\\/ M anipulation | Copyright (C) 2015-2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -624,18 +624,18 @@ bool Foam::medialAxisMeshMover::unmarkExtrusion
(
const label patchPointI,
pointField& patchDisp,
List<autoLayerDriver::extrudeMode>& extrudeStatus
List<snappyLayerDriver::extrudeMode>& extrudeStatus
)
{
if (extrudeStatus[patchPointI] == autoLayerDriver::EXTRUDE)
if (extrudeStatus[patchPointI] == snappyLayerDriver::EXTRUDE)
{
extrudeStatus[patchPointI] = autoLayerDriver::NOEXTRUDE;
extrudeStatus[patchPointI] = snappyLayerDriver::NOEXTRUDE;
patchDisp[patchPointI] = vector::zero;
return true;
}
else if (extrudeStatus[patchPointI] == autoLayerDriver::EXTRUDEREMOVE)
else if (extrudeStatus[patchPointI] == snappyLayerDriver::EXTRUDEREMOVE)
{
extrudeStatus[patchPointI] = autoLayerDriver::NOEXTRUDE;
extrudeStatus[patchPointI] = snappyLayerDriver::NOEXTRUDE;
patchDisp[patchPointI] = vector::zero;
return true;
}
@ -650,7 +650,7 @@ void Foam::medialAxisMeshMover::syncPatchDisplacement
(
const scalarField& minThickness,
pointField& patchDisp,
List<autoLayerDriver::extrudeMode>& extrudeStatus
List<snappyLayerDriver::extrudeMode>& extrudeStatus
) const
{
const indirectPrimitivePatch& pp = adaptPatchPtr_();
@ -770,7 +770,7 @@ handleFeatureAngleLayerTerminations
const scalar minCos,
const PackedBoolList& isPatchMasterPoint,
const labelList& meshEdges,
List<autoLayerDriver::extrudeMode>& extrudeStatus,
List<snappyLayerDriver::extrudeMode>& extrudeStatus,
pointField& patchDisp,
label& nPointCounter
) const
@ -788,7 +788,7 @@ handleFeatureAngleLayerTerminations
forAll(f, fp)
{
if (extrudeStatus[f[fp]] == autoLayerDriver::NOEXTRUDE)
if (extrudeStatus[f[fp]] == snappyLayerDriver::NOEXTRUDE)
{
extrudedFaces[faceI] = false;
break;
@ -857,8 +857,8 @@ handleFeatureAngleLayerTerminations
if
(
extrudeStatus[v0] != autoLayerDriver::NOEXTRUDE
|| extrudeStatus[v1] != autoLayerDriver::NOEXTRUDE
extrudeStatus[v0] != snappyLayerDriver::NOEXTRUDE
|| extrudeStatus[v1] != snappyLayerDriver::NOEXTRUDE
)
{
if (!eFaceExtrude[0] || !eFaceExtrude[1])
@ -905,7 +905,7 @@ void Foam::medialAxisMeshMover::findIsolatedRegions
const PackedBoolList& isPatchMasterEdge,
const labelList& meshEdges,
const scalarField& minThickness,
List<autoLayerDriver::extrudeMode>& extrudeStatus,
List<snappyLayerDriver::extrudeMode>& extrudeStatus,
pointField& patchDisp
) const
{
@ -974,7 +974,7 @@ void Foam::medialAxisMeshMover::findIsolatedRegions
forAll(f, fp)
{
if (extrudeStatus[f[fp]] != autoLayerDriver::NOEXTRUDE)
if (extrudeStatus[f[fp]] != snappyLayerDriver::NOEXTRUDE)
{
if (islandPoint[faceI] == -1)
{
@ -998,7 +998,7 @@ void Foam::medialAxisMeshMover::findIsolatedRegions
// Check all surrounding faces that I am the islandPoint
forAll(pointFaces, patchPointI)
{
if (extrudeStatus[patchPointI] != autoLayerDriver::NOEXTRUDE)
if (extrudeStatus[patchPointI] != snappyLayerDriver::NOEXTRUDE)
{
const labelList& pFaces = pointFaces[patchPointI];
@ -1026,7 +1026,7 @@ void Foam::medialAxisMeshMover::findIsolatedRegions
const face& f = pp.localFaces()[faceI];
forAll(f, fp)
{
if (extrudeStatus[f[fp]] == autoLayerDriver::NOEXTRUDE)
if (extrudeStatus[f[fp]] == snappyLayerDriver::NOEXTRUDE)
{
extrudedFaces[faceI] = false;
break;
@ -1100,11 +1100,11 @@ void Foam::medialAxisMeshMover::findIsolatedRegions
label v0 = e[0];
label v1 = e[1];
if (extrudeStatus[v1] != autoLayerDriver::NOEXTRUDE)
if (extrudeStatus[v1] != snappyLayerDriver::NOEXTRUDE)
{
isolatedPoint[v0] += 1;
}
if (extrudeStatus[v0] != autoLayerDriver::NOEXTRUDE)
if (extrudeStatus[v0] != snappyLayerDriver::NOEXTRUDE)
{
isolatedPoint[v1] += 1;
}
@ -1139,7 +1139,7 @@ void Foam::medialAxisMeshMover::findIsolatedRegions
{
forAll(f, fp)
{
if (extrudeStatus[f[fp]] == autoLayerDriver::NOEXTRUDE)
if (extrudeStatus[f[fp]] == snappyLayerDriver::NOEXTRUDE)
{
allPointsExtruded = false;
break;
@ -1285,7 +1285,7 @@ void Foam::medialAxisMeshMover::calculateDisplacement
(
const dictionary& coeffDict,
const scalarField& minThickness,
List<autoLayerDriver::extrudeMode>& extrudeStatus,
List<snappyLayerDriver::extrudeMode>& extrudeStatus,
pointField& patchDisp
)
{
@ -1379,7 +1379,7 @@ void Foam::medialAxisMeshMover::calculateDisplacement
forAll(thickness, patchPointI)
{
if (extrudeStatus[patchPointI] == autoLayerDriver::NOEXTRUDE)
if (extrudeStatus[patchPointI] == snappyLayerDriver::NOEXTRUDE)
{
thickness[patchPointI] = 0.0;
}
@ -1428,7 +1428,7 @@ void Foam::medialAxisMeshMover::calculateDisplacement
forAll(meshPoints, patchPointI)
{
if (extrudeStatus[patchPointI] != autoLayerDriver::NOEXTRUDE)
if (extrudeStatus[patchPointI] != snappyLayerDriver::NOEXTRUDE)
{
label pointI = meshPoints[patchPointI];
@ -1522,7 +1522,7 @@ void Foam::medialAxisMeshMover::calculateDisplacement
// Update thickess for changed extrusion
forAll(thickness, patchPointI)
{
if (extrudeStatus[patchPointI] == autoLayerDriver::NOEXTRUDE)
if (extrudeStatus[patchPointI] == snappyLayerDriver::NOEXTRUDE)
{
thickness[patchPointI] = 0.0;
}
@ -1732,16 +1732,16 @@ bool Foam::medialAxisMeshMover::move
pp.meshPoints()
);
List<autoLayerDriver::extrudeMode> extrudeStatus
List<snappyLayerDriver::extrudeMode> extrudeStatus
(
pp.nPoints(),
autoLayerDriver::EXTRUDE
snappyLayerDriver::EXTRUDE
);
forAll(extrudeStatus, pointI)
{
if (mag(patchDisp[pointI]) <= minThickness[pointI]+SMALL)
{
extrudeStatus[pointI] = autoLayerDriver::NOEXTRUDE;
extrudeStatus[pointI] = snappyLayerDriver::NOEXTRUDE;
}
}

12
src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.H
View File

@ -46,7 +46,7 @@ SourceFiles
#include "externalDisplacementMeshMover.H"
#include "motionSmootherAlgo.H"
#include "autoLayerDriver.H"
#include "snappyLayerDriver.H"
#include "fieldSmoother.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -129,7 +129,7 @@ class medialAxisMeshMover
(
const label patchPointI,
pointField& patchDisp,
List<autoLayerDriver::extrudeMode>& extrudeStatus
List<snappyLayerDriver::extrudeMode>& extrudeStatus
);
//- Synchronise extrusion
@ -137,7 +137,7 @@ class medialAxisMeshMover
(
const scalarField& minThickness,
pointField& patchDisp,
List<autoLayerDriver::extrudeMode>& extrudeStatus
List<snappyLayerDriver::extrudeMode>& extrudeStatus
) const;
//- Stop layer growth at feature edges
@ -146,7 +146,7 @@ class medialAxisMeshMover
const scalar minCos,
const PackedBoolList& isMasterPoint,
const labelList& meshEdges,
List<autoLayerDriver::extrudeMode>& extrudeStatus,
List<snappyLayerDriver::extrudeMode>& extrudeStatus,
pointField& patchDisp,
label& nPointCounter
) const;
@ -162,7 +162,7 @@ class medialAxisMeshMover
const PackedBoolList& isMasterEdge,
const labelList& meshEdges,
const scalarField& minThickness,
List<autoLayerDriver::extrudeMode>& extrudeStatus,
List<snappyLayerDriver::extrudeMode>& extrudeStatus,
pointField& patchDisp
) const;
@ -174,7 +174,7 @@ class medialAxisMeshMover
(
const dictionary&,
const scalarField& minThickness,
List<autoLayerDriver::extrudeMode>& extrudeStatus,
List<snappyLayerDriver::extrudeMode>& extrudeStatus,
pointField& patchDisp
);

6
src/mesh/snappyHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchField.C
View File

@ -55,7 +55,7 @@ zeroFixedValuePointPatchField
:
fixedValuePointPatchField<Type>(p, iF, dict, false)
{
fixedValuePointPatchField<Type>::operator=(pTraits<Type>::zero);
fixedValuePointPatchField<Type>::operator=(Type(Zero));
}
@ -72,7 +72,7 @@ zeroFixedValuePointPatchField
fixedValuePointPatchField<Type>(ptf, p, iF, mapper)
{
// For safety re-evaluate
fixedValuePointPatchField<Type>::operator=(pTraits<Type>::zero);
fixedValuePointPatchField<Type>::operator=(Type(Zero));
}
@ -98,7 +98,7 @@ zeroFixedValuePointPatchField
fixedValuePointPatchField<Type>(ptf, iF)
{
// For safety re-evaluate
fixedValuePointPatchField<Type>::operator=(pTraits<Type>::zero);
fixedValuePointPatchField<Type>::operator=(Type(Zero));
}

10
src/mesh/snappyHexMesh/meshRefinement/meshRefinementProblemCells.C
View File

@ -36,7 +36,7 @@ License
#include "polyMeshGeometry.H"
#include "IOmanip.H"
#include "unitConversion.H"
#include "autoSnapDriver.H"
#include "snappySnapDriver.H"
#include "snapParameters.H"
#include "motionSmoother.H"
@ -1092,7 +1092,7 @@ Foam::labelList Foam::meshRefinement::markFacesOnProblemCellsGeometric
{
pointField oldPoints(mesh_.points());
// Repeat (most of) autoSnapDriver::doSnap
// Repeat (most of) snappySnapDriver::doSnap
{
labelList adaptPatchIDs(meshedPatches());
@ -1110,7 +1110,7 @@ Foam::labelList Foam::meshRefinement::markFacesOnProblemCellsGeometric
// Distance to attract to nearest feature on surface
const scalarField snapDist
(
autoSnapDriver::calcSnapDistance(mesh_, snapParams, pp)
snappySnapDriver::calcSnapDistance(mesh_, snapParams, pp)
);
@ -1149,7 +1149,7 @@ Foam::labelList Foam::meshRefinement::markFacesOnProblemCellsGeometric
<< mesh_.time().cpuTimeIncrement() << " s\n" << nl << endl;
// Pre-smooth patch vertices (so before determining nearest)
autoSnapDriver::preSmoothPatch
snappySnapDriver::preSmoothPatch
(
*this,
snapParams,
@ -1162,7 +1162,7 @@ Foam::labelList Foam::meshRefinement::markFacesOnProblemCellsGeometric
vectorField nearestNormal;
const vectorField disp
(
autoSnapDriver::calcNearestSurface
snappySnapDriver::calcNearestSurface
(
snapParams.strictRegionSnap(),
*this,

6
src/mesh/snappyHexMesh/meshRefinement/meshRefinementTemplates.C
View File

@ -70,7 +70,7 @@ T Foam::meshRefinement::gAverage
<< exit(FatalError);
}
T sum = pTraits<T>::zero;
T sum = T(Zero);
label n = 0;
forAll(values, i)
@ -305,7 +305,7 @@ void Foam::meshRefinement::weightedSum
}
sum.setSize(meshPoints.size());
sum = pTraits<Type>::zero;
sum = Type(zero);
forAll(edges, edgeI)
{
@ -329,7 +329,7 @@ void Foam::meshRefinement::weightedSum
meshPoints,
sum,
plusEqOp<Type>(),
pTraits<Type>::zero // null value
Type(Zero) // null value
);
}

2
src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C
View File

@ -110,7 +110,7 @@ Foam::tmp<Foam::scalarField> Foam::snappyLayerDriver::avgPointData
)
{
tmp<scalarField> tfaceFld(new scalarField(pp.size(), 0.0));
scalarField& faceFld = tfaceFld();
scalarField& faceFld = tfaceFld.ref();
forAll(pp.localFaces(), faceI)
{

4
src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriverTemplates.C
View File

@ -43,7 +43,7 @@ void Foam::snappyLayerDriver::averageNeighbours
{
const pointField& pts = mesh.points();
average = pTraits<Type>::zero;
average = Type(Zero);
forAll(edges, edgeI)
{
@ -77,7 +77,7 @@ void Foam::snappyLayerDriver::averageNeighbours
meshPoints,
average,
plusEqOp<Type>(),
pTraits<Type>::zero // null value
Type(Zero) // null value
);
average *= invSumWeight;

8
src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.C
View File

@ -277,7 +277,7 @@ Foam::tmp<Foam::pointField> Foam::snappySnapDriver::smoothInternalDisplacement
);
tmp<pointField> tdisplacement(new pointField(mesh.nPoints(), vector::zero));
pointField& displacement = tdisplacement();
pointField& displacement = tdisplacement.ref();
label nAdapted = 0;
@ -522,7 +522,7 @@ Foam::tmp<Foam::pointField> Foam::snappySnapDriver::smoothPatchDisplacement
// Displacement to calculate.
tmp<pointField> tpatchDisp(new pointField(meshPoints.size(), vector::zero));
pointField& patchDisp = tpatchDisp();
pointField& patchDisp = tpatchDisp.ref();
forAll(pointFaces, i)
{
@ -685,7 +685,7 @@ Foam::tmp<Foam::scalarField> Foam::snappySnapDriver::edgePatchDist
// Copy edge values into scalarField
tmp<scalarField> tedgeDist(new scalarField(mesh.nEdges()));
scalarField& edgeDist = tedgeDist();
scalarField& edgeDist = tedgeDist.ref();
forAll(allEdgeInfo, edgeI)
{
@ -999,7 +999,7 @@ Foam::tmp<Foam::pointField> Foam::snappySnapDriver::avgCellCentres
(
new pointField(pointFaces.size(), vector::zero)
);
pointField& avgBoundary = tavgBoundary();
pointField& avgBoundary = tavgBoundary.ref();
labelList nBoundary(pointFaces.size(), 0);
forAll(pointFaces, pointI)

17
src/meshTools/regionSplit/regionSplit.C
View File

@ -344,13 +344,7 @@ Foam::autoPtr<Foam::globalIndex> Foam::regionSplit::calcRegionSplit
// Get the wanted region labels into recvNonLocal
labelListList recvNonLocal(Pstream::nProcs());
labelListList sizes;
Pstream::exchange<labelList, label>
(
sendNonLocal,
recvNonLocal,
sizes
);
Pstream::exchange<labelList, label>(sendNonLocal, recvNonLocal);
// Now we have the wanted compact region labels that procI wants in
// recvNonLocal[procI]. Construct corresponding list of compact
@ -371,14 +365,7 @@ Foam::autoPtr<Foam::globalIndex> Foam::regionSplit::calcRegionSplit
// Send back (into recvNonLocal)
recvNonLocal.clear();
recvNonLocal.setSize(sendWantedLocal.size());
sizes.clear();
Pstream::exchange<labelList, label>
(
sendWantedLocal,
recvNonLocal,
sizes
);
Pstream::exchange<labelList, label>(sendWantedLocal, recvNonLocal);
sendWantedLocal.clear();
// Now recvNonLocal contains for every element in setNonLocal the

4
src/meshTools/searchableSurface/searchableCone.C
View File

@ -30,10 +30,8 @@ License
namespace Foam
{
defineTypeNameAndDebug(searchableCone, 0);
addToRunTimeSelectionTable(searchableSurface, searchableCone, dict);
}
@ -74,7 +72,7 @@ void Foam::searchableCone::boundingSpheres
Foam::tmp<Foam::pointField> Foam::searchableCone::points() const
{
tmp<pointField> tPts(new pointField(2));
pointField& pts = tPts();
pointField& pts = tPts.ref();
pts[0] = point1_;
pts[1] = point2_;

2
src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.C
View File

@ -204,7 +204,7 @@ void Foam::fieldAverage::readAveragingProperties()
totalTime_.clear();
totalTime_.setSize(faItems_.size(), obr_.time().deltaTValue());
if (log_ && (resetOnRestart_ || resetOnOutput_))
if (log_ && (restartOnRestart_ || restartOnOutput_))
{
Info<< " Starting averaging at time " << obr_.time().timeName()
<< nl;

2
src/postProcessing/functionObjects/jobControl/externalCoupled/externalCoupledFunctionObjectTemplates.C
View File

@ -306,7 +306,7 @@ Foam::externalCoupledFunctionObject::gatherAndCombine
tmp<Field<Type>> tresult(new Field<Type>(0));
Field<Type>& result = tresult();
Field<Type>& result = tresult.ref();
if (Pstream::master())
{

4
src/postProcessing/functionObjects/jobControl/externalCoupled/externalCoupledMixed/externalCoupledMixedFvPatchField.C
View File

@ -39,8 +39,8 @@ externalCoupledMixedFvPatchField
:
mixedFvPatchField<Type>(p, iF)
{
this->refValue() = pTraits<Type>::zero;
this->refGrad() = pTraits<Type>::zero;
this->refValue() = Type(Zero);
this->refGrad() = Type(Zero);
this->valueFraction() = 0.0;
}

2
src/postProcessing/functionObjects/jobControl/externalCoupled/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.C
View File

@ -104,7 +104,7 @@ externalCoupledTemperatureMixedFvPatchScalarField
// Initialise as a fixed value
this->refValue() = *this;
this->refGrad() = pTraits<scalar>::zero;
this->refGrad() = Zero;
this->valueFraction() = 1.0;
}
}

84
src/postProcessing/functionObjects/utilities/scalarTransport/scalarTransport.C
View File

@ -210,9 +210,6 @@ Foam::scalarTransport::~scalarTransport()
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void Foam::scalarTransport::read(const dictionary& dict)
{
<<<<<<< HEAD
if (active_)
{
log_.readIfPresent("log", dict);
@ -221,13 +218,7 @@ void Foam::scalarTransport::read(const dictionary& dict)
dict.readIfPresent("phiName", phiName_);
dict.readIfPresent("UName", UName_);
dict.readIfPresent("rhoName", rhoName_);
=======
Info<< type() << ":" << nl;
phiName_ = dict.lookupOrDefault<word>("phiName", "phi");
UName_ = dict.lookupOrDefault<word>("UName", "U");
rhoName_ = dict.lookupOrDefault<word>("rhoName", "rho");
>>>>>>> foundation
userDT_ = false;
if (dict.readIfPresent("DT", DT_))
@ -235,63 +226,37 @@ void Foam::scalarTransport::read(const dictionary& dict)
userDT_ = true;
}
<<<<<<< HEAD
dict.readIfPresent("nCorr", nCorr_);
dict.lookup("resetOnStartUp") >> resetOnStartUp_;
dict.lookup("autoSchemes") >> autoSchemes_;
=======
dict.lookup("resetOnStartUp") >> resetOnStartUp_;
dict.readIfPresent("nCorr", nCorr_);
dict.lookup("autoSchemes") >> autoSchemes_;
>>>>>>> foundation
fvOptions_.reset(dict.subDict("fvOptions"));
}
void Foam::scalarTransport::execute()
{
<<<<<<< HEAD
if (active_)
{
if (log_) Info<< type() << " " << name_ << " output:" << nl;
=======
Info<< type() << " output:" << endl;
>>>>>>> foundation
const surfaceScalarField& phi =
mesh_.lookupObject<surfaceScalarField>(phiName_);
<<<<<<< HEAD
volScalarField& T = transportedField();
// calculate the diffusivity
// Calculate the diffusivity
volScalarField DT(this->DT(phi));
// set schemes
// Set schemes
word schemeVar = T.name();
if (autoSchemes_)
{
schemeVar = UName_;
}
=======
// calculate the diffusivity
volScalarField DT(this->DT(phi));
// set schemes
word schemeVar = T_.name();
if (autoSchemes_)
{
schemeVar = UName_;
}
>>>>>>> foundation
word divScheme("div(phi," + schemeVar + ")");
word laplacianScheme("laplacian(" + DT.name() + "," + schemeVar + ")");
// set under-relaxation coeff
// Set under-relaxation coeff
scalar relaxCoeff = 0.0;
if (mesh_.relaxEquation(schemeVar))
{
@ -303,8 +268,7 @@ void Foam::scalarTransport::execute()
const volScalarField& rho =
mesh_.lookupObject<volScalarField>(rhoName_);
<<<<<<< HEAD
// solve
// Solve
for (label i = 0; i <= nCorr_; i++)
{
fvScalarMatrix TEqn
@ -315,19 +279,6 @@ void Foam::scalarTransport::execute()
==
fvOptions_(rho, T)
);
=======
// solve
for (label i = 0; i <= nCorr_; i++)
{
fvScalarMatrix TEqn
(
fvm::ddt(rho, T_)
+ fvm::div(phi, T_, divScheme)
- fvm::laplacian(DT, T_, laplacianScheme)
==
fvOptions_(rho, T_)
);
>>>>>>> foundation
TEqn.relax(relaxCoeff);
@ -338,11 +289,7 @@ void Foam::scalarTransport::execute()
}
else if (phi.dimensions() == dimVolume/dimTime)
{
// solve
for (label i = 0; i <= nCorr_; i++)
{
<<<<<<< HEAD
// solve
// Solve
for (label i = 0; i <= nCorr_; i++)
{
fvScalarMatrix TEqn
@ -353,16 +300,6 @@ void Foam::scalarTransport::execute()
==
fvOptions_(T)
);
=======
fvScalarMatrix TEqn
(
fvm::ddt(T_)
+ fvm::div(phi, T_, divScheme)
- fvm::laplacian(DT, T_, laplacianScheme)
==
fvOptions_(T_)
);
>>>>>>> foundation
TEqn.relax(relaxCoeff);
@ -370,11 +307,6 @@ void Foam::scalarTransport::execute()
TEqn.solve(mesh_.solverDict(schemeVar));
}
<<<<<<< HEAD
if (log_) Info<< endl;
=======
>>>>>>> foundation
}
else
{
@ -384,17 +316,13 @@ void Foam::scalarTransport::execute()
<< dimVolume/dimTime << endl;
}
Info<< endl;
if (log_) Info<< endl;
}
void Foam::scalarTransport::end()
{
<<<<<<< HEAD
// Do nothing
=======
execute();
>>>>>>> foundation
}

3
src/postProcessing/functionObjects/utilities/scalarTransport/scalarTransport.H
View File

@ -120,6 +120,9 @@ class scalarTransport
//- Reference to the mesh database
const fvMesh& mesh_;
//- On/off switch
bool active_;
//- Name of flux field (optional)
word phiName_;

36
src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.C
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation
\\/ M anipulation |
\\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -56,9 +56,9 @@ inclinedFilmNusseltHeightFvPatchScalarField
:
fixedValueFvPatchScalarField(ptf, p, iF, mapper),
filmRegionName_(ptf.filmRegionName_),
GammaMean_(ptf.GammaMean_().clone().ptr()),
a_(ptf.a_().clone().ptr()),
omega_(ptf.omega_().clone().ptr())
GammaMean_(ptf.GammaMean_, false),
a_(ptf.a_, false),
omega_(ptf.omega_, false)
{}
@ -75,9 +75,9 @@ inclinedFilmNusseltHeightFvPatchScalarField
(
dict.lookupOrDefault<word>("filmRegion", "surfaceFilmProperties")
),
GammaMean_(DataEntry<scalar>::New("GammaMean", dict)),
a_(DataEntry<scalar>::New("a", dict)),
omega_(DataEntry<scalar>::New("omega", dict))
GammaMean_(Function1<scalar>::New("GammaMean", dict)),
a_(Function1<scalar>::New("a", dict)),
omega_(Function1<scalar>::New("omega", dict))
{
fvPatchScalarField::operator=(scalarField("value", dict, p.size()));
}
@ -91,9 +91,9 @@ inclinedFilmNusseltHeightFvPatchScalarField
:
fixedValueFvPatchScalarField(wmfrhpsf),
filmRegionName_(wmfrhpsf.filmRegionName_),
GammaMean_(wmfrhpsf.GammaMean_().clone().ptr()),
a_(wmfrhpsf.a_().clone().ptr()),
omega_(wmfrhpsf.omega_().clone().ptr())
GammaMean_(wmfrhpsf.GammaMean_, false),
a_(wmfrhpsf.a_, false),
omega_(wmfrhpsf.omega_, false)
{}
@ -106,9 +106,9 @@ inclinedFilmNusseltHeightFvPatchScalarField
:
fixedValueFvPatchScalarField(wmfrhpsf, iF),
filmRegionName_(wmfrhpsf.filmRegionName_),
GammaMean_(wmfrhpsf.GammaMean_().clone().ptr()),
a_(wmfrhpsf.a_().clone().ptr()),
omega_(wmfrhpsf.omega_().clone().ptr())
GammaMean_(wmfrhpsf.GammaMean_, false),
a_(wmfrhpsf.a_, false),
omega_(wmfrhpsf.omega_, false)
{}
@ -123,7 +123,7 @@ void Foam::inclinedFilmNusseltHeightFvPatchScalarField::updateCoeffs()
const label patchI = patch().index();
// retrieve the film region from the database
// Retrieve the film region from the database
const regionModels::regionModel& region =
db().time().lookupObject<regionModels::regionModel>(filmRegionName_);
@ -134,9 +134,9 @@ void Foam::inclinedFilmNusseltHeightFvPatchScalarField::updateCoeffs()
const regionModels::surfaceFilmModels::kinematicSingleLayer&
>(region);
// calculate the vector tangential to the patch
// Calculate the vector tangential to the patch
// note: normal pointing into the domain
// Note: normal pointing into the domain
const vectorField n(-patch().nf());
const scalarField gTan(film.gTan(patchI) & n);
@ -156,12 +156,12 @@ void Foam::inclinedFilmNusseltHeightFvPatchScalarField::updateCoeffs()
vectorField nTan(nHatp ^ n);
nTan /= mag(nTan) + ROOTVSMALL;
// calculate distance in patch tangential direction
// Calculate distance in patch tangential direction
const vectorField& Cf = patch().Cf();
scalarField d(nTan & Cf);
// calculate the wavy film height
// Calculate the wavy film height
const scalar t = db().time().timeOutputValue();

20
src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltInletVelocity/inclinedFilmNusseltInletVelocityFvPatchVectorField.C
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation
\\/ M anipulation |
\\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -56,9 +56,9 @@ inclinedFilmNusseltInletVelocityFvPatchVectorField
:
fixedValueFvPatchVectorField(ptf, p, iF, mapper),
filmRegionName_(ptf.filmRegionName_),
GammaMean_(ptf.GammaMean_().clone().ptr()),
a_(ptf.a_().clone().ptr()),
omega_(ptf.omega_().clone().ptr())
GammaMean_(ptf.GammaMean_, false),
a_(ptf.a_, false),
omega_(ptf.omega_, false)
{}
@ -91,9 +91,9 @@ inclinedFilmNusseltInletVelocityFvPatchVectorField
:
fixedValueFvPatchVectorField(fmfrpvf),
filmRegionName_(fmfrpvf.filmRegionName_),
GammaMean_(fmfrpvf.GammaMean_().clone().ptr()),
a_(fmfrpvf.a_().clone().ptr()),
omega_(fmfrpvf.omega_().clone().ptr())
GammaMean_(fmfrpvf.GammaMean_, false),
a_(fmfrpvf.a_, false),
omega_(fmfrpvf.omega_, false)
{}
@ -106,9 +106,9 @@ inclinedFilmNusseltInletVelocityFvPatchVectorField
:
fixedValueFvPatchVectorField(fmfrpvf, iF),
filmRegionName_(fmfrpvf.filmRegionName_),
GammaMean_(fmfrpvf.GammaMean_().clone().ptr()),
a_(fmfrpvf.a_().clone().ptr()),
omega_(fmfrpvf.omega_().clone().ptr())
GammaMean_(fmfrpvf.GammaMean_, false),
a_(fmfrpvf.a_, false),
omega_(fmfrpvf.omega_, false)
{}

6
src/regionModels/surfaceFilmModels/submodels/kinematic/force/thermocapillaryForce/thermocapillaryForce.C
View File

@ -69,11 +69,7 @@ tmp<fvVectorMatrix> thermocapillaryForce::correct(volVectorField& U)
tmp<fvVectorMatrix>
tfvm(new fvVectorMatrix(U, dimForce/dimArea*dimVolume));
<<<<<<< HEAD
tfvm() += alpha*fvc::grad(sigma);
=======
tfvm.ref() += fvc::grad(sigma);
>>>>>>> foundation
tfvm.ref() += alpha*fvc::grad(sigma);
return tfvm;
}

2
src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C
View File

@ -24,11 +24,11 @@ License
\*---------------------------------------------------------------------------*/
#include "thermoSingleLayer.H"
#include "fvcDdt.H"
#include "fvcDiv.H"
#include "fvcLaplacian.H"
#include "fvcFlux.H"
#include "fvm.H"
#include "fvcDdt.H"
#include "addToRunTimeSelectionTable.H"
#include "zeroGradientFvPatchFields.H"
#include "mappedFieldFvPatchField.H"

4
src/rigidBodyMeshMotion/rigidBodyMeshMotion.C
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2016 OpenFOAM Foundation
\\/ M anipulation |
\\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -96,7 +96,7 @@ Foam::rigidBodyMeshMotion::rigidBodyMeshMotion
mesh.time().timeName(),
"uniform",
mesh
).headerOk()
).typeHeaderOk<IOdictionary>(true)
? IOdictionary
(
IOobject

4
src/sampling/meshToMesh/meshToMeshTemplates.C
View File

@ -533,7 +533,7 @@ void Foam::meshToMesh::mapAndOpSrcToTgt
const CombineOp& cop
) const
{
tgtField = pTraits<Type>::zero;
tgtField = Type(Zero);
AMI.interpolateToTarget
(
@ -771,7 +771,7 @@ void Foam::meshToMesh::mapAndOpTgtToSrc
const CombineOp& cop
) const
{
srcField = pTraits<Type>::zero;
srcField = Type(Tero);
AMI.interpolateToSource
(

2
src/sampling/sampledSet/sampledSetsFunctionObject/sampledSetsDict
View File

@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/

6
src/sampling/sampledSurface/isoSurface/isoSurfaceTemplates.C
View File

@ -747,8 +747,8 @@ Foam::isoSurface::interpolate
)
{
// One value per point
tmp<Field<Type> > tvalues(new Field<Type>(nPoints, pTraits<Type>::zero));
Field<Type>& values = tvalues();
tmp<Field<Type>> tvalues(new Field<Type>(nPoints, Type(Zero)));
Field<Type>& values = tvalues.ref();
// Pass1: unweighted average of merged point values
@ -786,7 +786,7 @@ Foam::isoSurface::interpolate
// Note: zeroing should not be necessary if interpolation only done
// for newly introduced points (i.e. not in triPointMergeMap)
values[pointI] = pTraits<Type>::zero;
values[pointI] = Type(Zero);
forAll(oldPoints, j)
{
values[pointI] = w[j]*unmergedValues[oldPoints[j]];

2
src/sampling/sampledSurface/writers/boundaryData/boundaryDataSurfaceWriterTemplates.C
View File

@ -123,7 +123,7 @@ Foam::fileName Foam::boundaryDataSurfaceWriter::writeTemplate
IOobject::NO_WRITE,
false
),
pTraits<Type>::zero,
Type(Zero),
values
);

4
src/sampling/sampledSurface/writers/makeSurfaceWriterMethods.H
View File

@ -47,7 +47,7 @@ namespace Foam
#define defineSurfaceWriterWriteField(ThisClass, FieldType) \
void ThisClass::write \
Foam::fileName ThisClass::write \
( \
const fileName& outputDir, \
const fileName& surfaceName, \
@ -59,7 +59,7 @@ namespace Foam
const bool verbose \
) const \
{ \
writeTemplate \
return writeTemplate \
( \
outputDir, \
surfaceName, \

2
src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveViewFactor/greyDiffusiveViewFactorFixedValueFvPatchScalarField.C
View File

@ -151,7 +151,7 @@ greyDiffusiveViewFactorFixedValueFvPatchScalarField::Qro() const
const radiationModel& radiation =
db().lookupObject<radiationModel>("radiationProperties");
tQrt() += patch().lookupPatchField<volScalarField,scalar>
tQrt.ref() += patch().lookupPatchField<volScalarField,scalar>
(
radiation.externalRadHeatFieldName_
);

2
src/thermophysicalModels/radiation/radiationModels/solarLoad/faceShading/faceShading.C
View File

@ -379,7 +379,7 @@ void Foam::faceShading::calculate()
)
);
volScalarField& hitFaces = thitFaces();
volScalarField& hitFaces = thitFaces.ref();
hitFaces.boundaryField() = 0.0;
forAll(rayStartFaces_, i)

22
src/thermophysicalModels/radiation/radiationModels/solarLoad/solarLoad.C
View File

@ -489,7 +489,7 @@ void Foam::radiation::solarLoad::calculateQdiff
localCoarseRave,
Rave.size(),
startI
).assign(Rave);
) = Rave;
const vectorList coarseNSf = cpp.faceNormals();
@ -498,25 +498,19 @@ void Foam::radiation::solarLoad::calculateQdiff
localCoarseNorm,
cpp.size(),
startI
).assign(coarseNSf);
) = coarseNSf;
startI += cpp.size();
}
SubList<scalar>(compactCoarsePartialArea, nLocalVFCoarseFaces).assign
(
localCoarsePartialArea
);
SubList<scalar>(compactCoarsePartialArea, nLocalVFCoarseFaces) =
localCoarsePartialArea;
SubList<scalar>(compactCoarseRave, nLocalVFCoarseFaces).assign
(
localCoarseRave
);
SubList<scalar>(compactCoarseRave, nLocalVFCoarseFaces) =
localCoarseRave;
SubList<vector>(compactCoarseNorm, nLocalVFCoarseFaces).assign
(
localCoarseNorm
);
SubList<vector>(compactCoarseNorm, nLocalVFCoarseFaces) =
localCoarseNorm;
map_->distribute(compactCoarsePartialArea);
map_->distribute(compactCoarseRave);

4
tutorials/incompressible/pisoFoam/laminar/porousBlockage/0/U
View File

@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\ / O peration | Version: plus |
| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile

4
tutorials/incompressible/pisoFoam/laminar/porousBlockage/0/p
View File

@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\ / O peration | Version: plus |
| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile

Some files were not shown because too many files have changed in this diff Show More