Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' of github.com:OpenFOAM/OpenFOAM-2.0.x

  • Loading branch information...
commit 03233a7696f077372a090ce1efd19256bbbbf880 2 parents dc17e72 + 5f38cb9
Henry authored
Showing with 304 additions and 660 deletions.
  1. +0 −2  applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C
  2. +1 −1  applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModelNew.C
  3. +6 −9 applications/solvers/combustion/chemFoam/readInitialConditions.H
  4. +1 −0  src/OpenFOAM/containers/Lists/ListOps/ListOpsTemplates.C
  5. +1 −6 src/OpenFOAM/primitives/random/cachedRandom/cachedRandom.C
  6. +5 −5 src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C
  7. +2 −1  src/engine/ignition/ignitionSite.C
  8. +1 −0  src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelInjectionModels.H
  9. +21 −35 src/lagrangian/intermediate/submodels/CloudFunctionObjects/FacePostProcessing/FacePostProcessing.C
  10. +0 −8 src/lagrangian/intermediate/submodels/CloudFunctionObjects/FacePostProcessing/FacePostProcessing.H
  11. +1 −14 tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/Aw
  12. +1 −14 tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/B
  13. +1 −14 tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/CR
  14. +1 −14 tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/CT
  15. +1 −14 tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/Lobs
  16. +1 −14 tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/Nv
  17. +1 −13 tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/Su
  18. +1 −14 tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/T
  19. +1 −14 tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/Tu
  20. +1 −22 tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/U
  21. +1 −14 tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/Xi
  22. +0 −14 tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/alphat
  23. +1 −14 tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/b
  24. +1 −14 tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/betav
  25. +1 −17 tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/epsilon
  26. +1 −14 tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/ft
  27. +161 −8 tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/k
  28. +0 −16 tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/mut
  29. +1 −14 tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/nsv
  30. +1 −13 tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/p
  31. +1 −1  tutorials/combustion/PDRFoam/flamePropagationWithObstacles/Allrun
  32. +3 −3 tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/combustionProperties
  33. +2 −2 tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/dynamicMeshDict
  34. +0 −20 tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/polyMesh/blockMeshDict
  35. +2 −24 tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/polyMesh/boundary
  36. +0 −5 tutorials/combustion/PDRFoam/flamePropagationWithObstacles/makeBlockedFaceSet.setSet
  37. +6 −5 tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/PDRMeshDict
  38. +0 −241 tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/changeDictionaryDict
  39. +2 −2 tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/controlDict
  40. +5 −5 tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/fvSolution
  41. +67 −0 tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/topoSetDict
