diff --git a/applications/solvers/combustion/fireFoam/fireFoam.C b/applications/solvers/combustion/fireFoam/fireFoam.C
index 564d7c5390a602d9c78872a113c1353c2c9211fc..9f97843a96b8b86dbf60b9886bc1817c3931e2ab 100644
--- a/applications/solvers/combustion/fireFoam/fireFoam.C
+++ b/applications/solvers/combustion/fireFoam/fireFoam.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/applications/utilities/preProcessing/changeDictionary/changeDictionary.C b/applications/utilities/preProcessing/changeDictionary/changeDictionary.C
index ad178b765cbe55713463e268b1f9463747318826..3c664cfc3b29297010cd924cc15dfd75d398d422 100644
--- a/applications/utilities/preProcessing/changeDictionary/changeDictionary.C
+++ b/applications/utilities/preProcessing/changeDictionary/changeDictionary.C
@@ -52,6 +52,7 @@ Description
}
}
\endverbatim
+ Replacement entries starting with '~' will remove the entry.
Usage
@@ -172,6 +173,46 @@ bool addEntry
}
+
+// List of indices into thisKeys
+labelList findMatches
+(
+ const HashTable<wordList, word>& shortcuts,
+ const wordList& shortcutNames,
+ const wordList& thisKeys,
+ const keyType& key
+)
+{
+ labelList matches;
+
+ if (key.isPattern())
+ {
+ // Wildcard match
+ matches = findStrings(key, thisKeys);
+
+ }
+ else if (shortcuts.size())
+ {
+ // See if patchGroups expand to valid thisKeys
+ labelList indices = findStrings(key, shortcutNames);
+ forAll(indices, i)
+ {
+ const word& name = shortcutNames[indices[i]];
+ const wordList& keys = shortcuts[name];
+ forAll(keys, j)
+ {
+ label index = findIndex(thisKeys, keys[j]);
+ if (index != -1)
+ {
+ matches.append(index);
+ }
+ }
+ }
+ }
+ return matches;
+}
+
+
// Dictionary merging/editing.
// literalRE:
// - true: behave like dictionary::merge, i.e. add regexps just like
@@ -185,6 +226,8 @@ bool merge
const HashTable<wordList, word>& shortcuts
)
{
+ const wordList shortcutNames(shortcuts.toc());
+
bool changed = false;
// Save current (non-wildcard) keys before adding items.
@@ -203,7 +246,18 @@ bool merge
{
const keyType& key = mergeIter().keyword();
- if (literalRE || !(key.isPattern() || shortcuts.found(key)))
+ if (key[0] == '~')
+ {
+ word eraseKey = key(1, key.size()-1);
+ if (thisDict.remove(eraseKey))
+ {
+ // Mark thisDict entry as having been match for wildcard
+ // handling later on.
+ thisKeysSet.erase(eraseKey);
+ }
+ changed = true;
+ }
+ else if (literalRE || !(key.isPattern() || shortcuts.found(key)))
{
entry* entryPtr = thisDict.lookupEntryPtr
(
@@ -255,59 +309,69 @@ bool merge
{
const keyType& key = mergeIter().keyword();
- // List of indices into thisKeys
- labelList matches;
-
- if (key.isPattern())
+ if (key[0] == '~')
{
- // Wildcard match
- matches = findStrings(key, thisKeys);
+ word eraseKey = key(1, key.size()-1);
- }
- else if (shortcuts.size())
- {
- // See if patchGroups expand to valid thisKeys
- const wordList shortcutNames = shortcuts.toc();
- labelList indices = findStrings(key, shortcutNames);
- forAll(indices, i)
+ // List of indices into thisKeys
+ labelList matches
+ (
+ findMatches
+ (
+ shortcuts,
+ shortcutNames,
+ thisKeys,
+ eraseKey
+ )
+ );
+
+ // Remove all matches
+ forAll(matches, i)
{
- const word& name = shortcutNames[indices[i]];
- const wordList& keys = shortcuts[name];
- forAll(keys, j)
- {
- label index = findIndex(thisKeys, keys[j]);
- if (index != -1)
- {
- matches.append(index);
- }
- }
+ const word& thisKey = thisKeys[matches[i]];
+ thisKeysSet.erase(thisKey);
}
+ changed = true;
}
-
- // Add all matches
- forAll(matches, i)
+ else
{
- const word& thisKey = thisKeys[matches[i]];
-
- entry& thisEntry = const_cast<entry&>
+ // List of indices into thisKeys
+ labelList matches
(
- thisDict.lookupEntry(thisKey, false, false)
+ findMatches
+ (
+ shortcuts,
+ shortcutNames,
+ thisKeys,
+ key
+ )
);
- if
- (
- addEntry
+ // Add all matches
+ forAll(matches, i)
+ {
+ const word& thisKey = thisKeys[matches[i]];
+
+ entry& thisEntry = const_cast<entry&>
(
- thisDict,
- thisEntry,
- mergeIter(),
- literalRE,
- HashTable<wordList, word>(0) // no shortcuts
- // at deeper levels
+ thisDict.lookupEntry(thisKey, false, false)
+ );
+
+ if
+ (
+ addEntry
+ (
+ thisDict,
+ thisEntry,
+ mergeIter(),
+ literalRE,
+ HashTable<wordList, word>(0) // no shortcuts
+ // at deeper levels
+ )
)
- )
- {
- changed = true;
+ {
+ changed = true;
+ }
}
}
}
diff --git a/src/OSspecific/POSIX/fileMonitor.C b/src/OSspecific/POSIX/fileMonitor.C
index 030e7639f4b69d3e3b6ce60104efb46cec6fb4ce..f17e7b1dc973d58a756cdd0e422ad9ffe9a9fb80 100644
--- a/src/OSspecific/POSIX/fileMonitor.C
+++ b/src/OSspecific/POSIX/fileMonitor.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
@@ -168,7 +168,7 @@ namespace Foam
FatalErrorIn("fileMonitorWatcher(const bool, const label)")
<< "You selected inotify but this file was compiled"
<< " without FOAM_USE_INOTIFY"
- << "Please select another fileModification test method"
+ << " Please select another fileModification test method"
<< exit(FatalError);
#endif
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C
index 9b72859c9d9dea1e138910b9c0d196e3c403c4de..f5cd4413b1a3b59bb6dc74c6fe83704ef81d9fd6 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C
@@ -72,7 +72,7 @@ flowRateInletVelocityFvPatchVectorField
)
:
fixedValueFvPatchField<vector>(p, iF),
- rhoInlet_(0.0)
+ rhoInlet_(dict.lookupOrDefault<scalar>("rhoInlet", -VGREAT))
{
if (dict.found("volumetricFlowRate"))
{
@@ -107,14 +107,9 @@ flowRateInletVelocityFvPatchVectorField
vectorField("value", dict, p.size())
);
}
- else if (volumetric_)
- {
- evaluate(Pstream::blocking);
- }
else
{
- rhoInlet_ = readScalar(dict.lookup("rhoInlet"));
- updateCoeffs(rhoInlet_);
+ evaluate(Pstream::blocking);
}
}
@@ -202,10 +197,30 @@ void Foam::flowRateInletVelocityFvPatchVectorField::updateCoeffs()
else
{
// mass flow-rate
- const fvPatchField<scalar>& rhop =
- patch().lookupPatchField<volScalarField, scalar>(rhoName_);
-
- operator==(n*avgU/rhop);
+ if
+ (
+ patch().boundaryMesh().mesh().foundObject<volScalarField>(rhoName_)
+ )
+ {
+ const fvPatchField<scalar>& rhop =
+ patch().lookupPatchField<volScalarField, scalar>(rhoName_);
+
+ operator==(n*avgU/rhop);
+ }
+ else
+ {
+ // Use constant density
+ if (rhoInlet_ < 0)
+ {
+ FatalErrorIn
+ (
+ "flowRateInletVelocityFvPatchVectorField::updateCoeffs()"
+ ) << "Did not find registered density field " << rhoName_
+ << " and no constant density 'rhoInlet' specified"
+ << exit(FatalError);
+ }
+ operator==(n*avgU/rhoInlet_);
+ }
}
fixedValueFvPatchField<vector>::updateCoeffs();
@@ -219,7 +234,7 @@ void Foam::flowRateInletVelocityFvPatchVectorField::write(Ostream& os) const
if (!volumetric_)
{
writeEntryIfDifferent<word>(os, "rho", "rho", rhoName_);
- os.writeKeyword("rhoInlet") << rhoInlet_ << token::END_STATEMENT << nl;
+ writeEntryIfDifferent<scalar>(os, "rhoInlet", -VGREAT, rhoInlet_);
}
writeEntry("value", os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.H
index 192e14b7d1ba5024ca91e358f51e6cb2202a3782..1a5d2f493d160bff3497b3898422c002127d84c7 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.H
@@ -29,7 +29,7 @@ Description
magnitude as an integral over its area.
Either specify 'volumetricFlowRate' or 'massFlowRate' (requires additional
- 'rho' entry).
+ 'rho' or 'rhoInlet' entry).
Example of the boundary condition specification:
\verbatim
@@ -44,9 +44,10 @@ Description
inlet
{
type flowRateInletVelocity;
- volumetricFlowRate 0.2; // mass flow rate [kg/s]
+ massFlowRate 0.2; // mass flow rate [kg/s]
rho rho; // rho [m3/s or kg/s]
- value uniform (0 0 0); // placeholder
+ rhoInlet 1.0 // uniform rho if no rho field registered
+ // (e.g. at startup)
}
\endverbatim
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/T b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/T
index 9258abe4ffaf9ae1e288049aa7e05373ecfc803f..dd74be1133a46b9ff97ad2064ed6cc089baf8d8d 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/T
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/T
@@ -20,6 +20,9 @@ internalField uniform 265;
boundaryField
{
+ //- Set patchGroups for constraint patches
+ #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+
ground
{
type fixedValue;
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/U b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/U
index 2ff6e8ed59ecff883f9ddf759173cbe06769bc9f..f1a91fe9714a2a5299bc4a09327c18ac9df13324 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/U
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/U
@@ -20,6 +20,9 @@ internalField uniform (0 0 0);
boundaryField
{
+ //- Set patchGroups for constraint patches
+ #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+
ground
{
type fixedValue;
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/alphat b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/alphat
index 7cb2dd1fdef8e628b7e4d0ab9e8fe823fd3a6a2b..aefa32d852bcadeec8d59effb605a7a8182c6ee6 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/alphat
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/alphat
@@ -21,6 +21,9 @@ internalField uniform 0;
boundaryField
{
+ //- Set patchGroups for constraint patches
+ #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+
ground
{
type alphatWallFunction;
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/epsilon b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/epsilon
index 0fa9bf60f265f63d0b0c957fc39f70ec920c8323..b75802e0e81c67886d7640dda6eff85934947043 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/epsilon
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/epsilon
@@ -21,6 +21,9 @@ internalField uniform 0.01;
boundaryField
{
+ //- Set patchGroups for constraint patches
+ #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+
ground
{
type epsilonWallFunction;
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/k b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/k
index a6ee8bf7dda47478d164856e87a24dc257faf795..04edc9d0d718ca3ad5d6c5030f7988a9571fde1a 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/k
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/k
@@ -21,6 +21,9 @@ internalField uniform 0.1;
boundaryField
{
+ //- Set patchGroups for constraint patches
+ #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+
ground
{
type kqRWallFunction;
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/kappat b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/kappat
index 7209416f4a958a76ba2dc01c267db9d2a6ac1226..5c82ad4a5580eb46a966f9a8bcc4b1030a435732 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/kappat
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/kappat
@@ -21,6 +21,9 @@ internalField uniform 0;
boundaryField
{
+ //- Set patchGroups for constraint patches
+ #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+
ground
{
type kappatJayatillekeWallFunction;
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/nut b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/nut
index 06abd5dc3ad5467b12e1a99311c6ec2dc28e1444..b8dae4d50fbd4d2ede26b7377332d56ee79e78fd 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/nut
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/nut
@@ -21,6 +21,9 @@ internalField uniform 0;
boundaryField
{
+ //- Set patchGroups for constraint patches
+ #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+
ground
{
type nutkWallFunction;
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/p b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/p
index f9f45682d5b67d67584dd2c9ffd16f481a217f33..19bfa3d347bb90bc7845cd7e598947c04de99f63 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/p
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/p
@@ -20,6 +20,9 @@ internalField uniform 0;
boundaryField
{
+ //- Set patchGroups for constraint patches
+ #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+
ground
{
type calculated;
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/p_rgh b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/p_rgh
index eb39e94eab1eb3cfce6119022fd24a4eb499c102..e39f2ab7cec1a5b80d80c8ba492fe66bf148105c 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/p_rgh
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/p_rgh
@@ -20,6 +20,9 @@ internalField uniform 0;
boundaryField
{
+ //- Set patchGroups for constraint patches
+ #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+
ground
{
type fixedFluxPressure;
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/polyMesh/boundary b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/polyMesh/boundary
deleted file mode 100644
index 911d0d6aa08c94a0730eaf1572915154319abb1d..0000000000000000000000000000000000000000
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/polyMesh/boundary
+++ /dev/null
@@ -1,63 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class polyBoundaryMesh;
- location "constant/polyMesh";
- object boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-6
-(
- maxY
- {
- type symmetryPlane;
- inGroups 1(symmetryPlane);
- nFaces 400;
- startFace 22800;
- }
- minX
- {
- type symmetryPlane;
- inGroups 1(symmetryPlane);
- nFaces 400;
- startFace 23200;
- }
- maxX
- {
- type symmetryPlane;
- inGroups 1(symmetryPlane);
- nFaces 400;
- startFace 23600;
- }
- minY
- {
- type symmetryPlane;
- inGroups 1(symmetryPlane);
- nFaces 400;
- startFace 24000;
- }
- ground
- {
- type wall;
- nFaces 400;
- startFace 24400;
- }
- maxZ
- {
- type symmetryPlane;
- inGroups 1(symmetryPlane);
- nFaces 400;
- startFace 24800;
- }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/meshQualityDict b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/meshQualityDict
new file mode 100644
index 0000000000000000000000000000000000000000..1b5837a15e01bb8b946f96f851b5b38b9681e7ec
--- /dev/null
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/meshQualityDict
@@ -0,0 +1,64 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object meshQualityDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+//- Maximum non-orthogonality allowed. Set to 180 to disable.
+maxNonOrtho 65;
+
+//- Max skewness allowed. Set to <0 to disable.
+maxBoundarySkewness 20;
+maxInternalSkewness 4;
+
+//- Max concaveness allowed. Is angle (in degrees) below which concavity
+// is allowed. 0 is straight face, <0 would be convex face.
+// Set to 180 to disable.
+maxConcave 80;
+
+//- Minimum pyramid volume. Is absolute volume of cell pyramid.
+// Set to a sensible fraction of the smallest cell volume expected.
+// Set to very negative number (e.g. -1E30) to disable.
+minVol 1e-13;
+
+//- Minimum quality of the tet formed by the face-centre
+// and variable base point minimum decomposition triangles and
+// the cell centre. Set to very negative number (e.g. -1E30) to
+// disable.
+// <0 = inside out tet,
+// 0 = flat tet
+// 1 = regular tet
+minTetQuality 1e-30;
+
+//- Minimum face area. Set to <0 to disable.
+minArea -1;
+
+//- Minimum face twist. Set to <-1 to disable. dot product of face normal
+//- and face centre triangles normal
+minTwist 0.05;
+
+//- minimum normalised cell determinant
+//- 1 = hex, <= 0 = folded or flattened illegal cell
+minDeterminant 0.001;
+
+//- minFaceWeight (0 -> 0.5)
+minFaceWeight 0.05;
+
+//- minVolRatio (0 -> 1)
+minVolRatio 0.01;
+
+//must be >0 for Fluent compatibility
+minTriangleTwist -1;
+
+
+// ************************************************************************* //
diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/Allrun b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/Allrun
deleted file mode 100755
index 3aa141a08be752a1873508d4b92452209560cc42..0000000000000000000000000000000000000000
--- a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/Allrun
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-cd ${0%/*} || exit 1 # run from this directory
-
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
-
-# create mesh
-runApplication blockMesh
-
-# run the solver
-runApplication `getApplication`
-
-# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.org/U b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.org/U
index 7f8c434997d68a5388638800a7005537a215005e..a403d36428cca36380d7e13509eedd15ec13a23b 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.org/U
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.org/U
@@ -33,13 +33,13 @@ boundaryField
{
type flowRateInletVelocity;
massFlowRate constant 0.00379;
- value uniform (0 14.68 0);
+ rhoInlet 1.0; // fallback value for e.g. potentialFoam
}
inletSides
{
type flowRateInletVelocity;
- massFlowRate constant 0.00832;
- value uniform (0 17.79 0);
+ massFlowRate constant 0.00832;
+ rhoInlet 1.0; // fallback value for e.g. potentialFoam
}
outlet
{
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0/H2O b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0/H2O
deleted file mode 100644
index baa8dd215249e6e3f0fe64afc48765f538351869..0000000000000000000000000000000000000000
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0/H2O
+++ /dev/null
@@ -1,54 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volScalarField;
- location "0";
- object H2O;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [0 0 0 0 0 0 0];
-
-internalField uniform 0.01;
-
-boundaryField
-{
- back
- {
- type symmetryPlane;
- }
- front
- {
- type symmetryPlane;
- }
- walls
- {
- type zeroGradient;
- }
- outlet
- {
- type inletOutlet;
- inletValue uniform 0.0;
- }
- inletSides
- {
- type fixedValue;
- value uniform 0.01;
- }
- inletCentral
- {
- type fixedValue;
- value uniform 0.01;
- }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0/T b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0/T
deleted file mode 100644
index df744edb03e1e986aec2b3d1b5f622e209bb44d0..0000000000000000000000000000000000000000
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0/T
+++ /dev/null
@@ -1,54 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volScalarField;
- location "0";
- object T;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [0 0 0 1 0 0 0];
-
-internalField uniform 473.0;
-
-boundaryField
-{
- back
- {
- type symmetryPlane;
- }
- front
- {
- type symmetryPlane;
- }
- walls
- {
- type zeroGradient;
- }
- outlet
- {
- type inletOutlet;
- inletValue uniform 473.0;
- }
- inletSides
- {
- type fixedValue;
- value uniform 473.0;
- }
- inletCentral
- {
- type fixedValue;
- value uniform 573.0;
- }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0/U b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0/U
deleted file mode 100644
index 7f8c434997d68a5388638800a7005537a215005e..0000000000000000000000000000000000000000
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0/U
+++ /dev/null
@@ -1,57 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volVectorField;
- location "0";
- object U;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [0 1 -1 0 0 0 0];
-
-internalField uniform (0 0 0);
-
-boundaryField
-{
- back
- {
- type symmetryPlane;
- }
- front
- {
- type symmetryPlane;
- }
- inletCentral
- {
- type flowRateInletVelocity;
- massFlowRate constant 0.00379;
- value uniform (0 14.68 0);
- }
- inletSides
- {
- type flowRateInletVelocity;
- massFlowRate constant 0.00832;
- value uniform (0 17.79 0);
- }
- outlet
- {
- type inletOutlet;
- inletValue uniform (0 0 0);
- }
- walls
- {
- type fixedValue;
- value uniform (0 0 0);
- }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0/air b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0/air
deleted file mode 100644
index 81541afef9ba8bd7dce383d397ed237ab2babffb..0000000000000000000000000000000000000000
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0/air
+++ /dev/null
@@ -1,54 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volScalarField;
- location "0";
- object air;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [0 0 0 0 0 0 0];
-
-internalField uniform 0.99;
-
-boundaryField
-{
- back
- {
- type symmetryPlane;
- }
- front
- {
- type symmetryPlane;
- }
- walls
- {
- type zeroGradient;
- }
- outlet
- {
- type inletOutlet;
- inletValue uniform 1.0;
- }
- inletSides
- {
- type fixedValue;
- value uniform 0.99;
- }
- inletCentral
- {
- type fixedValue;
- value uniform 0.99;
- }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0/alphat b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0/alphat
deleted file mode 100644
index 33d260bf7c08ac66cd93e39c7ffe42695a15258f..0000000000000000000000000000000000000000
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0/alphat
+++ /dev/null
@@ -1,56 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volScalarField;
- location "0";
- object alphat;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [1 -1 -1 0 0 0 0];
-
-internalField uniform 0;
-
-boundaryField
-{
- back
- {
- type symmetryPlane;
- }
- front
- {
- type symmetryPlane;
- }
- inletCentral
- {
- type calculated;
- value uniform 0;
- }
- inletSides
- {
- type calculated;
- value uniform 0;
- }
- outlet
- {
- type calculated;
- value uniform 0;
- }
- walls
- {
- type alphatWallFunction;
- Prt 0.85;
- value uniform 0;
- }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0/k b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0/k
deleted file mode 100644
index 2a76936893757ac6bb3379bc2dcf737d40fb1b69..0000000000000000000000000000000000000000
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0/k
+++ /dev/null
@@ -1,57 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volScalarField;
- location "0";
- object k;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [0 2 -2 0 0 0 0];
-
-internalField uniform 3.75e-9;
-
-boundaryField
-{
- back
- {
- type symmetryPlane;
- }
- front
- {
- type symmetryPlane;
- }
- inletCentral
- {
- type turbulentIntensityKineticEnergyInlet;
- intensity 0.15;
- value uniform 3.75e-9;
- }
- inletSides
- {
- type turbulentIntensityKineticEnergyInlet;
- intensity 0.16;
- value uniform 3.75e-9;
- }
- outlet
- {
- type inletOutlet;
- inletValue uniform 3.75e-9;
- }
- walls
- {
- type compressible::kqRWallFunction;
- value uniform 0;
- }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0/mut b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0/mut
deleted file mode 100644
index 7cfeaae133d7fe8289f4a415540c45b7a6a9b5fe..0000000000000000000000000000000000000000
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0/mut
+++ /dev/null
@@ -1,58 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volScalarField;
- location "0";
- object mut;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [1 -1 -1 0 0 0 0];
-
-internalField uniform 0;
-
-boundaryField
-{
- back
- {
- type symmetryPlane;
- }
- front
- {
- type symmetryPlane;
- }
- inletCentral
- {
- type calculated;
- value uniform 0;
- }
- inletSides
- {
- type calculated;
- value uniform 0;
- }
- outlet
- {
- type calculated;
- value uniform 0;
- }
- walls
- {
- type mutkWallFunction;
- Cmu 0.09;
- kappa 0.41;
- E 9.8;
- value uniform 0;
- }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0/omega b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0/omega
deleted file mode 100644
index efd2924775d02edef8c912c48bed1fab405616a0..0000000000000000000000000000000000000000
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0/omega
+++ /dev/null
@@ -1,62 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volScalarField;
- location "0";
- object omega;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [0 0 -1 0 0 0 0];
-
-internalField uniform 4.5e-3;
-
-boundaryField
-{
- back
- {
- type symmetryPlane;
- }
- front
- {
- type symmetryPlane;
- }
- inletCentral
- {
- type compressible::turbulentMixingLengthFrequencyInlet;
- mixingLength 0.007;
- k k;
- value uniform 4.5e-3;
- }
- inletSides
- {
- type compressible::turbulentMixingLengthFrequencyInlet;
- mixingLength 0.007;
- k k;
- value uniform 4.5e-3;
- }
- outlet
- {
- type inletOutlet;
- inletValue uniform 4.5e-3;
- }
- walls
- {
- type compressible::omegaWallFunction;
- Cmu 0.09;
- kappa 0.41;
- E 9.8;
- value uniform 0;
- }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0/p b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0/p
deleted file mode 100644
index 921f06d7a1410ee338d624c9c455acf38976d7ca..0000000000000000000000000000000000000000
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/0/p
+++ /dev/null
@@ -1,52 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class volScalarField;
- location "0";
- object p;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions [1 -1 -2 0 0 0 0];
-
-internalField uniform 100000;
-
-boundaryField
-{
- back
- {
- type symmetryPlane;
- }
- front
- {
- type symmetryPlane;
- }
- inletCentral
- {
- type zeroGradient;
- }
- inletSides
- {
- type zeroGradient;
- }
- outlet
- {
- type fixedValue;
- value uniform 100000;
- }
- walls
- {
- type zeroGradient;
- }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/Allclean b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/Allclean
index 6ac02e9eab65bae4e3a6e69678372d9b9b15a274..b0a57810b3083326f46ddf6fcde39a6988c1f28d 100755
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/Allclean
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/Allclean
@@ -7,10 +7,6 @@ cd ${0%/*} || exit 1 # run from this directory
# remove old time and post-processing folders
rm -rf 0 *[1-9]* processor* postProcessing
-
-# copy 0.org to 0
-cp -r 0.org 0
-
cleanCase
# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/Allrun b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/Allrun
index 8d4cb3681e95293720573900554dbda5322b57a0..4fe0655e63de7498f8f5704b3cb3a2fee2aae6dc 100755
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/Allrun
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/Allrun
@@ -7,8 +7,11 @@ cd ${0%/*} || exit 1 # run from this directory
# create mesh
runApplication blockMesh
+cp -r 0.org 0
+
# initialise with potentialFoam solution
runApplication potentialFoam
+
rm -f 0/phi
# run the solver
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/polyMesh/boundary b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/polyMesh/boundary
deleted file mode 100644
index 1319b623261803836c97f2fc155849db5acaa923..0000000000000000000000000000000000000000
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/polyMesh/boundary
+++ /dev/null
@@ -1,60 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class polyBoundaryMesh;
- location "constant/polyMesh";
- object boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-6
-(
- back
- {
- type symmetryPlane;
- inGroups 1(symmetryPlane);
- nFaces 9340;
- startFace 265900;
- }
- front
- {
- type symmetryPlane;
- inGroups 1(symmetryPlane);
- nFaces 9340;
- startFace 275240;
- }
- inletCentral
- {
- type patch;
- nFaces 100;
- startFace 284580;
- }
- inletSides
- {
- type patch;
- nFaces 200;
- startFace 284680;
- }
- outlet
- {
- type patch;
- nFaces 300;
- startFace 284880;
- }
- walls
- {
- type wall;
- nFaces 9320;
- startFace 285180;
- }
-)
-
-// ************************************************************************* //