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

This commit is contained in:
mattijs
2013-04-11 15:16:34 +01:00
57 changed files with 2395 additions and 2388 deletions

View File

@ -17,7 +17,7 @@ rAU = 1.0/UEqn().A();
if (pimple.momentumPredictor()) if (pimple.momentumPredictor())
{ {
solve(UEqn() == -fvc::grad(p) + fvOptions(U)); solve(UEqn() == -fvc::grad(p));
fvOptions.correct(U); fvOptions.correct(U);
} }

View File

@ -2,8 +2,10 @@
cd ${0%/*} || exit 1 # run from this directory cd ${0%/*} || exit 1 # run from this directory
#set -x #set -x
if [ -d "$ParaView_DIR" -a -r "$ParaView_DIR" ] if [ "$ParaView_VERSION" == "3.98.1" ]
then then
if [ -d "$ParaView_DIR" -a -r "$ParaView_DIR" ]
then
[ -n "$PV_PLUGIN_PATH" ] || { [ -n "$PV_PLUGIN_PATH" ] || {
echo "$0 : PV_PLUGIN_PATH not valid - it is unset" echo "$0 : PV_PLUGIN_PATH not valid - it is unset"
exit 1 exit 1
@ -15,8 +17,11 @@ then
wmake libso vtkPV398Readers wmake libso vtkPV398Readers
PV398blockMeshReader/Allwmake PV398blockMeshReader/Allwmake
PV398FoamReader/Allwmake PV398FoamReader/Allwmake
else else
echo "ERROR: ParaView not found in $ParaView_DIR" echo "ERROR: ParaView not found in $ParaView_DIR"
fi
else
echo "WARN: PV398 readers not building: ParaView_VERSION=$ParaView_VERSION"
fi fi
# ----------------------------------------------------------------- end-of-file # ----------------------------------------------------------------- end-of-file

View File

@ -2,8 +2,10 @@
cd ${0%/*} || exit 1 # run from this directory cd ${0%/*} || exit 1 # run from this directory
#set -x #set -x
if [ -d "$ParaView_DIR" -a -r "$ParaView_DIR" ] if [ "$ParaView_VERSION" != "3.98.1" ]
then then
if [ -d "$ParaView_DIR" -a -r "$ParaView_DIR" ]
then
[ -n "$PV_PLUGIN_PATH" ] || { [ -n "$PV_PLUGIN_PATH" ] || {
echo "$0 : PV_PLUGIN_PATH not valid - it is unset" echo "$0 : PV_PLUGIN_PATH not valid - it is unset"
exit 1 exit 1
@ -15,8 +17,11 @@ then
wmake libso vtkPV3Readers wmake libso vtkPV3Readers
PV3blockMeshReader/Allwmake PV3blockMeshReader/Allwmake
PV3FoamReader/Allwmake PV3FoamReader/Allwmake
else else
echo "ERROR: ParaView not found in $ParaView_DIR" echo "ERROR: ParaView not found in $ParaView_DIR"
fi
else
echo "WARN: PV3 readers not building: ParaView_VERSION=$ParaView_VERSION"
fi fi
# ----------------------------------------------------------------- end-of-file # ----------------------------------------------------------------- end-of-file

View File

@ -63,8 +63,6 @@ class processorCyclicPolyPatch
//- Index of originating patch //- Index of originating patch
mutable label referPatchID_; mutable label referPatchID_;
// Private member functions
protected: protected:
@ -223,7 +221,6 @@ public:
// Destructor // Destructor
virtual ~processorCyclicPolyPatch(); virtual ~processorCyclicPolyPatch();

View File

@ -65,8 +65,7 @@ void Foam::extendedFeatureEdgeMesh::sortPointsAndEdges
labelListList featurePointFeatureEdges(nFeatPts); labelListList featurePointFeatureEdges(nFeatPts);
forAll(featurePointFeatureEdges, pI) forAll(featurePointFeatureEdges, pI)
{ {
featurePointFeatureEdges[pI] = featurePointFeatureEdges[pI] = pointEdges[featurePoints[pI]];
labelList(pointEdges[featurePoints[pI]].size(), -1);
} }
// Mapping between old and new indices, there is entry in the map for each // Mapping between old and new indices, there is entry in the map for each
@ -74,6 +73,10 @@ void Foam::extendedFeatureEdgeMesh::sortPointsAndEdges
// >= 0 corresponds to the index // >= 0 corresponds to the index
labelList pointMap(sFeatLocalPts.size(), -1); labelList pointMap(sFeatLocalPts.size(), -1);
// Mapping between surface edge index and its feature edge index. -1 if it
// is not a feature edge
labelList edgeMap(sFeatEds.size(), -1);
// Noting when the normal of a face has been used so not to duplicate // Noting when the normal of a face has been used so not to duplicate
labelList faceMap(surf.size(), -1); labelList faceMap(surf.size(), -1);
@ -98,6 +101,8 @@ void Foam::extendedFeatureEdgeMesh::sortPointsAndEdges
{ {
label sFEI = featureEdges[i]; label sFEI = featureEdges[i];
edgeMap[sFEI] = i;
const edge& fE(sFeatEds[sFEI]); const edge& fE(sFeatEds[sFEI]);
// Check to see if the points have been already used // Check to see if the points have been already used
@ -156,43 +161,31 @@ void Foam::extendedFeatureEdgeMesh::sortPointsAndEdges
{ {
regionEdges.append(i); regionEdges.append(i);
} }
}
forAll(featurePointFeatureEdges, pI) // Populate feature point feature edges
{ DynamicList<label> newFeatureEdges;
const labelList& fpfEdges = pointEdges[featurePoints[pI]];
labelList& fpfe = featurePointFeatureEdges[pI];
forAll(fpfEdges, eI)
{
if (sFEI == fpfEdges[eI])
{
fpfe[eI] = i;
}
}
}
}
forAll(featurePointFeatureEdges, pI) forAll(featurePointFeatureEdges, pI)
{ {
const labelList& fpfe = featurePointFeatureEdges[pI]; const labelList& fpfe = featurePointFeatureEdges[pI];
DynamicList<label> newFeatureEdges(fpfe.size()); newFeatureEdges.setCapacity(fpfe.size());
forAll(fpfe, eI) forAll(fpfe, eI)
{ {
const label edgeIndex = fpfe[eI]; const label oldEdgeIndex = fpfe[eI];
const label newFeatureEdgeIndex = edgeMap[oldEdgeIndex];
if (edgeIndex != -1) if (newFeatureEdgeIndex != -1)
{ {
newFeatureEdges.append(edgeIndex); newFeatureEdges.append(newFeatureEdgeIndex);
} }
} }
featurePointFeatureEdges[pI] = newFeatureEdges; featurePointFeatureEdges[pI].transfer(newFeatureEdges);
} }
// Reorder the edges by classification // Reorder the edges by classification
List<DynamicList<label> > allEds(nEdgeTypes); List<DynamicList<label> > allEds(nEdgeTypes);
@ -277,7 +270,7 @@ void Foam::extendedFeatureEdgeMesh::sortPointsAndEdges
edgeMesh::operator=(edgeMesh(pts, eds)); edgeMesh::operator=(edgeMesh(pts, eds));
// Initialise sorted edge related data // Initialise sorted edge related data
edgeDirections_ = edgeDirections/mag(edgeDirections); edgeDirections_ = edgeDirections/(mag(edgeDirections) + VSMALL);
edgeNormals_ = edgeNormals; edgeNormals_ = edgeNormals;
regionEdges_ = regionEdges; regionEdges_ = regionEdges;

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -62,7 +62,11 @@ Foam::fv::fourthGrad<Type>::calcGrad
// Assemble the second-order least-square gradient // Assemble the second-order least-square gradient
// Calculate the second-order least-square gradient // Calculate the second-order least-square gradient
tmp<GeometricField<GradType, fvPatchField, volMesh> > tsecondfGrad tmp<GeometricField<GradType, fvPatchField, volMesh> > tsecondfGrad
= leastSquaresGrad<Type>(mesh).grad(vsf); = leastSquaresGrad<Type>(mesh).grad
(
vsf,
"leastSquaresGrad(" + vsf.name() + ")"
);
const GeometricField<GradType, fvPatchField, volMesh>& secondfGrad = const GeometricField<GradType, fvPatchField, volMesh>& secondfGrad =
tsecondfGrad(); tsecondfGrad();

View File

@ -25,9 +25,7 @@ License
#include "CentredFitSnGradData.H" #include "CentredFitSnGradData.H"
#include "surfaceFields.H" #include "surfaceFields.H"
#include "volFields.H"
#include "SVD.H" #include "SVD.H"
#include "syncTools.H"
#include "extendedCentredCellToFaceStencil.H" #include "extendedCentredCellToFaceStencil.H"
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@ -226,7 +224,7 @@ void Foam::CentredFitSnGradData<Polynomial>::calcFit()
// find the fit coefficients for every face in the mesh // find the fit coefficients for every face in the mesh
const surfaceScalarField& w = mesh.surfaceInterpolation::weights(); const surfaceScalarField& w = mesh.surfaceInterpolation::weights();
const surfaceScalarField& dC = mesh.deltaCoeffs(); const surfaceScalarField& dC = mesh.nonOrthDeltaCoeffs();
for (label facei = 0; facei < mesh.nInternalFaces(); facei++) for (label facei = 0; facei < mesh.nInternalFaces(); facei++)
{ {

View File

@ -25,7 +25,7 @@ Class
Foam::CentredFitSnGradData Foam::CentredFitSnGradData
Description Description
Data for the quadratic fit correction interpolation scheme Data for centred fit snGrad schemes
SourceFiles SourceFiles
CentredFitSnGradData.C CentredFitSnGradData.C
@ -64,6 +64,7 @@ class CentredFitSnGradData
// values of the stencil to obtain the gradient for each direction // values of the stencil to obtain the gradient for each direction
List<scalarList> coeffs_; List<scalarList> coeffs_;
public: public:
TypeName("CentredFitSnGradData"); TypeName("CentredFitSnGradData");

View File

@ -100,7 +100,7 @@ public:
const GeometricField<Type, fvPatchField, volMesh>& const GeometricField<Type, fvPatchField, volMesh>&
) const ) const
{ {
return this->mesh().deltaCoeffs(); return this->mesh().nonOrthDeltaCoeffs();
} }
//- Return true if this scheme uses an explicit correction //- Return true if this scheme uses an explicit correction
@ -132,10 +132,10 @@ public:
centralWeight_ centralWeight_
); );
const List<scalarList>& f = cfd.coeffs();
tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > sft tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > sft
= stencil.weightedSum(vf, f); (
stencil.weightedSum(vf, cfd.coeffs())
);
sft().dimensions() /= dimLength; sft().dimensions() /= dimLength;
@ -143,6 +143,7 @@ public:
} }
}; };
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace fv } // End namespace fv

View File

@ -168,18 +168,32 @@ void Foam::sampledSurfaces::sampleAndWrite
template<class GeoField> template<class GeoField>
void Foam::sampledSurfaces::sampleAndWrite(const IOobjectList& objects) void Foam::sampledSurfaces::sampleAndWrite(const IOobjectList& objects)
{ {
wordList names;
if (loadFromFiles_) if (loadFromFiles_)
{ {
IOobjectList fieldObjects(objects.lookupClass(GeoField::typeName)); IOobjectList fieldObjects(objects.lookupClass(GeoField::typeName));
names = fieldObjects.names();
wordList names(fieldObjects.names()); }
else
labelList fieldNames(findStrings(fieldSelection_, names));
forAll(fieldNames, fieldI)
{ {
const word& fieldName = names[fieldNames[fieldI]]; names = mesh_.thisDb().names<GeoField>();
}
labelList nameIDs(findStrings(fieldSelection_, names));
wordHashSet fieldNames(wordList(names, nameIDs));
forAllConstIter(wordHashSet, fieldNames, iter)
{
const word& fieldName = iter.key();
if ((Pstream::master()) && verbose_)
{
Pout<< "sampleAndWrite: " << fieldName << endl;
}
if (loadFromFiles_)
{
const GeoField fld const GeoField fld
( (
IOobject IOobject
@ -192,30 +206,10 @@ void Foam::sampledSurfaces::sampleAndWrite(const IOobjectList& objects)
mesh_ mesh_
); );
if ((Pstream::master()) && verbose_)
{
Pout<< "sampleAndWrite: " << fieldName << endl;
}
sampleAndWrite(fld); sampleAndWrite(fld);
} }
}
else else
{ {
const wordList fieldNames
(
mesh_.thisDb().names<GeoField>(fieldSelection_)
);
forAll(fieldNames, i)
{
const word& fieldName = fieldNames[i];
if ((Pstream::master()) && verbose_)
{
Pout<< "sampleAndWrite: " << fieldName << endl;
}
sampleAndWrite sampleAndWrite
( (
mesh_.thisDb().lookupObject<GeoField>(fieldName) mesh_.thisDb().lookupObject<GeoField>(fieldName)

View File

@ -53,11 +53,12 @@ New
Info<< "Selecting chemistry type " << chemistryTypeDict << endl; Info<< "Selecting chemistry type " << chemistryTypeDict << endl;
const int nCmpt = 12; const int nCmpt = 13;
const char* cmptNames[nCmpt] = const char* cmptNames[nCmpt] =
{ {
"chemistrySolver", "chemistrySolver",
"chemistryThermo", "chemistryThermo",
"baseChemistry",
"transport", "transport",
"thermo", "thermo",
"equationOfState", "equationOfState",
@ -107,8 +108,9 @@ New
word chemistryTypeName word chemistryTypeName
( (
word(chemistryTypeDict.lookup("chemistrySolver")) + '<' word(chemistryTypeDict.lookup("chemistrySolver")) + '<'
+ word(chemistryTypeDict.lookup("chemistryThermo")) + ',' + word(chemistryTypeDict.lookup("chemistryThermo")) + '<'
+ solidThermoTypeName + ',' + gasThermoTypeName + ">" + typeName + ','
+ solidThermoTypeName + ',' + gasThermoTypeName + ">>"
); );
Info<< "chemistryTypeName " << chemistryTypeName << endl; Info<< "chemistryTypeName " << chemistryTypeName << endl;

View File

@ -48,7 +48,8 @@ namespace Foam
defineTemplateTypeNameAndDebugWithName \ defineTemplateTypeNameAndDebugWithName \
( \ ( \
sChemistryl##Comp##SThermo, \ sChemistryl##Comp##SThermo, \
(#sChemistry"<"#Comp"," + SThermo::typeName() + ">").c_str(), \ (word(sChemistry::typeName_()) + "<"#Comp"," + SThermo::typeName() + \
+ ">").c_str(), \
0 \ 0 \
); \ ); \
\ \

View File

@ -47,8 +47,8 @@ namespace Foam
defineTemplateTypeNameAndDebugWithName \ defineTemplateTypeNameAndDebugWithName \
( \ ( \
SS##Schem##Comp##SThermo##GThermo, \ SS##Schem##Comp##SThermo##GThermo, \
(#SS"<"#Schem"<"#Comp"," + SThermo::typeName() + "," \ (#SS"<" + word(Schem::typeName_()) +"<"#Comp"," + SThermo::typeName() \
+ GThermo::typeName() + ">>").c_str(), \ + "," + GThermo::typeName() + ">>").c_str(), \
0 \ 0 \
); \ ); \
\ \

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -175,6 +175,7 @@ class triSurface
void writeDXGeometry(const bool, Ostream&) const; void writeDXGeometry(const bool, Ostream&) const;
void writeDXTrailer(Ostream&) const; void writeDXTrailer(Ostream&) const;
// Static private functions // Static private functions
//- Convert faces to labelledTri. All get same region. //- Convert faces to labelledTri. All get same region.
@ -203,6 +204,7 @@ class triSurface
//- read non-comment line //- read non-comment line
static string getLineNoComment(IFstream&); static string getLineNoComment(IFstream&);
protected: protected:
// Protected Member Functions // Protected Member Functions
@ -219,6 +221,7 @@ protected:
return static_cast<List<Face>&>(*this); return static_cast<List<Face>&>(*this);
} }
public: public:
// Public typedefs // Public typedefs
@ -287,7 +290,6 @@ public:
triSurface(const triSurface&); triSurface(const triSurface&);
//- Destructor //- Destructor
~triSurface(); ~triSurface();
@ -324,6 +326,7 @@ public:
// If >2 neighbours: undetermined. // If >2 neighbours: undetermined.
const labelList& edgeOwner() const; const labelList& edgeOwner() const;
// Edit // Edit
//- Move points //- Move points
@ -381,6 +384,7 @@ public:
labelList& faceMap labelList& faceMap
) const; ) const;
// Write // Write
//- Write to Ostream in simple FOAM format //- Write to Ostream in simple FOAM format

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -122,7 +122,7 @@ class alphatJayatillekeWallFunctionFvPatchScalarField
public: public:
//- Runtime type information //- Runtime type information
TypeName("alphatJayatillekeWallFunction"); TypeName("compressible::alphatJayatillekeWallFunction");
// Constructors // Constructors

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -105,7 +105,7 @@ class alphatWallFunctionFvPatchScalarField
public: public:
//- Runtime type information //- Runtime type information
TypeName("alphatWallFunction"); TypeName("compressible::alphatWallFunction");
// Constructors // Constructors

View File

@ -28,19 +28,19 @@ boundaryField
} }
ground ground
{ {
type alphatWallFunction; type compressible::alphatWallFunction;
Prt 0.85; Prt 0.85;
value uniform 0; value uniform 0;
} }
blockedFaces blockedFaces
{ {
type alphatWallFunction; type compressible::alphatWallFunction;
Prt 0.85; Prt 0.85;
value nonuniform 0(); value nonuniform 0();
} }
baffleWall baffleWall
{ {
type alphatWallFunction; type compressible::alphatWallFunction;
Prt 0.85; Prt 0.85;
value nonuniform 0(); value nonuniform 0();
} }

View File

@ -23,19 +23,19 @@ boundaryField
{ {
piston piston
{ {
type alphatWallFunction; type compressible::alphatWallFunction;
Prt 0.85; Prt 0.85;
value uniform 0; value uniform 0;
} }
liner liner
{ {
type alphatWallFunction; type compressible::alphatWallFunction;
Prt 0.85; Prt 0.85;
value uniform 0; value uniform 0;
} }
cylinderHead cylinderHead
{ {
type alphatWallFunction; type compressible::alphatWallFunction;
Prt 0.85; Prt 0.85;
value uniform 0; value uniform 0;
} }

View File

@ -23,7 +23,7 @@ boundaryField
{ {
ground ground
{ {
type alphatWallFunction; type compressible::alphatWallFunction;
mut muSgs; mut muSgs;
value uniform 0; value uniform 0;
} }
@ -45,7 +45,7 @@ boundaryField
"(region0_to.*)" "(region0_to.*)"
{ {
type alphatWallFunction; type compressible::alphatWallFunction;
mut muSgs; mut muSgs;
value uniform 0; value uniform 0;
} }

View File

@ -9,18 +9,18 @@ application=`getApplication`
runApplication blockMesh runApplication blockMesh
runApplication topoSet -dict cRefine.topoSetDict runApplication topoSet -dict system/cRefine.topoSetDict
runApplication refineMesh -overwrite -dict system/refineMeshDict runApplication refineMesh -overwrite -dict system/refineMeshDict
rm log.topoSet rm log.topoSet
runApplication topoSet -dict f.topoSetDict runApplication topoSet -dict system/f.topoSetDict
# create the pyrolysis region. # create the pyrolysis region.
runApplication extrudeToRegionMesh -overwrite runApplication extrudeToRegionMesh -overwrite
rm log.topoSet rm log.topoSet
runApplication topoSet -dict fBurner.topoSetDict runApplication topoSet -dict system/fBurner.topoSetDict
runApplication createPatch -overwrite runApplication createPatch -overwrite

View File

@ -23,22 +23,22 @@ boundaryField
{ {
front front
{ {
type alphatWallFunction; type compressible::alphatWallFunction;
value uniform 0; value uniform 0;
} }
back back
{ {
type alphatWallFunction; type compressible::alphatWallFunction;
value uniform 0; value uniform 0;
} }
wall wall
{ {
type alphatWallFunction; type compressible::alphatWallFunction;
value uniform 0; value uniform 0;
} }
porosityWall porosityWall
{ {
type alphatWallFunction; type compressible::alphatWallFunction;
value uniform 0; value uniform 0;
} }
inlet inlet

View File

@ -23,22 +23,22 @@ boundaryField
{ {
front front
{ {
type alphatWallFunction; type compressible::alphatWallFunction;
value uniform 0; value uniform 0;
} }
back back
{ {
type alphatWallFunction; type compressible::alphatWallFunction;
value uniform 0; value uniform 0;
} }
wall wall
{ {
type alphatWallFunction; type compressible::alphatWallFunction;
value uniform 0; value uniform 0;
} }
porosityWall porosityWall
{ {
type alphatWallFunction; type compressible::alphatWallFunction;
value uniform 0; value uniform 0;
} }
inlet inlet

View File

@ -23,13 +23,13 @@ boundaryField
{ {
movingWall movingWall
{ {
type alphatWallFunction; type compressible::alphatWallFunction;
Prt 0.85; Prt 0.85;
value uniform 0; value uniform 0;
} }
fixedWalls fixedWalls
{ {
type alphatWallFunction; type compressible::alphatWallFunction;
Prt 0.85; Prt 0.85;
value uniform 0; value uniform 0;
} }

View File

@ -23,13 +23,13 @@ boundaryField
{ {
rotor rotor
{ {
type alphatWallFunction; type compressible::alphatWallFunction;
Prt 0.85; Prt 0.85;
value uniform 0; value uniform 0;
} }
stator stator
{ {
type alphatWallFunction; type compressible::alphatWallFunction;
Prt 0.85; Prt 0.85;
value uniform 0; value uniform 0;
} }

View File

@ -23,22 +23,22 @@ boundaryField
{ {
front front
{ {
type alphatWallFunction; type compressible::alphatWallFunction;
value uniform 0; value uniform 0;
} }
back back
{ {
type alphatWallFunction; type compressible::alphatWallFunction;
value uniform 0; value uniform 0;
} }
wall wall
{ {
type alphatWallFunction; type compressible::alphatWallFunction;
value uniform 0; value uniform 0;
} }
porosityWall porosityWall
{ {
type alphatWallFunction; type compressible::alphatWallFunction;
value uniform 0; value uniform 0;
} }
inlet inlet

View File

@ -23,22 +23,22 @@ boundaryField
{ {
front front
{ {
type alphatWallFunction; type compressible::alphatWallFunction;
value uniform 0; value uniform 0;
} }
back back
{ {
type alphatWallFunction; type compressible::alphatWallFunction;
value uniform 0; value uniform 0;
} }
wall wall
{ {
type alphatWallFunction; type compressible::alphatWallFunction;
value uniform 0; value uniform 0;
} }
porosityWall porosityWall
{ {
type alphatWallFunction; type compressible::alphatWallFunction;
value uniform 0; value uniform 0;
} }
inlet inlet

View File

@ -23,22 +23,22 @@ boundaryField
{ {
front front
{ {
type alphatWallFunction; type compressible::alphatWallFunction;
value uniform 0; value uniform 0;
} }
back back
{ {
type alphatWallFunction; type compressible::alphatWallFunction;
value uniform 0; value uniform 0;
} }
wall wall
{ {
type alphatWallFunction; type compressible::alphatWallFunction;
value uniform 0; value uniform 0;
} }
porosityWall porosityWall
{ {
type alphatWallFunction; type compressible::alphatWallFunction;
value uniform 0; value uniform 0;
} }
inlet inlet

View File

@ -23,7 +23,7 @@ boundaryField
{ {
Default_Boundary_Region Default_Boundary_Region
{ {
type alphatWallFunction; type compressible::alphatWallFunction;
Prt 0.85; Prt 0.85;
value uniform 0; value uniform 0;
} }

View File

@ -37,7 +37,7 @@ boundaryField
} }
WALL10 WALL10
{ {
type alphatWallFunction; type compressible::alphatWallFunction;
Prt 0.85; Prt 0.85;
value uniform 0; value uniform 0;
} }

View File

@ -43,7 +43,7 @@ boundaryField
} }
prismWall prismWall
{ {
type alphatWallFunction; type compressible::alphatWallFunction;
value uniform 0; value uniform 0;
} }
defaultFaces defaultFaces

View File

@ -23,17 +23,17 @@ boundaryField
{ {
floor floor
{ {
type alphatWallFunction; type compressible::alphatWallFunction;
value uniform 0; value uniform 0;
} }
ceiling ceiling
{ {
type alphatWallFunction; type compressible::alphatWallFunction;
value uniform 0; value uniform 0;
} }
fixedWalls fixedWalls
{ {
type alphatWallFunction; type compressible::alphatWallFunction;
value uniform 0; value uniform 0;
} }
} }

View File

@ -23,25 +23,25 @@ boundaryField
{ {
frontAndBack frontAndBack
{ {
type alphatWallFunction; type compressible::alphatWallFunction;
Prt 0.85; Prt 0.85;
value uniform 0; value uniform 0;
} }
topAndBottom topAndBottom
{ {
type alphatWallFunction; type compressible::alphatWallFunction;
Prt 0.85; Prt 0.85;
value uniform 0; value uniform 0;
} }
hot hot
{ {
type alphatWallFunction; type compressible::alphatWallFunction;
Prt 0.85; Prt 0.85;
value uniform 0; value uniform 0;
} }
cold cold
{ {
type alphatWallFunction; type compressible::alphatWallFunction;
Prt 0.85; Prt 0.85;
value uniform 0; value uniform 0;
} }

View File

@ -23,12 +23,12 @@ boundaryField
{ {
floor floor
{ {
type alphatWallFunction; type compressible::alphatWallFunction;
value uniform 0; value uniform 0;
} }
ceiling ceiling
{ {
type alphatWallFunction; type compressible::alphatWallFunction;
value uniform 0; value uniform 0;
} }
inlet inlet

View File

@ -22,7 +22,7 @@ dictionaryReplacement
{ {
"baffle.*" "baffle.*"
{ {
type alphatWallFunction; type compressible::alphatWallFunction;
value uniform 0; value uniform 0;
} }
} }

View File

@ -22,7 +22,7 @@ dictionaryReplacement
{ {
"baffle1.*" "baffle1.*"
{ {
type alphatWallFunction; type compressible::alphatWallFunction;
value uniform 0; value uniform 0;
} }
} }

View File

@ -22,7 +22,7 @@ dictionaryReplacement
{ {
"region0_to_.*" "region0_to_.*"
{ {
type alphatWallFunction; type compressible::alphatWallFunction;
value uniform 0; value uniform 0;
} }
} }

View File

@ -80,7 +80,7 @@ baffles
alphat alphat
{ {
type alphatWallFunction; type compressible::alphatWallFunction;
value uniform 0; value uniform 0;
} }
epsilon epsilon

View File

@ -23,22 +23,22 @@ boundaryField
{ {
box box
{ {
type alphatWallFunction; type compressible::alphatWallFunction;
value uniform 0; value uniform 0;
} }
floor floor
{ {
type alphatWallFunction; type compressible::alphatWallFunction;
value uniform 0; value uniform 0;
} }
ceiling ceiling
{ {
type alphatWallFunction; type compressible::alphatWallFunction;
value uniform 0; value uniform 0;
} }
fixedWalls fixedWalls
{ {
type alphatWallFunction; type compressible::alphatWallFunction;
value uniform 0; value uniform 0;
} }
} }

View File

@ -23,25 +23,25 @@ boundaryField
{ {
box box
{ {
type alphatWallFunction; type compressible::alphatWallFunction;
Prt 0.85; Prt 0.85;
value uniform 0; value uniform 0;
} }
floor floor
{ {
type alphatWallFunction; type compressible::alphatWallFunction;
Prt 0.85; Prt 0.85;
value uniform 0; value uniform 0;
} }
ceiling ceiling
{ {
type alphatWallFunction; type compressible::alphatWallFunction;
Prt 0.85; Prt 0.85;
value uniform 0; value uniform 0;
} }
fixedWalls fixedWalls
{ {
type alphatWallFunction; type compressible::alphatWallFunction;
Prt 0.85; Prt 0.85;
value uniform 0; value uniform 0;
} }

View File

@ -23,19 +23,19 @@ boundaryField
{ {
floor floor
{ {
type alphatWallFunction; type compressible::alphatWallFunction;
Prt 0.85; Prt 0.85;
value uniform 0; value uniform 0;
} }
ceiling ceiling
{ {
type alphatWallFunction; type compressible::alphatWallFunction;
Prt 0.85; Prt 0.85;
value uniform 0; value uniform 0;
} }
fixedWalls fixedWalls
{ {
type alphatWallFunction; type compressible::alphatWallFunction;
Prt 0.85; Prt 0.85;
value uniform 0; value uniform 0;
} }

View File

@ -20,6 +20,7 @@ FoamFile
frontAndBack frontAndBack
{ {
type symmetryPlane; type symmetryPlane;
inGroups 1(symmetryPlane);
nFaces 320; nFaces 320;
startFace 3456; startFace 3456;
} }
@ -44,6 +45,7 @@ FoamFile
upperWall upperWall
{ {
type symmetryPlane; type symmetryPlane;
inGroups 1(symmetryPlane);
nFaces 160; nFaces 160;
startFace 4064; startFace 4064;
} }

View File

@ -19,13 +19,13 @@ libs ("libOpenFOAM.so" "libfieldFunctionObjects.so");
application simpleFoam; application simpleFoam;
startFrom latestTime; startFrom startTime;
startTime 0; startTime 0;
stopAt endTime; stopAt endTime;
endTime 500; endTime 5;
deltaT 1; deltaT 1;

View File

@ -23,7 +23,7 @@ ddtSchemes
gradSchemes gradSchemes
{ {
default Gauss linear; default Gauss linear;
grad(U) cellLimited Gauss linear 1; grad(U) fourth; //cellLimited Gauss linear 1;
grad(nuTilda) cellLimited Gauss linear 1; grad(nuTilda) cellLimited Gauss linear 1;
} }

View File

@ -46,7 +46,7 @@ boundaryField
} }
walls walls
{ {
type alphatWallFunction; type compressible::alphatWallFunction;
Prt 0.85; Prt 0.85;
value uniform 0; value uniform 0;
} }

View File

@ -46,7 +46,7 @@ boundaryField
} }
walls walls
{ {
type alphatWallFunction; type compressible::alphatWallFunction;
Prt 0.85; Prt 0.85;
value uniform 0; value uniform 0;
} }

View File

@ -23,17 +23,17 @@ boundaryField
{ {
top top
{ {
type alphatWallFunction; type compressible::alphatWallFunction;
value uniform 0; value uniform 0;
} }
bottom bottom
{ {
type alphatWallFunction; type compressible::alphatWallFunction;
value uniform 0; value uniform 0;
} }
walls walls
{ {
type alphatWallFunction; type compressible::alphatWallFunction;
value uniform 0; value uniform 0;
} }
symmetry symmetry

View File

@ -23,7 +23,7 @@ boundaryField
{ {
walls walls
{ {
type alphatWallFunction; type compressible::alphatWallFunction;
Prt 0.85; Prt 0.85;
value uniform 0; value uniform 0;
} }

View File

@ -23,7 +23,7 @@ boundaryField
{ {
walls walls
{ {
type alphatWallFunction; type compressible::alphatWallFunction;
value uniform 0; value uniform 0;
} }
inlet inlet

View File

@ -23,7 +23,7 @@ boundaryField
{ {
walls walls
{ {
type alphatWallFunction; type compressible::alphatWallFunction;
value uniform 0; value uniform 0;
} }
inlet inlet

View File

@ -46,7 +46,7 @@ boundaryField
} }
walls walls
{ {
type alphatWallFunction; type compressible::alphatWallFunction;
Prt 0.85; Prt 0.85;
value uniform 0; value uniform 0;
} }

View File

@ -46,7 +46,7 @@ boundaryField
} }
walls walls
{ {
type alphatWallFunction; type compressible::alphatWallFunction;
Prt 0.85; Prt 0.85;
value uniform 0; value uniform 0;
} }

View File

@ -46,7 +46,7 @@ boundaryField
} }
walls walls
{ {
type alphatWallFunction; type compressible::alphatWallFunction;
Prt 0.85; Prt 0.85;
value uniform 0; value uniform 0;
} }

View File

@ -23,7 +23,7 @@ boundaryField
{ {
walls walls
{ {
type alphatWallFunction; type compressible::alphatWallFunction;
value uniform 0; value uniform 0;
} }
} }