View
2  applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C
@@ -119,7 +119,6 @@ int main(int argc, char *argv[])
// Make the fluxes absolute
fvc::makeAbsolute(phi, rho, U);
- // Test : disable refinement for some cells
PackedBoolList& protectedCell =
refCast<dynamicRefineFvMesh>(mesh).protectedCell();
@@ -143,7 +142,6 @@ int main(int argc, char *argv[])
// Do any mesh changes
bool meshChanged = mesh.update();
-
if (meshChanged)
{
hasChanged = true;
View
2  applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModelNew.C
@@ -38,7 +38,7 @@ Foam::autoPtr<Foam::PDRDragModel> Foam::PDRDragModel::New
{
const word modelType(PDRProperties.lookup("PDRDragModel"));
- Info<< "Selecting flame-wrinkling model " << modelType << endl;
+ Info<< "Selecting PDR drag model " << modelType << endl;
dictionaryConstructorTable::iterator cstrIter =
dictionaryConstructorTablePtr_->find(modelType);
View
15 applications/solvers/combustion/chemFoam/readInitialConditions.H
@@ -1,13 +1,5 @@
word constProp(initialConditions.lookup("constantProperty"));
- if (constProp == "pressure" || constProp == "volume")
- {
- Info << constProp << " will be held constant." << nl
- << " p = " << p[0] << " [Pa]" << nl
- << " T = " << thermo.T()[0] << " [K] " << nl
- << " rho = " << rho[0] << " [kg/m3]" << nl
- << endl;
- }
- else
+ if ((constProp != "pressure") && (constProp != "volume"))
{
FatalError << "in initialConditions, unknown constantProperty type "
<< constProp << nl << " Valid types are: pressure volume."
@@ -110,3 +102,8 @@
scalar integratedHeat = 0.0;
+ Info << constProp << " will be held constant." << nl
+ << " p = " << p[0] << " [Pa]" << nl
+ << " T = " << thermo.T()[0] << " [K] " << nl
+ << " rho = " << rho[0] << " [kg/m3]" << nl
+ << endl;
View
1  src/OpenFOAM/containers/Lists/ListOps/ListOpsTemplates.C
@@ -243,6 +243,7 @@ void Foam::uniqueOrder
order[n++] = order[i];
}
}
+ order[n++] = order[order.size()-1];
order.setSize(n);
}
}
View
7 src/OpenFOAM/primitives/random/cachedRandom/cachedRandom.C
@@ -26,11 +26,6 @@ License
#include "cachedRandom.H"
#include "OSspecific.H"
-#if INT_MAX != 2147483647
-# error "INT_MAX != 2147483647"
-# error "The random number generator may not work!"
-#endif
-
// * * * * * * * * * * * * * private Member Functions * * * * * * * * * * * //
Foam::scalar Foam::cachedRandom::scalar01()
@@ -79,7 +74,7 @@ Foam::cachedRandom::cachedRandom(const label seed, const label count)
osRandomSeed(seed_);
forAll(samples_, i)
{
- samples_[i] = drand48();
+ samples_[i] = osRandomDouble();
}
}
View
10 src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C
@@ -240,10 +240,8 @@ Foam::dynamicRefineFvMesh::refine
}
}
-
// Update fields
updateMesh(map);
-
// Move mesh
/*
pointField newPoints;
@@ -333,6 +331,7 @@ Foam::dynamicRefineFvMesh::refine
}
surfaceScalarField& phi = const_cast<surfaceScalarField&>(*iter());
+
const surfaceScalarField phiU
(
fvc::interpolate
@@ -407,14 +406,15 @@ Foam::dynamicRefineFvMesh::refine
fvsPatchScalarField& patchPhi =
phi.boundaryField()[patchI];
- patchPhi[i] = patchPhiU[i];
+ if (patchPhi.size() > 0)
+ {
+ patchPhi[i] = patchPhiU[i];
+ }
}
}
}
}
-
-
// Update numbering of cells/vertices.
meshCutter_.updateMesh(map);
View
3  src/engine/ignition/ignitionSite.C
@@ -36,9 +36,10 @@ void Foam::ignitionSite::findIgnitionCells(const fvMesh& mesh)
const volVectorField& centres = mesh.C();
const scalarField& vols = mesh.V();
- label ignCell = mesh.findCell(location_);
+ label ignCell = mesh.findNearestCell(location_);
if (ignCell == -1)
{
+ Info << "NOT FOUND" << endl;
return;
}
View
1  src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelInjectionModels.H
@@ -44,6 +44,7 @@ License
makeInjectionModel(CloudType); \
makeInjectionModelType(CellZoneInjection, CloudType); \
makeInjectionModelType(ConeInjection, CloudType); \
+ makeInjectionModelType(ConeNozzleInjection, CloudType); \
makeInjectionModelType(FieldActivatedInjection, CloudType); \
makeInjectionModelType(ManualInjection, CloudType); \
makeInjectionModelType(NoInjection, CloudType); \
View
56 src/lagrangian/intermediate/submodels/CloudFunctionObjects/FacePostProcessing/FacePostProcessing.C
@@ -32,32 +32,6 @@ License
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
template<class CloudType>
-void Foam::FacePostProcessing<CloudType>::applyToFace
-(
- const label faceIn,
- label& zoneI,
- label& faceI
-) const
-{
- const faceZoneMesh& fzm = this->owner().mesh().faceZones();
-
- forAll(faceZoneIDs_, i)
- {
- const faceZone& fz = fzm[faceZoneIDs_[i]];
- forAll(fz, j)
- {
- if (fz[j] == faceIn)
- {
- zoneI = i;
- faceI = j;
- return;
- }
- }
- }
-}
-
-
-template<class CloudType>
void Foam::FacePostProcessing<CloudType>::makeLogFile
(
const word& zoneName,
@@ -326,15 +300,14 @@ Foam::FacePostProcessing<CloudType>::FacePostProcessing
forAll(fz, j)
{
label faceI = fz[j];
- label bFaceI = faceI - owner.mesh().nInternalFaces();
- label patchI = pbm.patchID()[bFaceI];
-
- if (patchI == -1)
+ if (faceI < owner.mesh().nInternalFaces())
{
totArea += magSf[fz[j]];
}
else
{
+ label bFaceI = faceI - owner.mesh().nInternalFaces();
+ label patchI = pbm.patchID()[bFaceI];
const polyPatch& pp = pbm[patchI];
if
@@ -402,13 +375,26 @@ void Foam::FacePostProcessing<CloudType>::postFace
|| this->owner().solution().transient()
)
{
- label zoneId = -1;
- label faceId = -1;
- applyToFace(faceI, zoneId, faceId);
+ const faceZoneMesh& fzm = this->owner().mesh().faceZones();
- if ((zoneId != -1) && (faceId != -1))
+ forAll(faceZoneIDs_, i)
{
- mass_[zoneId][faceId] += p.mass()*p.nParticle();
+ const faceZone& fz = fzm[faceZoneIDs_[i]];
+
+ label faceId = -1;
+ forAll(fz, j)
+ {
+ if (fz[j] == faceI)
+ {
+ faceId = j;
+ break;
+ }
+ }
+
+ if (faceId != -1)
+ {
+ mass_[i][faceId] += p.mass()*p.nParticle();
+ }
}
}
}
View
8 src/lagrangian/intermediate/submodels/CloudFunctionObjects/FacePostProcessing/FacePostProcessing.H
@@ -106,14 +106,6 @@ class FacePostProcessing
const scalar totArea
);
- //- Return index into storage lists if valid zone and face
- void applyToFace
- (
- const label faceIn,
- label& zoneI, label&
- faceI
- ) const;
-
protected:
View
15 tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/Aw
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.0.0 |
+| \\ / O peration | Version: 2.0.x |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -8065,19 +8065,6 @@ boundaryField
type zeroGradient;
value uniform 0;
}
- baffleWall
- {
- type zeroGradient;
- value uniform 0;
- }
- baffleCyclic_half0
- {
- type cyclic;
- }
- baffleCyclic_half1
- {
- type cyclic;
- }
}
View
15 tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/B
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.0.0 |
+| \\ / O peration | Version: 2.0.x |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -8065,19 +8065,6 @@ boundaryField
type zeroGradient;
value uniform ( 0 0 0 0 0 0 );
}
- baffleWall
- {
- type zeroGradient;
- value uniform ( 0 0 0 0 0 0 );
- }
- baffleCyclic_half0
- {
- type cyclic;
- }
- baffleCyclic_half1
- {
- type cyclic;
- }
}
View
15 tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/CR
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.0.0 |
+| \\ / O peration | Version: 2.0.x |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -8065,19 +8065,6 @@ boundaryField
type zeroGradient;
value uniform ( 0 0 0 0 0 0 );
}
- baffleWall
- {
- type zeroGradient;
- value uniform ( 0 0 0 0 0 0 );
- }
- baffleCyclic_half0
- {
- type cyclic;
- }
- baffleCyclic_half1
- {
- type cyclic;
- }
}
View
15 tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/CT
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.0.0 |
+| \\ / O peration | Version: 2.0.x |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -8065,19 +8065,6 @@ boundaryField
type zeroGradient;
value uniform ( 0 0 0 0 0 0 );
}
- baffleWall
- {
- type zeroGradient;
- value uniform ( 0 0 0 0 0 0 );
- }
- baffleCyclic_half0
- {
- type cyclic;
- }
- baffleCyclic_half1
- {
- type cyclic;
- }
}
View
15 tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/Lobs
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.0.0 |
+| \\ / O peration | Version: 2.0.x |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -8065,19 +8065,6 @@ boundaryField
type zeroGradient;
value uniform 0;
}
- baffleWall
- {
- type zeroGradient;
- value uniform 0;
- }
- baffleCyclic_half0
- {
- type cyclic;
- }
- baffleCyclic_half1
- {
- type cyclic;
- }
}
View
15 tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/Nv
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.0.0 |
+| \\ / O peration | Version: 2.0.x |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -8065,19 +8065,6 @@ boundaryField
type zeroGradient;
value uniform 0;
}
- baffleWall
- {
- type zeroGradient;
- value uniform 0;
- }
- baffleCyclic_half0
- {
- type cyclic;
- }
- baffleCyclic_half1
- {
- type cyclic;
- }
}
View
14 tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/Su
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.0.0 |
+| \\ / O peration | Version: 2.0.x |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -35,18 +35,6 @@ boundaryField
{
type zeroGradient;
}
- baffleWall
- {
- type zeroGradient;
- }
- baffleCyclic_half0
- {
- type cyclic;
- }
- baffleCyclic_half1
- {
- type cyclic;
- }
}
View
15 tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/T
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.0.0 |
+| \\ / O peration | Version: 2.0.x |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -36,19 +36,6 @@ boundaryField
type zeroGradient;
value uniform 300;
}
- baffleWall
- {
- type zeroGradient;
- value uniform 300;
- }
- baffleCyclic_half0
- {
- type cyclic;
- }
- baffleCyclic_half1
- {
- type cyclic;
- }
}
View
15 tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/Tu
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.0.0 |
+| \\ / O peration | Version: 2.0.x |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -36,19 +36,6 @@ boundaryField
type zeroGradient;
value uniform 300;
}
- baffleWall
- {
- type zeroGradient;
- value uniform 300;
- }
- baffleCyclic_half0
- {
- type cyclic;
- }
- baffleCyclic_half1
- {
- type cyclic;
- }
}
View
23 tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/U
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.0.0 |
+| \\ / O peration | Version: 2.0.x |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -37,27 +37,6 @@ boundaryField
type fixedValue;
value uniform ( 0 0 0 );
}
- baffleWall
- {
- type activePressureForceBaffleVelocity;
- value uniform ( 0 0 0 );
- cyclicPatch baffleCyclic_half0;
- orientation 1;
- openingTime 0.01;
- maxOpenFractionDelta 0.1;
- openFraction 0;
- p p;
- minThresholdValue 8000;
- forceBased 0;
- }
- baffleCyclic_half0
- {
- type cyclic;
- }
- baffleCyclic_half1
- {
- type cyclic;
- }
}
View
15 tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/Xi
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.0.0 |
+| \\ / O peration | Version: 2.0.x |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -36,19 +36,6 @@ boundaryField
type zeroGradient;
value uniform 1;
}
- baffleWall
- {
- type zeroGradient;
- value uniform 1;
- }
- baffleCyclic_half0
- {
- type cyclic;
- }
- baffleCyclic_half1
- {
- type cyclic;
- }
}
View
14 tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/alphat
@@ -38,20 +38,6 @@ boundaryField
Prt 0.85;
value nonuniform 0();
}
- baffleWall
- {
- type alphatWallFunction;
- Prt 0.85;
- value nonuniform 0();
- }
- baffleCyclic_half0
- {
- type cyclic;
- }
- baffleCyclic_half1
- {
- type cyclic;
- }
}
View
15 tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/b
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.0.0 |
+| \\ / O peration | Version: 2.0.x |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -36,19 +36,6 @@ boundaryField
type zeroGradient;
value uniform 1;
}
- baffleWall
- {
- type zeroGradient;
- value uniform 1;
- }
- baffleCyclic_half0
- {
- type cyclic;
- }
- baffleCyclic_half1
- {
- type cyclic;
- }
}
View
15 tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/betav
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.0.0 |
+| \\ / O peration | Version: 2.0.x |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -8065,19 +8065,6 @@ boundaryField
type zeroGradient;
value uniform 0;
}
- baffleWall
- {
- type zeroGradient;
- value uniform 0;
- }
- baffleCyclic_half0
- {
- type cyclic;
- }
- baffleCyclic_half1
- {
- type cyclic;
- }
}
View
18 tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/epsilon
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.0.0 |
+| \\ / O peration | Version: 2.0.x |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -43,22 +43,6 @@ boundaryField
E 9.8;
value uniform 0.1;
}
- baffleWall
- {
- type compressible::epsilonWallFunction;
- Cmu 0.09;
- kappa 0.41;
- E 9.8;
- value uniform 1e-05;
- }
- baffleCyclic_half0
- {
- type cyclic;
- }
- baffleCyclic_half1
- {
- type cyclic;
- }
}
View
15 tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/ft
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.0.0 |
+| \\ / O peration | Version: 2.0.x |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -35,19 +35,6 @@ boundaryField
{
type zeroGradient;
}
- baffleWall
- {
- type zeroGradient;
- value uniform 0.06024096;
- }
- baffleCyclic_half0
- {
- type cyclic;
- }
- baffleCyclic_half1
- {
- type cyclic;
- }
}
View
169 tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/k
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.0.0 |
+| \\ / O peration | Version: 2.0.x |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -37,18 +37,171 @@ boundaryField
type compressible::kqRWallFunction;
value uniform 1.5;
}
- baffleWall
+}
+
+Su
+{
+ boundaryField
{
- type compressible::kqRWallFunction;
- value uniform 1.5;
+ blockedFaces
+ {
+ type zeroGradient;
+ }
+ }
+}
+
+Xi
+{
+ boundaryField
+ {
+ blockedFaces
+ {
+ type zeroGradient;
+ value uniform 1;
+ }
+ }
+}
+
+T
+{
+ boundaryField
+ {
+ blockedFaces
+ {
+ type zeroGradient;
+ value uniform 300;
+ }
+ }
+}
+
+Tu
+{
+ boundaryField
+ {
+ blockedFaces
+ {
+ type zeroGradient;
+ value uniform 300;
+ }
+ }
+}
+
+b
+{
+ boundaryField
+ {
+ blockedFaces
+ {
+ type zeroGradient;
+ value uniform 1;
+ }
+ }
+}
+
+ft
+{
+ boundaryField
+ {
+ blockedFaces
+ {
+ type zeroGradient;
+ }
+ }
+}
+
+Aw
+{
+ boundaryField
+ {
+ blockedFaces
+ {
+ type zeroGradient;
+ value uniform 0;
+ }
}
- baffleCyclic_half0
+}
+
+B
+{
+ boundaryField
{
- type cyclic;
+ blockedFaces
+ {
+ type zeroGradient;
+ value uniform ( 0 0 0 0 0 0 );
+ }
}
- baffleCyclic_half1
+}
+
+betav
+{
+ boundaryField
+ {
+ blockedFaces
+ {
+ type zeroGradient;
+ value uniform 0;
+ }
+ }
+}
+
+CR
+{
+ boundaryField
+ {
+ blockedFaces
+ {
+ type zeroGradient;
+ value uniform ( 0 0 0 0 0 0 );
+ }
+ }
+}
+
+CT
+{
+ boundaryField
+ {
+ blockedFaces
+ {
+ type zeroGradient;
+ value uniform ( 0 0 0 0 0 0 );
+ }
+ }
+}
+
+Nv
+{
+ boundaryField
+ {
+ blockedFaces
+ {
+ type zeroGradient;
+ value uniform 0;
+ }
+ }
+}
+
+nsv
+{
+ boundaryField
+ {
+ blockedFaces
+ {
+ type zeroGradient;
+ value uniform ( 0 0 0 0 0 0 );
+ }
+ }
+}
+
+Lobs
+{
+ boundaryField
{
- type cyclic;
+ blockedFaces
+ {
+ type zeroGradient;
+ value uniform 0;
+ }
}
}
View
16 tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/mut
@@ -42,22 +42,6 @@ boundaryField
E 9.8;
value nonuniform 0();
}
- baffleWall
- {
- type mutkWallFunction;
- Cmu 0.09;
- kappa 0.41;
- E 9.8;
- value nonuniform 0();
- }
- baffleCyclic_half0
- {
- type cyclic;
- }
- baffleCyclic_half1
- {
- type cyclic;
- }
}
View
15 tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/nsv
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.0.0 |
+| \\ / O peration | Version: 2.0.x |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -8066,19 +8066,6 @@ boundaryField
type zeroGradient;
value uniform ( 0 0 0 0 0 0 );
}
- baffleWall
- {
- type zeroGradient;
- value uniform ( 0 0 0 0 0 0 );
- }
- baffleCyclic_half0
- {
- type cyclic;
- }
- baffleCyclic_half1
- {
- type cyclic;
- }
}
View
14 tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0/p
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.0.0 |
+| \\ / O peration | Version: 2.0.x |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -37,18 +37,6 @@ boundaryField
{
type zeroGradient;
}
- baffleWall
- {
- type zeroGradient;
- }
- baffleCyclic_half0
- {
- type cyclic;
- }
- baffleCyclic_half1
- {
- type cyclic;
- }
}
View
2  tutorials/combustion/PDRFoam/flamePropagationWithObstacles/Allrun
@@ -7,7 +7,7 @@ cd ${0%/*} || exit 1 # run from this directory
runApplication blockMesh
runApplication changeDictionary
-runApplication setSet -batch makeBlockedFaceSet.setSet
+runApplication topoSet
runApplication PDRMesh
View
6 tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/combustionProperties
@@ -28,10 +28,10 @@ ignitionSites
{
location (1.5 1.5 0.5);
- diameter 0.005;
+ diameter 0.1;
start 1E-05;
- duration 0.05;
- strength 10.0;
+ duration 0.03;
+ strength 60.0;
}
);
View
4 tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/dynamicMeshDict
@@ -37,7 +37,7 @@ dynamicRefineFvMeshCoeffs
dumpLevel true;
lowerRefineLevel 0.5;
- upperRefineLevel 1.5;
+ upperRefineLevel 1.0;
unrefineLevel 0.5;
@@ -52,7 +52,7 @@ dynamicRefineFvMeshCoeffs
// gets estimated from an interpolated volVectorField ('velocity')
// First is name of the flux to adapt, second is velocity that will
// be interpolated and inner-producted with the face area vector.
- correctFluxes ((phi U));
+ correctFluxes ((phi rhoU) (phi_0 none));
}
// ************************************************************************* //
View
20 tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/polyMesh/blockMeshDict
@@ -244,24 +244,4 @@ boundary
type wall;
faces ();
}
-
- baffleWall
- {
- type wall;
- faces ();
- }
-
- baffleCyclic_half0
- {
- type cyclic;
- neighbourPatch baffleCyclic_half1;
- faces ();
- }
-
- baffleCyclic_half1
- {
- type cyclic;
- neighbourPatch baffleCyclic_half0;
- faces ();
- }
);
View
26 tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/polyMesh/boundary
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.0.0 |
+| \\ / O peration | Version: 2.0.x |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-6
+3
(
outer
{
@@ -35,28 +35,6 @@ FoamFile
nFaces 0;
startFace 24810;
}
- baffleWall
- {
- type wall;
- nFaces 0;
- startFace 24810;
- }
- baffleCyclic_half0
- {
- type cyclic;
- nFaces 0;
- startFace 24810;
- matchTolerance 0.0001;
- neighbourPatch baffleCyclic_half1;
- }
- baffleCyclic_half1
- {
- type cyclic;
- nFaces 0;
- startFace 24810;
- matchTolerance 0.0001;
- neighbourPatch baffleCyclic_half0;
- }
)
// ************************************************************************* //
View
5 tutorials/combustion/PDRFoam/flamePropagationWithObstacles/makeBlockedFaceSet.setSet
@@ -1,5 +0,0 @@
-faceSet blockedFacesSet new boxToFace (1 1 0.99) (2 2 1)
-cellSet blockedCellsSet new boxToCell (2.4 2.4 0) (3 3 1)
-cellSet blockedCellsSet add boxToCell (0 0 0) (0.6 0.6 1)
-faceSet blockedFacesSet add cellToFace blockedCellsSet all
-faceSet coupledFacesSet new boxToFace (1.0 1.99 0) (2.0 2.09 0.6)
View
11 tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/PDRMeshDict
@@ -18,14 +18,15 @@ FoamFile
blockedFaces ((blockedFacesSet blockedFaces));
//- Per faceSet the patch the faces should go into coupled baffles
+
coupledFaces
{
- coupledFacesSet
- {
- wallPatchName baffleWall;
- cyclicMasterPatchName baffleCyclic_half0;
- }
+// coupledFacesSet
+// {
+// wallPatchName baffleWall;
+// cyclicMasterPatchName baffleCyclic_half0;
+// }
}
//- Name of cellSet that holds the cells to fully remove
View
241 tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/changeDictionaryDict
@@ -24,18 +24,6 @@ dictionaryReplacement
{
type zeroGradient;
}
- baffleWall
- {
- type zeroGradient;
- }
- baffleCyclic_half0
- {
- type cyclic;
- }
- baffleCyclic_half1
- {
- type cyclic;
- }
}
}
@@ -48,27 +36,6 @@ dictionaryReplacement
type fixedValue;
value uniform (0 0 0);
}
- baffleWall
- {
- type activePressureForceBaffleVelocity;
- cyclicPatch baffleCyclic_half0;
- orientation 1;
- openingTime 0.01;
- maxOpenFractionDelta 0.1;
- openFraction 0;
- p p;
- minThresholdValue 8000;
- forceBased 0;
- value uniform ( 0 0 0 );
- }
- baffleCyclic_half0
- {
- type cyclic;
- }
- baffleCyclic_half1
- {
- type cyclic;
- }
}
}
@@ -81,19 +48,6 @@ dictionaryReplacement
type compressible::epsilonWallFunction;
value uniform 0.1;
}
- baffleWall
- {
- type compressible::epsilonWallFunction;
- value uniform 1e-5;
- }
- baffleCyclic_half0
- {
- type cyclic;
- }
- baffleCyclic_half1
- {
- type cyclic;
- }
}
}
@@ -105,20 +59,6 @@ dictionaryReplacement
{
type compressible::kqRWallFunction;
value uniform 1.5;
- }
- baffleWall
- {
- type compressible::kqRWallFunction;
- value uniform 1.5;
- }
- baffleCyclic_half0
- {
- type cyclic;
- }
- baffleCyclic_half1
- {
- type cyclic;
- }
}
}
@@ -130,18 +70,6 @@ dictionaryReplacement
{
type zeroGradient;
}
- baffleWall
- {
- type zeroGradient;
- }
- baffleCyclic_half0
- {
- type cyclic;
- }
- baffleCyclic_half1
- {
- type cyclic;
- }
}
}
@@ -154,19 +82,6 @@ dictionaryReplacement
type zeroGradient;
value uniform 1;
}
- baffleWall
- {
- type zeroGradient;
- value uniform 1;
- }
- baffleCyclic_half0
- {
- type cyclic;
- }
- baffleCyclic_half1
- {
- type cyclic;
- }
}
}
@@ -179,19 +94,6 @@ dictionaryReplacement
type zeroGradient;
value uniform 300;
}
- baffleWall
- {
- type zeroGradient;
- value uniform 300;
- }
- baffleCyclic_half0
- {
- type cyclic;
- }
- baffleCyclic_half1
- {
- type cyclic;
- }
}
}
@@ -204,19 +106,6 @@ dictionaryReplacement
type zeroGradient;
value uniform 300;
}
- baffleWall
- {
- type zeroGradient;
- value uniform 300;
- }
- baffleCyclic_half0
- {
- type cyclic;
- }
- baffleCyclic_half1
- {
- type cyclic;
- }
}
}
@@ -229,19 +118,6 @@ dictionaryReplacement
type zeroGradient;
value uniform 1;
}
- baffleWall
- {
- type zeroGradient;
- value uniform 1;
- }
- baffleCyclic_half0
- {
- type cyclic;
- }
- baffleCyclic_half1
- {
- type cyclic;
- }
}
}
@@ -253,19 +129,6 @@ dictionaryReplacement
{
type zeroGradient;
}
- baffleWall
- {
- type zeroGradient;
- value uniform 0.06024096;
- }
- baffleCyclic_half0
- {
- type cyclic;
- }
- baffleCyclic_half1
- {
- type cyclic;
- }
}
}
@@ -278,19 +141,6 @@ dictionaryReplacement
type zeroGradient;
value uniform 0.0;
}
- baffleWall
- {
- type zeroGradient;
- value uniform 0.0;
- }
- baffleCyclic_half0
- {
- type cyclic;
- }
- baffleCyclic_half1
- {
- type cyclic;
- }
}
}
B
@@ -302,19 +152,6 @@ dictionaryReplacement
type zeroGradient;
value uniform (0 0 0 0 0 0);
}
- baffleWall
- {
- type zeroGradient;
- value uniform (0 0 0 0 0 0);
- }
- baffleCyclic_half0
- {
- type cyclic;
- }
- baffleCyclic_half1
- {
- type cyclic;
- }
}
}
betav
@@ -326,19 +163,6 @@ dictionaryReplacement
type zeroGradient;
value uniform 0;
}
- baffleWall
- {
- type zeroGradient;
- value uniform 0;
- }
- baffleCyclic_half0
- {
- type cyclic;
- }
- baffleCyclic_half1
- {
- type cyclic;
- }
}
}
CR
@@ -350,19 +174,6 @@ dictionaryReplacement
type zeroGradient;
value uniform (0 0 0 0 0 0);
}
- baffleWall
- {
- type zeroGradient;
- value uniform (0 0 0 0 0 0);
- }
- baffleCyclic_half0
- {
- type cyclic;
- }
- baffleCyclic_half1
- {
- type cyclic;
- }
}
}
CT
@@ -374,19 +185,6 @@ dictionaryReplacement
type zeroGradient;
value uniform (0 0 0 0 0 0);
}
- baffleWall
- {
- type zeroGradient;
- value uniform (0 0 0 0 0 0);
- }
- baffleCyclic_half0
- {
- type cyclic;
- }
- baffleCyclic_half1
- {
- type cyclic;
- }
}
}
Nv
@@ -398,19 +196,6 @@ dictionaryReplacement
type zeroGradient;
value uniform 0;
}
- baffleWall
- {
- type zeroGradient;
- value uniform 0;
- }
- baffleCyclic_half0
- {
- type cyclic;
- }
- baffleCyclic_half1
- {
- type cyclic;
- }
}
}
nsv
@@ -422,19 +207,6 @@ dictionaryReplacement
type zeroGradient;
value uniform (0 0 0 0 0 0);
}
- baffleWall
- {
- type zeroGradient;
- value uniform (0 0 0 0 0 0);
- }
- baffleCyclic_half0
- {
- type cyclic;
- }
- baffleCyclic_half1
- {
- type cyclic;
- }
}
}
Lobs
@@ -446,19 +218,6 @@ dictionaryReplacement
type zeroGradient;
value uniform 0;
}
- baffleWall
- {
- type zeroGradient;
- value uniform 0;
- }
- baffleCyclic_half0
- {
- type cyclic;
- }
- baffleCyclic_half1
- {
- type cyclic;
- }
}
}
}
View
4 tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/controlDict
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-application PDRFoam;
+application PDRFoam; //PDRFoamAutoRefine
startFrom latestTime;
@@ -47,7 +47,7 @@ runTimeModifiable yes;
adjustTimeStep yes;
-maxCo 0.3;
+maxCo 0.2;
maxDeltaT 1;
View
10 tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/fvSolution
@@ -22,13 +22,13 @@ solvers
solver PCG;
preconditioner DIC;
tolerance 1e-05;
- relTol 0.1;
+ relTol 0.01;
};
rhoFinal
{
$rho;
- tolerance 1e-05;
+ tolerance 1e-06;
relTol 0;
};
@@ -37,7 +37,7 @@ solvers
solver PCG;
preconditioner DIC;
tolerance 1e-6;
- relTol 0.1;
+ relTol 0.01;
};
pFinal
@@ -51,7 +51,7 @@ solvers
{
solver PBiCG;
preconditioner DILU;
- tolerance 1e-05;
+ tolerance 1e-06;
relTol 0.1;
}
@@ -59,7 +59,7 @@ solvers
{
solver PBiCG;
preconditioner DILU;
- tolerance 1e-05;
+ tolerance 1e-06;
relTol 0;
}
}
View
67 tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/topoSetDict
@@ -0,0 +1,67 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 2.0.0 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "system";
+ object topoSetDict.1;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+actions
+(
+ {
+ name blockedFacesSet;
+ type faceSet;
+ action new;
+ source boxToFace;
+ sourceInfo
+ {
+ box (1 1 0.99) (2 2 1);
+ }
+ }
+
+ {
+ name blockedCellsSet;
+ type cellSet;
+ action new;
+ source boxToCell;
+ sourceInfo
+ {
+ box (2.4 2.4 0) (3 3 1);
+ }
+ }
+
+ {
+ name blockedCellsSet;
+ type cellSet;
+ action add;
+ source boxToCell;
+ sourceInfo
+ {
+ box (0 0 0) (0.6 0.6 1);
+ }
+ }
+
+ {
+ name blockedFacesSet;
+ type faceSet;
+ action add;
+ source cellToFace;
+ sourceInfo
+ {
+ set blockedCellsSet;
+ option all;
+ }
+ }
+
+);
+
+// ************************************************************************* //
Please sign in to comment.
Something went wrong with that request. Please try again.