diff --git a/applications/solvers/combustion/PDRFoam/Make/files b/applications/solvers/combustion/PDRFoam/Make/files
index d1b1d5a8f8..1e5d200ccb 100644
--- a/applications/solvers/combustion/PDRFoam/Make/files
+++ b/applications/solvers/combustion/PDRFoam/Make/files
@@ -27,6 +27,7 @@ PDRModels/XiGModels/basicXiSubG/basicXiSubG.C
laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.C
+/* PDRFoamAutoRefine.C */
PDRFoam.C
EXE = $(FOAM_APPBIN)/PDRFoam
diff --git a/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C b/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C
index 2946fa52a2..3152feec9b 100644
--- a/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C
+++ b/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C
@@ -25,8 +25,8 @@ Application
PDRFoam
Description
- Compressible premixed/partially-premixed combustion solver with turbulence
- modelling.
+ Solver for compressible premixed/partially-premixed combustion with
+ turbulence modelling.
Combusting RANS code using the b-Xi two-equation model.
Xi may be obtained by either the solution of the Xi transport
@@ -35,7 +35,7 @@ Description
to be appropriate by comparison with the results from the
spectral model.
- Strain effects are encorporated directly into the Xi equation
+ Strain effects are incorporated directly into the Xi equation
but not in the algebraic approximation. Further work need to be
done on this issue, particularly regarding the enhanced removal rate
caused by flame compression. Analysis using results of the spectral
@@ -78,9 +78,9 @@ int main(int argc, char *argv[])
#include "readCombustionProperties.H"
#include "readGravitationalAcceleration.H"
#include "createFields.H"
- #include "readPISOControls.H"
#include "initContinuityErrs.H"
#include "readTimeControls.H"
+ #include "CourantNo.H"
#include "setInitialDeltaT.H"
scalar StCoNum = 0.0;
@@ -94,7 +94,6 @@ int main(int argc, char *argv[])
#include "readTimeControls.H"
#include "readPISOControls.H"
#include "CourantNo.H"
-
#include "setDeltaT.H"
runTime++;
diff --git a/applications/utilities/postProcessing/miscellaneous/postChannel/sumData.C b/applications/utilities/postProcessing/miscellaneous/postChannel/sumData.C
deleted file mode 100644
index e969badccd..0000000000
--- a/applications/utilities/postProcessing/miscellaneous/postChannel/sumData.C
+++ /dev/null
@@ -1,48 +0,0 @@
-/*---------------------------------------------------------------------------*\
- ========= |
- \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
- \\ / O peration |
- \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd.
- \\/ M anipulation |
--------------------------------------------------------------------------------
-License
- This file is part of OpenFOAM.
-
- OpenFOAM is free software: you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- for more details.
-
- You should have received a copy of the GNU General Public License
- along with OpenFOAM. If not, see .
-
-\*---------------------------------------------------------------------------*/
-
-#include "sumData.H"
-
-// * * * * * * * * * * * * * * * Friend Operators * * * * * * * * * * * * * //
-
-Foam::Ostream& Foam::operator<<
-(
- Foam::Ostream& os,
- const Foam::sumData& wDist
-)
-{
- return os
- << wDist.oldFace_ << token::SPACE
- << wDist.sum_ << token::SPACE << wDist.count_;
-}
-
-
-Foam::Istream& Foam::operator>>(Foam::Istream& is, Foam::sumData& wDist)
-{
- return is >> wDist.oldFace_ >> wDist.sum_ >> wDist.count_;
-}
-
-
-// ************************************************************************* //
diff --git a/applications/utilities/postProcessing/miscellaneous/postChannel/sumData.H b/applications/utilities/postProcessing/miscellaneous/postChannel/sumData.H
deleted file mode 100644
index 86e80cda5b..0000000000
--- a/applications/utilities/postProcessing/miscellaneous/postChannel/sumData.H
+++ /dev/null
@@ -1,199 +0,0 @@
-/*---------------------------------------------------------------------------*\
- ========= |
- \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
- \\ / O peration |
- \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd.
- \\/ M anipulation |
--------------------------------------------------------------------------------
-License
- This file is part of OpenFOAM.
-
- OpenFOAM is free software: you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- for more details.
-
- You should have received a copy of the GNU General Public License
- along with OpenFOAM. If not, see .
-
-Class
- Foam::sumData
-
-Description
- Sums data while walking across cells. Used in collapsing fields.
-
-SourceFiles
- sumDataI.H
- sumData.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef sumData_H
-#define sumData_H
-
-#include "point.H"
-#include "tensor.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-class polyPatch;
-class polyMesh;
-
-/*---------------------------------------------------------------------------*\
- Class sumData Declaration
-\*---------------------------------------------------------------------------*/
-
-class sumData
-{
- // Private data
-
- //- Previous face
- label oldFace_;
-
- //- summed data
- scalar sum_;
-
- //- number of items summed
- label count_;
-
-public:
-
- // Constructors
-
- //- Construct null
- inline sumData();
-
- //- Construct from count
- inline sumData
- (
- const label oldFace,
- const scalar sum,
- const label count
- );
-
-
- // Member Functions
-
- // Access
-
- inline label oldFace() const
- {
- return oldFace_;
- }
-
- inline scalar sum() const
- {
- return sum_;
- }
-
- inline label count() const
- {
- return count_;
- }
-
-
- // Needed by FaceCellWave
-
- //- Check whether origin has been changed at all or
- // still contains original (invalid) value.
- inline bool valid() const;
-
- //- Check for identical geometrical data. Used for cyclics checking.
- inline bool sameGeometry
- (
- const polyMesh&,
- const sumData&,
- const scalar
- ) const;
-
- //- Convert any absolute coordinates into relative to (patch)face
- // centre
- inline void leaveDomain
- (
- const polyMesh&,
- const polyPatch&,
- const label patchFaceI,
- const point& faceCentre
- );
-
- //- Reverse of leaveDomain
- inline void enterDomain
- (
- const polyMesh&,
- const polyPatch&,
- const label patchFaceI,
- const point& faceCentre
- );
-
- //- Apply rotation matrix to any coordinates
- inline void transform
- (
- const polyMesh&,
- const tensor&
- );
-
- //- Influence of neighbouring face.
- inline bool updateCell
- (
- const polyMesh&,
- const label thisCellI,
- const label neighbourFaceI,
- const sumData& neighbourInfo,
- const scalar tol
- );
-
- //- Influence of neighbouring cell.
- inline bool updateFace
- (
- const polyMesh&,
- const label thisFaceI,
- const label neighbourCellI,
- const sumData& neighbourInfo,
- const scalar tol
- );
-
- //- Influence of different value on same face.
- inline bool updateFace
- (
- const polyMesh&,
- const label thisFaceI,
- const sumData& neighbourInfo,
- const scalar tol
- );
-
- // Member Operators
-
- // Needed for List IO
- inline bool operator==(const sumData&) const;
-
- inline bool operator!=(const sumData&) const;
-
-
- // IOstream Operators
-
- friend Ostream& operator<<(Ostream&, const sumData&);
- friend Istream& operator>>(Istream&, sumData&);
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#include "sumDataI.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/applications/utilities/postProcessing/miscellaneous/postChannel/sumDataI.H b/applications/utilities/postProcessing/miscellaneous/postChannel/sumDataI.H
deleted file mode 100644
index b0882878e3..0000000000
--- a/applications/utilities/postProcessing/miscellaneous/postChannel/sumDataI.H
+++ /dev/null
@@ -1,226 +0,0 @@
-/*---------------------------------------------------------------------------*\
- ========= |
- \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
- \\ / O peration |
- \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd.
- \\/ M anipulation |
--------------------------------------------------------------------------------
-License
- This file is part of OpenFOAM.
-
- OpenFOAM is free software: you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- for more details.
-
- You should have received a copy of the GNU General Public License
- along with OpenFOAM. If not, see .
-
-\*---------------------------------------------------------------------------*/
-
-#include "polyMesh.H"
-
-// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
-
-
-// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-
-// Null constructor
-inline Foam::sumData::sumData()
-:
- oldFace_(-1),
- sum_(0.0),
- count_(0)
-{}
-
-
-// Construct from components
-inline Foam::sumData::sumData
-(
- const label oldFace,
- const scalar sum,
- const label count
-)
-:
- oldFace_(oldFace),
- sum_(sum),
- count_(count)
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-
-inline bool Foam::sumData::valid() const
-{
- return oldFace_ != -1;
-}
-
-
-// No geometric data so never any problem on cyclics
-inline bool Foam::sumData::sameGeometry
-(
- const polyMesh&,
- const sumData&,
- const scalar
-) const
-{
- return true;
-}
-
-
-// No geometric data.
-inline void Foam::sumData::leaveDomain
-(
- const polyMesh&,
- const polyPatch& patch,
- const label patchFaceI,
- const point& faceCentre
-)
-{}
-
-
-// No geometric data.
-inline void Foam::sumData::transform
-(
- const polyMesh&,
- const tensor& rotTensor
-)
-{}
-
-
-// No geometric data.
-inline void Foam::sumData::enterDomain
-(
- const polyMesh&,
- const polyPatch& patch,
- const label patchFaceI,
- const point& faceCentre
-)
-{
- oldFace_ = -1;
-}
-
-
-// Update cell with neighbouring face information
-inline bool Foam::sumData::updateCell
-(
- const polyMesh&,
- const label thisCellI,
- const label neighbourFaceI,
- const sumData& neighbourInfo,
- const scalar tol
-)
-{
- if (!valid())
- {
- FatalErrorIn("sumData::updateCell") << "problem"
- << abort(FatalError);
- return false;
- }
-
-
- if (count_ == 0)
- {
- sum_ += neighbourInfo.sum();
- count_ = neighbourInfo.count() + 1;
- oldFace_ = neighbourFaceI;
- return true;
- }
- else
- {
- return false;
- }
-}
-
-
-// Update face with neighbouring cell information
-inline bool Foam::sumData::updateFace
-(
- const polyMesh& mesh,
- const label thisFaceI,
- const label neighbourCellI,
- const sumData& neighbourInfo,
- const scalar tol
-)
-{
- // From cell to its faces.
-
- // Check that face is opposite the previous one.
- const cell& cFaces = mesh.cells()[neighbourCellI];
-
- label wantedFaceI = cFaces.opposingFaceLabel
- (
- neighbourInfo.oldFace(),
- mesh.faces()
- );
-
- if (thisFaceI == wantedFaceI)
- {
- if (count_ != 0)
- {
- FatalErrorIn("sumData::updateFace") << "problem"
- << abort(FatalError);
- return false;
- }
-
- sum_ += neighbourInfo.sum();
- count_ = neighbourInfo.count();
- oldFace_ = thisFaceI;
- return true;
- }
- else
- {
- return false;
- }
-}
-
-
-// Update face with coupled face information
-inline bool Foam::sumData::updateFace
-(
- const polyMesh&,
- const label thisFaceI,
- const sumData& neighbourInfo,
- const scalar tol
-)
-{
- // From face to face (e.g. coupled faces)
- if (count_ == 0)
- {
- sum_ += neighbourInfo.sum();
- count_ = neighbourInfo.count();
- oldFace_ = thisFaceI;
- return true;
- }
- else
- {
- return false;
- }
-}
-
-
-// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * //
-
-inline bool Foam::sumData::operator==(const Foam::sumData& rhs)
- const
-{
- return
- oldFace() == rhs.oldFace()
- && sum() == rhs.sum()
- && count() == rhs.count();
-}
-
-
-inline bool Foam::sumData::operator!=(const Foam::sumData& rhs)
- const
-{
- return !(*this == rhs);
-}
-
-
-// ************************************************************************* //