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

GIT: Resolve conflict with upstream merge from Foundation

Browse Source
This commit is contained in:
Andrew Heather
2015-12-07 17:07:20 +00:00
parent e35afa35bf 736621b945
commit 3f55f752fc
2154 changed files with 44622 additions and 24766 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/fvMotionSolver/fvMotionSolvers/displacement/interpolation/displacementInterpolationMotionSolver.C
View File

@ -80,13 +80,9 @@ void Foam::displacementInterpolationMotionSolver::calcInterpolation()
if (zoneI == -1)
{
FatalErrorIn
(
"displacementInterpolationMotionSolver::"
"displacementInterpolationMotionSolver(const polyMesh&,"
"Istream&)"
) << "Cannot find zone " << zoneName << endl
<< "Valid zones are " << mesh().faceZones().names()
FatalErrorInFunction
<< "Cannot find zone " << zoneName << endl
<< "Valid zones are " << mesh.faceZones().names()
<< exit(FatalError);
}
@ -248,12 +244,8 @@ void Foam::displacementInterpolationMotionSolver::calcInterpolation()
if (rangeI == -1 || rangeI == rangeToCoord.size()-1)
{
FatalErrorIn
(
"displacementInterpolationMotionSolver::"
"displacementInterpolationMotionSolver"
"(const polyMesh&, Istream&)"
) << "Did not find point " << points0()[pointI]
FatalErrorInFunction
<< "Did not find point " << points0()[pointI]
<< " coordinate " << meshCoords[pointI]
<< " in ranges " << rangeToCoord
<< abort(FatalError);
@ -341,10 +333,8 @@ Foam::displacementInterpolationMotionSolver::curPoints() const
{
if (mesh().nPoints() != points0().size())
{
FatalErrorIn
(
"displacementInterpolationMotionSolver::curPoints() const"
) << "The number of points in the mesh seems to have changed." << endl
FatalErrorInFunction
<< "The number of points in the mesh seems to have changed." << endl
<< "In constant/polyMesh there are " << points0().size()
<< " points; in the current mesh there are " << mesh().nPoints()
<< " points." << exit(FatalError);

56
src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/displacementLayeredMotionMotionSolver.C
View File

@ -248,18 +248,7 @@ Foam::displacementLayeredMotionMotionSolver::faceZoneEvaluate
{
if ((patchI % 2) != 1)
{
FatalIOErrorIn
(
"displacementLayeredMotionMotionSolver::faceZoneEvaluate"
"("
"const faceZone&, "
"const labelList&, "
"const dictionary&, "
"const PtrList<pointVectorField>&, "
"const label"
") const",
*this
) << "slip can only be used on second faceZone patch of pair. "
FatalIOErrorInFunction(*this)
<< "FaceZone:" << fz.name()
<< exit(FatalIOError);
}
@ -285,18 +274,8 @@ Foam::displacementLayeredMotionMotionSolver::faceZoneEvaluate
}
else
{
FatalIOErrorIn
(
"displacementLayeredMotionMotionSolver::faceZoneEvaluate"
"("
"const faceZone&, "
"const labelList&, "
"const dictionary&, "
"const PtrList<pointVectorField>&, "
"const label"
") const",
*this
) << "Unknown faceZonePatch type " << type << " for faceZone "
FatalIOErrorInFunction(*this)
<< "Unknown faceZonePatch type " << type << " for faceZone "
<< fz.name() << exit(FatalIOError);
}
return tfld;
@ -317,12 +296,8 @@ void Foam::displacementLayeredMotionMotionSolver::cellZoneSolve
if (patchesDict.size() != 2)
{
FatalIOErrorIn
(
"displacementLayeredMotionMotionSolver::"
"cellZoneSolve(const label, const dictionary&)",
*this
) << "Two faceZones (patches) must be specifed per cellZone. "
FatalIOErrorInFunction(*this)
<< "Two faceZones (patches) must be specifed per cellZone. "
<< " cellZone:" << cellZoneI
<< " patches:" << patchesDict.toc()
<< exit(FatalIOError);
@ -339,12 +314,8 @@ void Foam::displacementLayeredMotionMotionSolver::cellZoneSolve
label zoneI = mesh().faceZones().findZoneID(faceZoneName);
if (zoneI == -1)
{
FatalIOErrorIn
(
"displacementLayeredMotionMotionSolver::"
"cellZoneSolve(const label, const dictionary&)",
*this
) << "Cannot find faceZone " << faceZoneName
FatalIOErrorInFunction(*this)
<< "Cannot find faceZone " << faceZoneName
<< endl << "Valid zones are " << mesh().faceZones().names()
<< exit(FatalIOError);
}
@ -513,11 +484,7 @@ void Foam::displacementLayeredMotionMotionSolver::cellZoneSolve
}
else
{
FatalErrorIn
(
"displacementLayeredMotionMotionSolver::"
"cellZoneSolve(const label, const dictionary&)"
)
FatalErrorInFunction
<< "Invalid interpolationScheme: " << interpolationScheme
<< ". Valid schemes are 'oneSided' and 'linear'"
<< exit(FatalError);
@ -593,11 +560,8 @@ void Foam::displacementLayeredMotionMotionSolver::solve()
if (zoneI == -1)
{
FatalIOErrorIn
(
"displacementLayeredMotionMotionSolver::solve()",
*this
) << "Cannot find cellZone " << cellZoneName
FatalIOErrorInFunction(*this)
<< "Cannot find cellZone " << cellZoneName
<< endl << "Valid zones are " << mesh().cellZones().names()
<< exit(FatalIOError);
}

9
src/fvMotionSolver/motionDiffusivity/motionDiffusivity/motionDiffusivity.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -59,11 +59,8 @@ Foam::autoPtr<Foam::motionDiffusivity> Foam::motionDiffusivity::New
if (cstrIter == IstreamConstructorTablePtr_->end())
{
FatalErrorIn
(
"motionDiffusivity::New(const fvMesh&, "
"const Istream& dict)"
) << "Unknown diffusion type "
FatalErrorInFunction
<< "Unknown diffusion type "
<< motionType << nl << nl
<< "Valid diffusion types are :" << endl
<< IstreamConstructorTablePtr_->sortedToc()

14
src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -333,16 +333,8 @@ surfaceDisplacementPointPatchVectorField
{
if (velocity_.x() < 0 || velocity_.y() < 0 || velocity_.z() < 0)
{
FatalErrorIn
(
"surfaceDisplacementPointPatchVectorField::\n"
"surfaceDisplacementPointPatchVectorField\n"
"(\n"
" const pointPatch& p,\n"
" const DimensionedField<vector, pointMesh>& iF,\n"
" const dictionary& dict\n"
")\n"
) << "All components of velocity have to be positive : "
FatalErrorInFunction
<< "All components of velocity have to be positive : "
<< velocity_ << nl
<< "Set velocity components to a great value if no clipping"
<< " necessary." << exit(FatalError);

22
src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012-2014 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -351,10 +351,8 @@ void Foam::timeVaryingMappedFixedValuePointPatchField<Type>::checkTable()
if (!foundTime)
{
FatalErrorIn
(
"timeVaryingMappedFixedValuePointPatchField<Type>::checkTable"
) << "Cannot find starting sampling values for current time "
FatalErrorInFunction
<< "Cannot find starting sampling values for current time "
<< this->db().time().value() << nl
<< "Have sampling values for times "
<< pointToPointPlanarInterpolation::timeNames(sampleTimes_) << nl
@ -416,11 +414,8 @@ void Foam::timeVaryingMappedFixedValuePointPatchField<Type>::checkTable()
if (vals.size() != mapperPtr_().sourceSize())
{
FatalErrorIn
(
"timeVaryingMappedFixedValuePointPatchField<Type>::"
"checkTable()"
) << "Number of values (" << vals.size()
FatalErrorInFunction
<< "Number of values (" << vals.size()
<< ") differs from the number of points ("
<< mapperPtr_().sourceSize()
<< ") in file " << vals.objectPath() << exit(FatalError);
@ -473,11 +468,8 @@ void Foam::timeVaryingMappedFixedValuePointPatchField<Type>::checkTable()
if (vals.size() != mapperPtr_().sourceSize())
{
FatalErrorIn
(
"timeVaryingMappedFixedValuePointPatchField<Type>::"
"checkTable()"
) << "Number of values (" << vals.size()
FatalErrorInFunction
<< "Number of values (" << vals.size()
<< ") differs from the number of points ("
<< mapperPtr_().sourceSize()
<< ") in file " << vals.objectPath() << exit(FatalError);

14
src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012-2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -96,16 +96,8 @@ uniformInterpolatedDisplacementPointPatchVectorField
if (timeNames_.size() < 1)
{
FatalErrorIn
(
"uniformInterpolatedDisplacementPointPatchVectorField::\n"
"uniformInterpolatedDisplacementPointPatchVectorField\n"
"(\n"
" const pointPatch&,\n"
" const DimensionedField<vector, pointMesh>&,\n"
" const dictionary&\n"
")\n"
) << "Did not find any times with " << fieldName_
FatalErrorInFunction
<< "Did not find any times with " << fieldName_
<< exit(FatalError);
}

38
src/fvMotionSolver/pointPatchFields/derived/waveDisplacement/waveDisplacementPointPatchVectorField.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-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -29,14 +29,9 @@ License
#include "Time.H"
#include "polyMesh.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
waveDisplacementPointPatchVectorField::
Foam::waveDisplacementPointPatchVectorField::
waveDisplacementPointPatchVectorField
(
const pointPatch& p,
@ -50,7 +45,7 @@ waveDisplacementPointPatchVectorField
{}
waveDisplacementPointPatchVectorField::
Foam::waveDisplacementPointPatchVectorField::
waveDisplacementPointPatchVectorField
(
const pointPatch& p,
@ -61,7 +56,7 @@ waveDisplacementPointPatchVectorField
fixedValuePointPatchField<vector>(p, iF, dict),
amplitude_(dict.lookup("amplitude")),
omega_(readScalar(dict.lookup("omega"))),
waveNumber_(dict.lookupOrDefault<vector>("waveLength", vector::zero))
waveNumber_(dict.lookupOrDefault<vector>("waveNumber", vector::zero))
{
if (!dict.found("value"))
{
@ -70,7 +65,7 @@ waveDisplacementPointPatchVectorField
}
waveDisplacementPointPatchVectorField::
Foam::waveDisplacementPointPatchVectorField::
waveDisplacementPointPatchVectorField
(
const waveDisplacementPointPatchVectorField& ptf,
@ -86,7 +81,7 @@ waveDisplacementPointPatchVectorField
{}
waveDisplacementPointPatchVectorField::
Foam::waveDisplacementPointPatchVectorField::
waveDisplacementPointPatchVectorField
(
const waveDisplacementPointPatchVectorField& ptf,
@ -102,7 +97,7 @@ waveDisplacementPointPatchVectorField
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void waveDisplacementPointPatchVectorField::updateCoeffs()
void Foam::waveDisplacementPointPatchVectorField::updateCoeffs()
{
if (this->updated())
{
@ -123,7 +118,7 @@ void waveDisplacementPointPatchVectorField::updateCoeffs()
}
void waveDisplacementPointPatchVectorField::write(Ostream& os) const
void Foam::waveDisplacementPointPatchVectorField::write(Ostream& os) const
{
pointPatchField<vector>::write(os);
os.writeKeyword("amplitude")
@ -138,14 +133,13 @@ void waveDisplacementPointPatchVectorField::write(Ostream& os) const
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
makePointPatchTypeField
(
pointPatchVectorField,
waveDisplacementPointPatchVectorField
);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
namespace Foam
{
makePointPatchTypeField
(
pointPatchVectorField,
waveDisplacementPointPatchVectorField
);
}
// ************************************************************************* //