songtianlun/openfoam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of /home/dm4/OpenFOAM/OpenFOAM-dev

Browse Source
This commit is contained in:
laurence 2012-02-03 14:44:19 +00:00
commit cf2d95b59e
41 changed files with 260 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -46,6 +46,8 @@ Description
#include "snapParameters.H"
#include "layerParameters.H"
#include "faceSet.H"
#include "motionSmoother.H"
using namespace Foam;
@ -122,6 +124,13 @@ int main(int argc, char *argv[])
{
# include "addOverwriteOption.H"
Foam::argList::addBoolOption
(
"checkOnly",
"check existing mesh against snappyHexMeshDict settings"
);
# include "setRootCase.H"
# include "createTime.H"
runTime.functionObjects().off();
@ -132,24 +141,13 @@ int main(int argc, char *argv[])
const bool overwrite = args.optionFound("overwrite");
const bool checkOnly = args.optionFound("checkOnly");
// Check patches and faceZones are synchronised
mesh.boundaryMesh().checkParallelSync(true);
meshRefinement::checkCoupledFaceZones(mesh);
// Read decomposePar dictionary
IOdictionary decomposeDict
(
IOobject
(
"decomposeParDict",
runTime.system(),
mesh,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
// Read meshing dictionary
IOdictionary meshDict
(
@ -186,6 +184,51 @@ int main(int argc, char *argv[])
);
if (checkOnly)
{
Info<< "Checking initial mesh ..." << endl;
faceSet wrongFaces(mesh, "wrongFaces", mesh.nFaces()/100);
motionSmoother::checkMesh(false, mesh, motionDict, wrongFaces);
const label nInitErrors = returnReduce
(
wrongFaces.size(),
sumOp<label>()
);
Info<< "Detected " << nInitErrors << " illegal faces"
<< " (concave, zero area or negative cell pyramid volume)"
<< endl;
if (nInitErrors > 0)
{
Info<< "Writing " << nInitErrors
<< " faces in error to set "
<< wrongFaces.name() << endl;
wrongFaces.instance() = mesh.pointsInstance();
wrongFaces.write();
}
Info<< "End\n" << endl;
return 0;
}
// Read decomposePar dictionary
IOdictionary decomposeDict
(
IOobject
(
"decomposeParDict",
runTime.system(),
mesh,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE
)
);
// Debug
// ~~~~~

15
applications/utilities/mesh/manipulation/topoSet/topoSet.C
View File

@ -286,7 +286,8 @@ int main(int argc, char *argv[])
)
{
currentSet = topoSet::New(setType, mesh, setName, 10000);
Info<< "Created set " << setName << endl;
Info<< "Created " << currentSet().type() << " "
<< setName << endl;
}
else if (action == topoSetSource::REMOVE)
{
@ -301,7 +302,8 @@ int main(int argc, char *argv[])
setName,
IOobject::MUST_READ
);
Info<< "Read set " << setName << " with size "
Info<< "Read set " << currentSet().type() << " "
<< setName << " with size "
<< returnReduce(currentSet().size(), sumOp<label>())
<< endl;
}
@ -367,19 +369,19 @@ int main(int argc, char *argv[])
break;
case topoSetSource::CLEAR:
Info<< " Clearing set" << endl;
Info<< " Clearing " << currentSet().type() << endl;
currentSet().clear();
currentSet().write();
break;
case topoSetSource::INVERT:
Info<< " Inverting set" << endl;
Info<< " Inverting " << currentSet().type() << endl;
currentSet().invert(currentSet().maxSize(mesh));
currentSet().write();
break;
case topoSetSource::REMOVE:
Info<< " Removing set" << endl;
Info<< " Removing " << currentSet().type() << endl;
removeSet(mesh, setType, setName);
break;
@ -392,7 +394,8 @@ int main(int argc, char *argv[])
if (currentSet.valid())
{
Info<< " Set " << currentSet().name()
Info<< " " << currentSet().type() << " "
<< currentSet().name()
<< " now size "
<< returnReduce(currentSet().size(), sumOp<label>())
<< endl;

30
bin/tools/pre-commit-hook
View File

@ -3,7 +3,7 @@
# ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration |
# \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
# \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
# \\/ M anipulation |
#------------------------------------------------------------------------------
# License
@ -268,7 +268,7 @@ checkLineLengthNonDirective()
#
# check that OpenFOAM Foundation copyright is currents
# check that OpenFOAM Foundation copyright is current
#
checkCopyright()
{
@ -277,12 +277,28 @@ checkCopyright()
for f in $fileList
do
sYear=`grep "Copyright.*OpenFOAM" $f | sed 's/[^0-9]//g'`
if [ "$sYear" != "" ] && [ "$year" != "$sYear" ]; then
echo "Updated copyright for: $f"
sed -i "s/$sYear OpenFOAM/$year OpenFOAM/g" $f
startYear=`grep "Copyright.*OpenFOAM" $f | sed 's/[^0-9]*\([0-9]*\).*/\1/g'`
endYear=`grep "Copyright.*-.*OpenFOAM" $f | sed 's/[^-]*-\([0-9]*\).*/\1/g'`
#echo "startYear=$startYear endYear=$endYear"
if [ "$startYear" != "" ]
then
if [ "$endYear" != "" ]
then
# Date is of type 2011-2012 OpenFOAM Foundation
if [ "$year" != "$endYear" ]
then
echo "Updated copyright for: $f"
sed -i "s/$startYear-$endYear OpenFOAM/$startYear-$year OpenFOAM/g" $f
fi
else
# Date is of type 2011 OpenFOAM Foundation
if [ "$year" != "$startYear" ]
then
echo "Updated copyright for: $f"
sed -i "s/$startYear OpenFOAM/$startYear-$year OpenFOAM/g" $f
fi
fi
fi
done
}

12
src/OpenFOAM/primitives/functions/DataEntry/CSV/CSV.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -74,7 +74,15 @@ namespace Foam
template<class Type>
void Foam::CSV<Type>::read()
{
IFstream is(fName_.expand());
fileName expandedFile(fName_);
IFstream is(expandedFile.expand());
if (!is.good())
{
FatalIOErrorIn("CSV<Type>::read()", is)
<< "Cannot open CSV file for reading."
<< exit(FatalIOError);
}
DynamicList<Tuple2<scalar, Type> > values;

7
src/OpenFOAM/primitives/functions/DataEntry/CSV/CSV.H
View File

@ -29,13 +29,14 @@ Description
e.g. time
\verbatim
<entryName> csvFile
<entryName> csvFile;
csvFileCoeffs
{
hasHeaderLine true;
refColumn 0; // reference column index
componentColumns (0 1 2); // component column indices
componentColumns (1 2 3); // component column indices
separator ","; // optional (defaults to ",")
fileName fileXYZ; // name of csv data file
fileName "fileXYZ"; // name of csv data file
outOfBounds clamp; // optional out-of-bounds handling
}
\endverbatim

11
src/OpenFOAM/primitives/functions/DataEntry/CSV/CSVIO.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -62,11 +62,16 @@ template<class Type>
void Foam::CSV<Type>::writeData(Ostream& os) const
{
DataEntry<Type>::writeData(os);
os << token::END_STATEMENT << nl;
os << indent << word(type() + "Coeffs") << nl;
os << indent << token::BEGIN_BLOCK << incrIndent << nl;
os.writeKeyword("headerLine") << headerLine_ << token::END_STATEMENT << nl;
// Note: for TableBase write the dictionary entries it needs but not
// the values themselves
TableBase<Type>::writeEntries(os);
os.writeKeyword("hasHeaderLine") << headerLine_ << token::END_STATEMENT
<< nl;
os.writeKeyword("refColumn") << refColumn_ << token::END_STATEMENT << nl;
os.writeKeyword("componentColumns") << componentColumns_
<< token::END_STATEMENT << nl;

35
src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntry.C
View File

@ -76,6 +76,23 @@ Type Foam::DataEntry<Type>::value(const scalar x) const
}
template<class Type>
Foam::tmp<Foam::Field<Type> > Foam::DataEntry<Type>::value
(
const scalarField& x
) const
{
tmp<Field<Type> > tfld(new Field<Type>(x.size()));
Field<Type>& fld = tfld();
forAll(x, i)
{
fld[i] = this->value(x[i]);
}
return tfld;
}
template<class Type>
Type Foam::DataEntry<Type>::integrate(const scalar x1, const scalar x2) const
{
@ -92,6 +109,24 @@ Type Foam::DataEntry<Type>::integrate(const scalar x1, const scalar x2) const
}
template<class Type>
Foam::tmp<Foam::Field<Type> > Foam::DataEntry<Type>::integrate
(
const scalarField& x1,
const scalarField& x2
) const
{
tmp<Field<Type> > tfld(new Field<Type>(x1.size()));
Field<Type>& fld = tfld();
forAll(x1, i)
{
fld[i] = this->integrate(x1[i], x2[i]);
}
return tfld;
}
// * * * * * * * * * * * * * * IOStream operators * * * * * * * * * * * * * //
#include "DataEntryIO.C"

11
src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntry.H
View File

@ -40,6 +40,7 @@ SourceFiles
#define DataEntry_H
#include "dictionary.H"
#include "Field.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -145,9 +146,19 @@ public:
//- Return value as a function of (scalar) independent variable
virtual Type value(const scalar x) const;
//- Return value as a function of (scalar) independent variable
virtual tmp<Field<Type> > value(const scalarField& x) const;
//- Integrate between two (scalar) values
virtual Type integrate(const scalar x1, const scalar x2) const;
//- Integrate between two (scalar) values
virtual tmp<Field<Type> > integrate
(
const scalarField& x1,
const scalarField& x2
) const;
// I/O

6
src/OpenFOAM/primitives/functions/DataEntry/Table/TableBase.H
View File

@ -148,8 +148,12 @@ public:
const TableBase<Type>& tbl
);
//- Write in dictionary format
//- Write all table data in dictionary format
virtual void writeData(Ostream& os) const;
//- Write keywords only in dictionary format. Used for non-inline
// table types
virtual void writeEntries(Ostream& os) const;
};

14
src/OpenFOAM/primitives/functions/DataEntry/Table/TableBaseIO.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -61,6 +61,18 @@ template<class Type>
void Foam::TableBase<Type>::writeData(Ostream& os) const
{
os << nl << indent << table_ << token::END_STATEMENT << nl;
writeEntries(os);
}
template<class Type>
void Foam::TableBase<Type>::writeEntries(Ostream& os) const
{
if (boundsHandling_ != CLAMP)
{
os.writeKeyword("outOfBounds") << boundsHandlingToWord(boundsHandling_)
<< token::END_STATEMENT << nl;
}
}

5
src/OpenFOAM/primitives/functions/DataEntry/TableFile/TableFile.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -37,7 +37,8 @@ Foam::TableFile<Type>::TableFile(const word& entryName, const dictionary& dict)
const dictionary coeffs(dict.subDict(type() + "Coeffs"));
coeffs.lookup("fileName") >> fName_;
IFstream is(fName_.expand());
fileName expandedFile(fName_);
IFstream is(expandedFile.expand());
is >> this->table_;

7
src/OpenFOAM/primitives/functions/DataEntry/TableFile/TableFileIO.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -55,6 +55,11 @@ void Foam::TableFile<Type>::writeData(Ostream& os) const
os << token::END_STATEMENT << nl
<< indent << word(type() + "Coeffs") << nl
<< indent << token::BEGIN_BLOCK << nl << incrIndent;
// Note: for TableBase write the dictionary entries it needs but not
// the values themselves
TableBase<Type>::writeEntries(os);
os.writeKeyword("fileName")<< fName_ << token::END_STATEMENT << nl;
os << decrIndent << indent << token::END_BLOCK << endl;
}

