diff --git a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C index d3627791c1d3d205eb15fdf8046505d8f8823088..40adb83035b70fa2b02bf9a154e265e81f06c132 100644 --- a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C +++ b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C @@ -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 // ~~~~~ diff --git a/applications/utilities/mesh/manipulation/topoSet/topoSet.C b/applications/utilities/mesh/manipulation/topoSet/topoSet.C index 5aedbdc775083ba7178456dc9d5ec955bda544b5..cd2a96fc12e056bb63c171d6de5a4d048a088c71 100644 --- a/applications/utilities/mesh/manipulation/topoSet/topoSet.C +++ b/applications/utilities/mesh/manipulation/topoSet/topoSet.C @@ -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; diff --git a/bin/tools/pre-commit-hook b/bin/tools/pre-commit-hook index 01ea8faaaf31874a3cd7cd8b04a3ea863611f13d..1a8ae0181ad7b0ceaff823c5ae3b25b2e9d7262a 100755 --- a/bin/tools/pre-commit-hook +++ b/bin/tools/pre-commit-hook @@ -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 } diff --git a/src/OpenFOAM/primitives/functions/DataEntry/CSV/CSV.C b/src/OpenFOAM/primitives/functions/DataEntry/CSV/CSV.C index 3fe17d24a01e1cbf6c973d3ce7e9ca448d171059..4719be11452ff760d4808066876f249dd9157f76 100644 --- a/src/OpenFOAM/primitives/functions/DataEntry/CSV/CSV.C +++ b/src/OpenFOAM/primitives/functions/DataEntry/CSV/CSV.C @@ -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; diff --git a/src/OpenFOAM/primitives/functions/DataEntry/CSV/CSV.H b/src/OpenFOAM/primitives/functions/DataEntry/CSV/CSV.H index a506deed354d2a42263c4478ef6462f1fa5bdc8b..905544b489e4998d03121defd425bbba0c764d25 100644 --- a/src/OpenFOAM/primitives/functions/DataEntry/CSV/CSV.H +++ b/src/OpenFOAM/primitives/functions/DataEntry/CSV/CSV.H @@ -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 diff --git a/src/OpenFOAM/primitives/functions/DataEntry/CSV/CSVIO.C b/src/OpenFOAM/primitives/functions/DataEntry/CSV/CSVIO.C index d16ca23ab89696b9a8a5169962c0c649bc180c61..b5bfad8b3af813f7bc72cbcd52cf3dbecb289586 100644 --- a/src/OpenFOAM/primitives/functions/DataEntry/CSV/CSVIO.C +++ b/src/OpenFOAM/primitives/functions/DataEntry/CSV/CSVIO.C @@ -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; diff --git a/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntry.C b/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntry.C index 3b972949bb1f4eef395a7c5202668b0cfaa9c264..c4083d85179e80a3495030c0c6f33c777fdaaf48 100644 --- a/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntry.C +++ b/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntry.C @@ -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" diff --git a/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntry.H b/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntry.H index 6ab51b98d335379d67fc4b83d2dca445eb9d6845..3061fa00f613ef34b6f4736910291f5f28112411 100644 --- a/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntry.H +++ b/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntry.H @@ -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 diff --git a/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBase.H b/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBase.H index 50ee3b955a39214572896d410018b0e09b9dcf1f..a5cd5edeea8579f61ae54d7ff39794c965c70266 100644 --- a/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBase.H +++ b/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBase.H @@ -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; }; diff --git a/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBaseIO.C b/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBaseIO.C index 438c657a8f19e22acd142f423e69328d623bea94..667ac72be23b8cab68a69f3df477e78e3d525ece 100644 --- a/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBaseIO.C +++ b/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBaseIO.C @@ -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; + } } diff --git a/src/OpenFOAM/primitives/functions/DataEntry/TableFile/TableFile.C b/src/OpenFOAM/primitives/functions/DataEntry/TableFile/TableFile.C index 9c34b0cd1c2bf38ac75213b2704bb22288e0454d..c2553ee03d916b38cd2a6b69cb51f9bc8eaaec89 100644 --- a/src/OpenFOAM/primitives/functions/DataEntry/TableFile/TableFile.C +++ b/src/OpenFOAM/primitives/functions/DataEntry/TableFile/TableFile.C @@ -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_; diff --git a/src/OpenFOAM/primitives/functions/DataEntry/TableFile/TableFileIO.C b/src/OpenFOAM/primitives/functions/DataEntry/TableFile/TableFileIO.C index 6e2c4d339b2bf38b4b3ce6e5c04af9bb2780733c..b213ad8b139515187911e9fea20a731c830e347b 100644 --- a/src/OpenFOAM/primitives/functions/DataEntry/TableFile/TableFileIO.C +++ b/src/OpenFOAM/primitives/functions/DataEntry/TableFile/TableFileIO.C @@ -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; } diff --git a/src/sampling/sampledSet/circle/circleSet.C b/src/sampling/sampledSet/circle/circleSet.C index b7d4d0dbd5610d521014748934855f6a3cefdf45..c77436ab63b8d2fa872e1dd873d438bc9dd4e14e 100644 --- a/src/sampling/sampledSet/circle/circleSet.C +++ b/src/sampling/sampledSet/circle/circleSet.C @@ -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 ) : diff --git a/src/sampling/sampledSet/circle/circleSet.H b/src/sampling/sampledSet/circle/circleSet.H index fc3232a5bd506ac5b91125f476ae737d0b2ef1d6..05a4c25c2ac5633369736795b0ca596f0af6fe2d 100644 --- a/src/sampling/sampledSet/circle/circleSet.H +++ b/src/sampling/sampledSet/circle/circleSet.H @@ -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 ); diff --git a/src/sampling/sampledSet/cloud/cloudSet.C b/src/sampling/sampledSet/cloud/cloudSet.C index 419fea0a4f1d661d02f6d14f11ca2dd1db8fc178..c03c73e3fea234f6fdfc729b605b141979cd691e 100644 --- a/src/sampling/sampledSet/cloud/cloudSet.C +++ b/src/sampling/sampledSet/cloud/cloudSet.C @@ -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 ) : diff --git a/src/sampling/sampledSet/cloud/cloudSet.H b/src/sampling/sampledSet/cloud/cloudSet.H index 0ea1526ba1e540dc1f3665ec3a64f7c10b37ab65..c312bff44cc62b2ba4f998f72bd177a3a7446d14 100644 --- a/src/sampling/sampledSet/cloud/cloudSet.H +++ b/src/sampling/sampledSet/cloud/cloudSet.H @@ -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 ); diff --git a/src/sampling/sampledSet/face/faceOnlySet.C b/src/sampling/sampledSet/face/faceOnlySet.C index e6667cb2d18f76c818d5b347f1ccc29a44fdceaa..1583261d1c6c8c2663eef095a0cb8f74e6453e4a 100644 --- a/src/sampling/sampledSet/face/faceOnlySet.C +++ b/src/sampling/sampledSet/face/faceOnlySet.C @@ -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 ) : diff --git a/src/sampling/sampledSet/face/faceOnlySet.H b/src/sampling/sampledSet/face/faceOnlySet.H index 92fc9fbe37b22ac8fdde5ccc14fed7d456e60935..f50900e6b70362d7fd08c807bebdf0c53328a964 100644 --- a/src/sampling/sampledSet/face/faceOnlySet.H +++ b/src/sampling/sampledSet/face/faceOnlySet.H @@ -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 ); diff --git a/src/sampling/sampledSet/midPoint/midPointSet.C b/src/sampling/sampledSet/midPoint/midPointSet.C index 272e8761ecbb80b0c8fb7930fb80240a889d2d4d..168d0bbc986eb96efcb518d4b22774b858df5f70 100644 --- a/src/sampling/sampledSet/midPoint/midPointSet.C +++ b/src/sampling/sampledSet/midPoint/midPointSet.C @@ -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 ) : diff --git a/src/sampling/sampledSet/midPoint/midPointSet.H b/src/sampling/sampledSet/midPoint/midPointSet.H index edea9c189f799b9cf777d16ee8d0c98d6eb4b987..679acbc8bf97a8eb10788a7e120d15efb15510fc 100644 --- a/src/sampling/sampledSet/midPoint/midPointSet.H +++ b/src/sampling/sampledSet/midPoint/midPointSet.H @@ -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 ); diff --git a/src/sampling/sampledSet/midPointAndFace/midPointAndFaceSet.C b/src/sampling/sampledSet/midPointAndFace/midPointAndFaceSet.C index 3d1a2dea08bcb07430199266bebd6f80bb233c95..601171f9502cdb91f2a5374606aa3b886599fd4b 100644 --- a/src/sampling/sampledSet/midPointAndFace/midPointAndFaceSet.C +++ b/src/sampling/sampledSet/midPointAndFace/midPointAndFaceSet.C @@ -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 ) : diff --git a/src/sampling/sampledSet/midPointAndFace/midPointAndFaceSet.H b/src/sampling/sampledSet/midPointAndFace/midPointAndFaceSet.H index 1fa80f79293a668b0ecae116216b0cc58db953da..ee2b13cc82ed1618cbdf3436c771b07acce07f46 100644 --- a/src/sampling/sampledSet/midPointAndFace/midPointAndFaceSet.H +++ b/src/sampling/sampledSet/midPointAndFace/midPointAndFaceSet.H @@ -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 ); diff --git a/src/sampling/sampledSet/patchCloud/patchCloudSet.C b/src/sampling/sampledSet/patchCloud/patchCloudSet.C index 504581eb4dd17a03995ee00d0532eacf0a071998..027fafc77e02f6a3a1ab11ef576a1159add16b38 100644 --- a/src/sampling/sampledSet/patchCloud/patchCloudSet.C +++ b/src/sampling/sampledSet/patchCloud/patchCloudSet.C @@ -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 ) : diff --git a/src/sampling/sampledSet/patchCloud/patchCloudSet.H b/src/sampling/sampledSet/patchCloud/patchCloudSet.H index 0ff77370b93f096862a048349a4ee243a2b84288..7fff04eafcee37fda99b8a5d6e1084dcf6c52e03 100644 --- a/src/sampling/sampledSet/patchCloud/patchCloudSet.H +++ b/src/sampling/sampledSet/patchCloud/patchCloudSet.H @@ -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 ); diff --git a/src/sampling/sampledSet/patchSeed/patchSeedSet.C b/src/sampling/sampledSet/patchSeed/patchSeedSet.C index 09da94f70eaa80b310dc12d8a8e903106b629888..bbd8cf0a3c1a207af99e3dcaa5cbe4884e854b30 100644 --- a/src/sampling/sampledSet/patchSeed/patchSeedSet.C +++ b/src/sampling/sampledSet/patchSeed/patchSeedSet.C @@ -205,7 +205,7 @@ Foam::patchSeedSet::patchSeedSet ( const word& name, const polyMesh& mesh, - meshSearch& searchEngine, + const meshSearch& searchEngine, const dictionary& dict ) : diff --git a/src/sampling/sampledSet/patchSeed/patchSeedSet.H b/src/sampling/sampledSet/patchSeed/patchSeedSet.H index ac51d6fdd390271a8f0781b9bdd83687183951fe..a6e795ad2be1a9d641efb2cf9418b757792fcfc4 100644 --- a/src/sampling/sampledSet/patchSeed/patchSeedSet.H +++ b/src/sampling/sampledSet/patchSeed/patchSeedSet.H @@ -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 ); diff --git a/src/sampling/sampledSet/polyLine/polyLineSet.C b/src/sampling/sampledSet/polyLine/polyLineSet.C index 83b7fa53c9ef2557b545100b42ba0df80533a20a..5ba23c5293d1e4f9ce57056a57f6d1ea7fed885e 100644 --- a/src/sampling/sampledSet/polyLine/polyLineSet.C +++ b/src/sampling/sampledSet/polyLine/polyLineSet.C @@ -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 ) : diff --git a/src/sampling/sampledSet/polyLine/polyLineSet.H b/src/sampling/sampledSet/polyLine/polyLineSet.H index c4cccd3b4bd6151f01e7f9f5302636af42030868..b95e2e0c47d0d782ea7ddda5e90f9973520febe7 100644 --- a/src/sampling/sampledSet/polyLine/polyLineSet.H +++ b/src/sampling/sampledSet/polyLine/polyLineSet.H @@ -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 ); diff --git a/src/sampling/sampledSet/sampledSet/sampledSet.C b/src/sampling/sampledSet/sampledSet/sampledSet.C index 05256451b1a1cc48d7005d205b5d0f3ca6f192de..1442ca31f918e40aeda42091b95ab349f94ea61c 100644 --- a/src/sampling/sampledSet/sampledSet/sampledSet.C +++ b/src/sampling/sampledSet/sampledSet/sampledSet.C @@ -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 diff --git a/src/sampling/sampledSet/sampledSet/sampledSet.H b/src/sampling/sampledSet/sampledSet/sampledSet.H index fe252b2d16ab21b7dd7c06585993f936b1cb0ff5..953f65d77e67e86b4cdc59437e5a244a028952f4 100644 --- a/src/sampling/sampledSet/sampledSet/sampledSet.H +++ b/src/sampling/sampledSet/sampledSet/sampledSet.H @@ -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_; } diff --git a/src/sampling/sampledSet/triSurfaceMeshPointSet/triSurfaceMeshPointSet.C b/src/sampling/sampledSet/triSurfaceMeshPointSet/triSurfaceMeshPointSet.C index 3704f950e0345eb72d4e7b2a4a0a4b89495c2a99..cdf9384be62024b463fc5cf1e21fe719587b90f6 100644 --- a/src/sampling/sampledSet/triSurfaceMeshPointSet/triSurfaceMeshPointSet.C +++ b/src/sampling/sampledSet/triSurfaceMeshPointSet/triSurfaceMeshPointSet.C @@ -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 ) : diff --git a/src/sampling/sampledSet/triSurfaceMeshPointSet/triSurfaceMeshPointSet.H b/src/sampling/sampledSet/triSurfaceMeshPointSet/triSurfaceMeshPointSet.H index 7742b121208aede408f2988853757d774a89fae0..92ef83ebf862134ea1c085efa0a31077dae778b4 100644 --- a/src/sampling/sampledSet/triSurfaceMeshPointSet/triSurfaceMeshPointSet.H +++ b/src/sampling/sampledSet/triSurfaceMeshPointSet/triSurfaceMeshPointSet.H @@ -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 ); diff --git a/src/sampling/sampledSet/uniform/uniformSet.C b/src/sampling/sampledSet/uniform/uniformSet.C index 84015c7f2fae205d1dc26cf0105d703ade0d9ead..706e3c11d0b331590e46cfa3b0977326f376192f 100644 --- a/src/sampling/sampledSet/uniform/uniformSet.C +++ b/src/sampling/sampledSet/uniform/uniformSet.C @@ -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 ) : diff --git a/src/sampling/sampledSet/uniform/uniformSet.H b/src/sampling/sampledSet/uniform/uniformSet.H index 40cb3b88a3798c7ee4bf1506e5332baf5221aaa5..215b347ffabc55d0424fed1b4eacef1f2030f1cc 100644 --- a/src/sampling/sampledSet/uniform/uniformSet.H +++ b/src/sampling/sampledSet/uniform/uniformSet.H @@ -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 ); diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C index b9f8e2f1c3de0247223decba3c6a7367872dcca1..87716b72be3ad3433df1a1de71064deab6d06775 100644 --- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C +++ b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C @@ -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 diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.C index 4b4273ff32ffcbb39accd680c50c2ac391ec8496..da89fcd26591193a22d839dfaa1211a2579eb8be 100644 --- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.C +++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.C @@ -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 diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.H b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.H index a1ff656334b9c5f17a9b0eefafc35615008fb6bc..92b6145dadb06689962ba9fce5a16f78f49c1acf 100644 --- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.H +++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.H @@ -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 diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.C index 628b300afd389db3bda931085dae6cbcc68b6089..ff459f8006147357dd3c19a8be9c2e4a1278d113 100644 --- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.C +++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.C @@ -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 diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.H b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.H index 684405ece39d259079c0200ef5fe88e960e41c90..16c05dcee543f7ccf4ad899168906780760f01a5 100644 --- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.H +++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.H @@ -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 diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkAtmRoughWallFunction/nutkAtmRoughWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkAtmRoughWallFunction/nutkAtmRoughWallFunctionFvPatchScalarField.C index 162de9255a0d560f93176252f8c25468dbd59ac8..035bd813d7e7ab1a17b91fe84c27b81c1ac8f5d8 100644 --- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkAtmRoughWallFunction/nutkAtmRoughWallFunctionFvPatchScalarField.C +++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkAtmRoughWallFunction/nutkAtmRoughWallFunctionFvPatchScalarField.C @@ -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 diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkAtmRoughWallFunction/nutkAtmRoughWallFunctionFvPatchScalarField.H b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkAtmRoughWallFunction/nutkAtmRoughWallFunctionFvPatchScalarField.H index aa045de4234d019479a1cbb1ebd2ccc4eca8e575..a4c2aaa936aa0aac9911a4fb532132788f1aa552 100644 --- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkAtmRoughWallFunction/nutkAtmRoughWallFunctionFvPatchScalarField.H +++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkAtmRoughWallFunction/nutkAtmRoughWallFunctionFvPatchScalarField.H @@ -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