exaFOAM/foam-extend4.1-coherent-io
Archived
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

BUGFIX: Minor fixes and formatting. Author: Hrvoje Jasak. Merge: Dominik Christ.

Browse source
This commit is contained in:
Dominik Christ 2014-09-30 13:38:33 +01:00
commit 69d25c0528
14 changed files with 40 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L
View file

@ -33,9 +33,9 @@ Description
#undef yyFlexLexer
/* ------------------------------------------------------------------------- *\
/* ------------------------------------------------------------------------ *\
------ local definitions
\* ------------------------------------------------------------------------- */
\* ------------------------------------------------------------------------ */
#include <sstream>
// For EOF only
@ -124,9 +124,9 @@ elementType ^{space}"TYPE"{cspace}
%}
/* ------------------------------------------------------------------------- *\
/* ------------------------------------------------------------------------ *\
------ Start Lexing ------
\* ------------------------------------------------------------------------- */
\* ------------------------------------------------------------------------ */
{node}{label}{cspace}{x}{cspace}{y}{cspace}{z}{space}\n {
IStringStream nodeStream(YYText());
@ -249,16 +249,16 @@ elementType ^{space}"TYPE"{cspace}
/* ------------------------------------------------------------------------- *\
/* ------------------------------------------------------------------------ *\
------ Ignore remaining space and \n s. Any other characters are errors.
\* ------------------------------------------------------------------------- */
\* ------------------------------------------------------------------------ */
.|\n {}
/* ------------------------------------------------------------------------- *\
/* ------------------------------------------------------------------------ *\
------ On EOF return to previous file, if none exists terminate.
\* ------------------------------------------------------------------------- */
\* ------------------------------------------------------------------------ */
<<EOF>> {
yyterminate();
@ -270,16 +270,24 @@ elementType ^{space}"TYPE"{cspace}
#include <fstream>
using std::ifstream;
label findFace(const polyMesh& mesh, const face& f)
{
if (f.empty())
{
FatalErrorIn("findFace(const polyMesh&, const face&)")
<< "Empty face found: " << f
<< exit(FatalError);
}
const faceList& faces = mesh.faces();
const labelList& pFaces = mesh.pointFaces()[f[0]];
forAll(pFaces, i)
forAll (pFaces, i)
{
label faceI = pFaces[i];
if (mesh.faces()[faceI] == f)
if (faces[faceI] == f)
{
return faceI;
}

6
src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C
View file

@ -150,7 +150,7 @@ tmp<Field<Type> > cyclicFvPatchField<Type>::patchNeighbourField() const
if (doTransform())
{
for (label facei=0; facei<sizeby2; facei++)
for (label facei = 0; facei < sizeby2; facei++)
{
pnf[facei] = transform
(
@ -165,7 +165,7 @@ tmp<Field<Type> > cyclicFvPatchField<Type>::patchNeighbourField() const
}
else
{
for (label facei=0; facei<sizeby2; facei++)
for (label facei = 0; facei < sizeby2; facei++)
{
pnf[facei] = iField[faceCells[facei + sizeby2]];
pnf[facei + sizeby2] = iField[faceCells[facei]];
@ -193,7 +193,7 @@ void cyclicFvPatchField<Type>::updateInterfaceMatrix
label sizeby2 = this->size()/2;
const unallocLabelList& faceCells = cyclicPatch_.faceCells();
for (label facei=0; facei<sizeby2; facei++)
for (label facei = 0; facei < sizeby2; facei++)
{
pnf[facei] = psiInternal[faceCells[facei + sizeby2]];
pnf[facei + sizeby2] = psiInternal[faceCells[facei]];

2
src/finiteVolume/fvMesh/fvPatches/constraint/cyclic/cyclicFvPatch.C
View file

@ -46,7 +46,7 @@ void cyclicFvPatch::makeWeights(scalarField& w) const
const scalarField& magFa = magSf();
// Note: mag in the dot-product.
// For all valid meshes, the non-orthogonality will be less that
// For all valid meshes, the non-orthogonality will be less than
// 90 deg and the dot-product will be positive. For invalid
// meshes (d & s <= 0), this will stabilise the calculation
// but the result will be poor. HJ, 24/Aug/2011

2
src/finiteVolume/fvMesh/fvPatches/constraint/cyclicGgi/cyclicGgiFvPatch.C
View file

@ -55,7 +55,7 @@ void Foam::cyclicGgiFvPatch::makeWeights(scalarField& w) const
vectorField n = nf();
// Note: mag in the dot-product.
// For all valid meshes, the non-orthogonality will be less that
// For all valid meshes, the non-orthogonality will be less than
// 90 deg and the dot-product will be positive. For invalid
// meshes (d & s <= 0), this will stabilise the calculation
// but the result will be poor. HJ, 24/Aug/2011

2
src/finiteVolume/fvMesh/fvPatches/constraint/ggi/ggiFvPatch.C
View file

@ -65,7 +65,7 @@ void Foam::ggiFvPatch::makeWeights(scalarField& w) const
vectorField n = nf();
// Note: mag in the dot-product.
// For all valid meshes, the non-orthogonality will be less that
// For all valid meshes, the non-orthogonality will be less than
// 90 deg and the dot-product will be positive. For invalid
// meshes (d & s <= 0), this will stabilise the calculation
// but the result will be poor. HJ, 24/Aug/2011

2
src/finiteVolume/fvMesh/fvPatches/constraint/mixingPlane/mixingPlaneFvPatch.C
View file

@ -64,7 +64,7 @@ void Foam::mixingPlaneFvPatch::makeWeights(scalarField& w) const
vectorField n = nf();
// Note: mag in the dot-product.
// For all valid meshes, the non-orthogonality will be less that
// For all valid meshes, the non-orthogonality will be less than
// 90 deg and the dot-product will be positive. For invalid
// meshes (d & s <= 0), this will stabilise the calculation
// but the result will be poor. HJ, 24/Aug/2011

2
src/finiteVolume/fvMesh/fvPatches/constraint/overlapGgi/overlapGgiFvPatch.C
View file

@ -52,7 +52,7 @@ void Foam::overlapGgiFvPatch::makeWeights(scalarField& w) const
vectorField n = nf();
// Note: mag in the dot-product.
// For all valid meshes, the non-orthogonality will be less that
// For all valid meshes, the non-orthogonality will be less than
// 90 deg and the dot-product will be positive. For invalid
// meshes (d & s <= 0), this will stabilise the calculation
// but the result will be poor. HJ, 24/Aug/2011

2
src/finiteVolume/fvMesh/fvPatches/constraint/processor/processorFvPatch.C
View file

@ -47,7 +47,7 @@ void processorFvPatch::makeWeights(scalarField& w) const
// The face normals point in the opposite direction on the other side
// Note: mag in the dot-product.
// For all valid meshes, the non-orthogonality will be less that
// For all valid meshes, the non-orthogonality will be less than
// 90 deg and the dot-product will be positive. For invalid
// meshes (d & s <= 0), this will stabilise the calculation
// but the result will be poor. HJ, 24/Aug/2011

2
src/finiteVolume/fvMesh/fvPatches/constraint/regionCouple/regionCoupleFvPatch.C
View file

@ -62,7 +62,7 @@ void Foam::regionCoupleFvPatch::makeWeights(scalarField& w) const
vectorField n = nf();
// Note: mag in the dot-product.
// For all valid meshes, the non-orthogonality will be less that
// For all valid meshes, the non-orthogonality will be less than
// 90 deg and the dot-product will be positive. For invalid
// meshes (d & s <= 0), this will stabilise the calculation
// but the result will be poor. HJ, 24/Aug/2011

2
src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolation.C
View file

@ -171,7 +171,7 @@ void Foam::surfaceInterpolation::makeWeights() const
forAll (owner, facei)
{
// Note: mag in the dot-product.
// For all valid meshes, the non-orthogonality will be less that
// For all valid meshes, the non-orthogonality will be less than
// 90 deg and the dot-product will be positive. For invalid
// meshes (d & s <= 0), this will stabilise the calculation
// but the result will be poor.

2
src/foam/meshes/polyMesh/polyPatches/constraint/overlapGgi/overlapGgiPolyPatch.H
View file

@ -87,6 +87,7 @@ class overlapGgiPolyPatch
// Number of copies in order to complete 360 degrees
const label nCopies_;
// Interpolation
//- Pointer to expanded master patch
@ -106,6 +107,7 @@ class overlapGgiPolyPatch
//- Reconstructed patch neighbour cell centres
mutable vectorField* reconFaceCellCentresPtr_;
// Private member functions
//- Return reference to patch-to-patch interpolation

2
src/foam/meshes/polyMesh/polyPatches/constraint/overlapGgi/overlapGgiPolyPatchTemplates.C
View file

@ -85,6 +85,7 @@ Foam::overlapGgiPolyPatch::expandData(const Field<Type>& pf) const
return texpandField;
}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class Type>
@ -138,4 +139,5 @@ Foam::overlapGgiPolyPatch::interpolate(const tmp<Field<Type> >& tpf) const
return tint;
}
// ************************************************************************* //

1
src/sampling/meshToMeshInterpolation/meshToMesh/calculateMeshToMeshAddressing.C
View file

@ -410,7 +410,6 @@ void meshToMesh::cellAddresses
}
}
}
}
}

12
src/sampling/meshToMeshInterpolation/meshToMesh/meshToMesh.H
View file

@ -275,7 +275,7 @@ public:
(
Field<Type>&,
const GeometricField<Type, fvPatchField, volMesh>&,
order=INTERPOLATE
order = INTERPOLATE
) const;
template<class Type>
@ -283,7 +283,7 @@ public:
(
Field<Type>&,
const tmp<GeometricField<Type, fvPatchField, volMesh> >&,
order=INTERPOLATE
order = INTERPOLATE
) const;
@ -293,7 +293,7 @@ public:
(
GeometricField<Type, fvPatchField, volMesh>&,
const GeometricField<Type, fvPatchField, volMesh>&,
order=INTERPOLATE
order = INTERPOLATE
) const;
template<class Type>
@ -301,7 +301,7 @@ public:
(
GeometricField<Type, fvPatchField, volMesh>&,
const tmp<GeometricField<Type, fvPatchField, volMesh> >&,
order=INTERPOLATE
order = INTERPOLATE
) const;
@ -310,14 +310,14 @@ public:
tmp<GeometricField<Type, fvPatchField, volMesh> > interpolate
(
const GeometricField<Type, fvPatchField, volMesh>&,
order=INTERPOLATE
order = INTERPOLATE
) const;
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh> > interpolate
(
const tmp<GeometricField<Type, fvPatchField, volMesh> >&,
order=INTERPOLATE
order = INTERPOLATE
) const;
};