6
src/sampling/sampledSet/circle/circleSet.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -175,7 +175,7 @@ Foam::circleSet::circleSet
(
const word& name,
const polyMesh& mesh,
meshSearch& searchEngine,
const meshSearch& searchEngine,
const word& axis,
const point& origin,
const vector& circleAxis,
@ -202,7 +202,7 @@ Foam::circleSet::circleSet
(
const word& name,
const polyMesh& mesh,
meshSearch& searchEngine,
const meshSearch& searchEngine,
const dictionary& dict
)
:

6
src/sampling/sampledSet/circle/circleSet.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -104,7 +104,7 @@ public:
(
const word& name,
const polyMesh& mesh,
meshSearch& searchEngine,
const meshSearch& searchEngine,
const word& axis,
const point& origin,
const vector& circleAxis,
@ -117,7 +117,7 @@ public:
(
const word& name,
const polyMesh& mesh,
meshSearch& searchEngine,
const meshSearch& searchEngine,
const dictionary& dict
);

6
src/sampling/sampledSet/cloud/cloudSet.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -108,7 +108,7 @@ Foam::cloudSet::cloudSet
(
const word& name,
const polyMesh& mesh,
meshSearch& searchEngine,
const meshSearch& searchEngine,
const word& axis,
const List<point>& sampleCoords
)
@ -129,7 +129,7 @@ Foam::cloudSet::cloudSet
(
const word& name,
const polyMesh& mesh,
meshSearch& searchEngine,
const meshSearch& searchEngine,
const dictionary& dict
)
:

6
src/sampling/sampledSet/cloud/cloudSet.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -89,7 +89,7 @@ public:
(
const word& name,
const polyMesh& mesh,
meshSearch& searchEngine,
const meshSearch& searchEngine,
const word& axis,
const List<point>& sampleCoords
);
@ -99,7 +99,7 @@ public:
(
const word& name,
const polyMesh& mesh,
meshSearch& searchEngine,
const meshSearch& searchEngine,
const dictionary& dict
);

6
src/sampling/sampledSet/face/faceOnlySet.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -331,7 +331,7 @@ Foam::faceOnlySet::faceOnlySet
(
const word& name,
const polyMesh& mesh,
meshSearch& searchEngine,
const meshSearch& searchEngine,
const word& axis,
const point& start,
const point& end
@ -354,7 +354,7 @@ Foam::faceOnlySet::faceOnlySet
(
const word& name,
const polyMesh& mesh,
meshSearch& searchEngine,
const meshSearch& searchEngine,
const dictionary& dict
)
:

6
src/sampling/sampledSet/face/faceOnlySet.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -102,7 +102,7 @@ public:
(
const word& name,
const polyMesh& mesh,
meshSearch& searchEngine,
const meshSearch& searchEngine,
const word& axis,
const point& start,
const point& end
@ -113,7 +113,7 @@ public:
(
const word& name,
const polyMesh& mesh,
meshSearch& searchEngine,
const meshSearch& searchEngine,
const dictionary& dict
);

6
src/sampling/sampledSet/midPoint/midPointSet.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -117,7 +117,7 @@ Foam::midPointSet::midPointSet
(
const word& name,
const polyMesh& mesh,
meshSearch& searchEngine,
const meshSearch& searchEngine,
const word& axis,
const point& start,
const point& end
@ -138,7 +138,7 @@ Foam::midPointSet::midPointSet
(
const word& name,
const polyMesh& mesh,
meshSearch& searchEngine,
const meshSearch& searchEngine,
const dictionary& dict
)
:

6
src/sampling/sampledSet/midPoint/midPointSet.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -70,7 +70,7 @@ public:
(
const word& name,
const polyMesh& mesh,
meshSearch& searchEngine,
const meshSearch& searchEngine,
const word& axis,
const point& start,
const point& end
@ -81,7 +81,7 @@ public:
(
const word& name,
const polyMesh& mesh,
meshSearch& searchEngine,
const meshSearch& searchEngine,
const dictionary& dict
);

6
src/sampling/sampledSet/midPointAndFace/midPointAndFaceSet.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -144,7 +144,7 @@ Foam::midPointAndFaceSet::midPointAndFaceSet
(
const word& name,
const polyMesh& mesh,
meshSearch& searchEngine,
const meshSearch& searchEngine,
const word& axis,
const point& start,
const point& end
@ -165,7 +165,7 @@ Foam::midPointAndFaceSet::midPointAndFaceSet
(
const word& name,
const polyMesh& mesh,
meshSearch& searchEngine,
const meshSearch& searchEngine,
const dictionary& dict
)
:

6
src/sampling/sampledSet/midPointAndFace/midPointAndFaceSet.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -71,7 +71,7 @@ public:
(
const word& name,
const polyMesh& mesh,
meshSearch& searchEngine,
const meshSearch& searchEngine,
const word& axis,
const point& start,
const point& end
@ -82,7 +82,7 @@ public:
(
const word& name,
const polyMesh& mesh,
meshSearch& searchEngine,
const meshSearch& searchEngine,
const dictionary& dict
);

6
src/sampling/sampledSet/patchCloud/patchCloudSet.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -266,7 +266,7 @@ Foam::patchCloudSet::patchCloudSet
(
const word& name,
const polyMesh& mesh,
meshSearch& searchEngine,
const meshSearch& searchEngine,
const word& axis,
const List<point>& sampleCoords,
const labelHashSet& patchSet,
@ -291,7 +291,7 @@ Foam::patchCloudSet::patchCloudSet
(
const word& name,
const polyMesh& mesh,
meshSearch& searchEngine,
const meshSearch& searchEngine,
const dictionary& dict
)
:

6
src/sampling/sampledSet/patchCloud/patchCloudSet.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -94,7 +94,7 @@ public:
(
const word& name,
const polyMesh& mesh,
meshSearch& searchEngine,
const meshSearch& searchEngine,
const word& axis,
const List<point>& sampleCoords,
const labelHashSet& patchSet,
@ -106,7 +106,7 @@ public:
(
const word& name,
const polyMesh& mesh,
meshSearch& searchEngine,
const meshSearch& searchEngine,
const dictionary& dict
);

2
src/sampling/sampledSet/patchSeed/patchSeedSet.C
View File

@ -205,7 +205,7 @@ Foam::patchSeedSet::patchSeedSet
(
const word& name,
const polyMesh& mesh,
meshSearch& searchEngine,
const meshSearch& searchEngine,
const dictionary& dict
)
:

14
src/sampling/sampledSet/patchSeed/patchSeedSet.H
View File

@ -95,24 +95,12 @@ public:
// Constructors
// //- Construct from components
// patchSeedSet
// (
// const word& name,
// const polyMesh& mesh,
// meshSearch& searchEngine,
// const word& axis,
// const List<point>& sampleCoords,
// const labelHashSet& patchSet,
// const scalar searchDist
// );
//- Construct from dictionary
patchSeedSet
(
const word& name,
const polyMesh& mesh,
meshSearch& searchEngine,
const meshSearch& searchEngine,
const dictionary& dict
);

6
src/sampling/sampledSet/polyLine/polyLineSet.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -350,7 +350,7 @@ Foam::polyLineSet::polyLineSet
(
const word& name,
const polyMesh& mesh,
meshSearch& searchEngine,
const meshSearch& searchEngine,
const word& axis,
const List<point>& sampleCoords
)
@ -371,7 +371,7 @@ Foam::polyLineSet::polyLineSet
(
const word& name,
const polyMesh& mesh,
meshSearch& searchEngine,
const meshSearch& searchEngine,
const dictionary& dict
)
:

6
src/sampling/sampledSet/polyLine/polyLineSet.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -101,7 +101,7 @@ public:
(
const word& name,
const polyMesh& mesh,
meshSearch& searchEngine,
const meshSearch& searchEngine,
const word& axis,
const List<point>& samplePoints
);
@ -111,7 +111,7 @@ public:
(
const word& name,
const polyMesh& mesh,
meshSearch& searchEngine,
const meshSearch& searchEngine,
const dictionary& dict
);

11
src/sampling/sampledSet/sampledSet/sampledSet.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -406,7 +406,7 @@ Foam::sampledSet::sampledSet
(
const word& name,
const polyMesh& mesh,
meshSearch& searchEngine,
const meshSearch& searchEngine,
const word& axis
)
:
@ -423,7 +423,7 @@ Foam::sampledSet::sampledSet
(
const word& name,
const polyMesh& mesh,
meshSearch& searchEngine,
const meshSearch& searchEngine,
const dictionary& dict
)
:
@ -448,7 +448,7 @@ Foam::autoPtr<Foam::sampledSet> Foam::sampledSet::New
(
const word& name,
const polyMesh& mesh,
meshSearch& searchEngine,
const meshSearch& searchEngine,
const dictionary& dict
)
{
@ -462,7 +462,8 @@ Foam::autoPtr<Foam::sampledSet> Foam::sampledSet::New
FatalErrorIn
(
"sampledSet::New"
"(const word&, const polyMesh&, meshSearch&, const dictionary&)"
"(const word&, const polyMesh&, const meshSearch&"
", const dictionary&)"
) << "Unknown sample type "
<< sampleType << nl << nl
<< "Valid sample types : " << endl

18
src/sampling/sampledSet/sampledSet/sampledSet.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -69,7 +69,7 @@ class sampledSet
const polyMesh& mesh_;
//- Reference to mesh searching class
meshSearch& searchEngine_;
const meshSearch& searchEngine_;
protected:
@ -159,7 +159,7 @@ public:
(
const word& name,
const polyMesh& mesh,
meshSearch& searchEngine,
const meshSearch& searchEngine,
const dictionary& dict
),
(name, mesh, searchEngine, dict)
@ -171,11 +171,11 @@ public:
class iNew
{
const polyMesh& mesh_;
meshSearch& searchEngine_;
const meshSearch& searchEngine_;
public:
iNew(const polyMesh& mesh, meshSearch& searchEngine)
iNew(const polyMesh& mesh, const meshSearch& searchEngine)
:
mesh_(mesh),
searchEngine_(searchEngine)
@ -204,7 +204,7 @@ public:
(
const word& name,
const polyMesh& mesh,
meshSearch& searchEngine,
const meshSearch& searchEngine,
const word& axis
);
@ -213,7 +213,7 @@ public:
(
const word& name,
const polyMesh& mesh,
meshSearch& searchEngine,
const meshSearch& searchEngine,
const dictionary& dict
);
@ -232,7 +232,7 @@ public:
(
const word& name,
const polyMesh& mesh,
meshSearch& searchEngine,
const meshSearch& searchEngine,
const dictionary& dict
);
@ -248,7 +248,7 @@ public:
return mesh_;
}
meshSearch& searchEngine() const
const meshSearch& searchEngine() const
{
return searchEngine_;
}

4
src/sampling/sampledSet/triSurfaceMeshPointSet/triSurfaceMeshPointSet.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -108,7 +108,7 @@ Foam::triSurfaceMeshPointSet::triSurfaceMeshPointSet
(
const word& name,
const polyMesh& mesh,
meshSearch& searchEngine,
const meshSearch& searchEngine,
const dictionary& dict
)
:

4
src/sampling/sampledSet/triSurfaceMeshPointSet/triSurfaceMeshPointSet.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -90,7 +90,7 @@ public:
(
const word& name,
const polyMesh& mesh,
meshSearch& searchEngine,
const meshSearch& searchEngine,
const dictionary& dict
);

6
src/sampling/sampledSet/uniform/uniformSet.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -425,7 +425,7 @@ Foam::uniformSet::uniformSet
(
const word& name,
const polyMesh& mesh,
meshSearch& searchEngine,
const meshSearch& searchEngine,
const word& axis,
const point& start,
const point& end,
@ -450,7 +450,7 @@ Foam::uniformSet::uniformSet
(
const word& name,
const polyMesh& mesh,
meshSearch& searchEngine,
const meshSearch& searchEngine,
const dictionary& dict
)
:

6
src/sampling/sampledSet/uniform/uniformSet.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -118,7 +118,7 @@ public:
(
const word& name,
const polyMesh& mesh,
meshSearch& searchEngine,
const meshSearch& searchEngine,
const word& axis,
const point& start,
const point& end,
@ -130,7 +130,7 @@ public:
(
const word& name,
const polyMesh& mesh,
meshSearch& searchEngine,
const meshSearch& searchEngine,
const dictionary& dict
);

2
src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License

2
src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License

2
src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License

2
src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License

2
src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License

2
src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkAtmRoughWallFunction/nutkAtmRoughWallFunctionFvPatchScalarField.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License

2
src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkAtmRoughWallFunction/nutkAtmRoughWallFunctionFvPatchScalarField.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License