diff --git a/applications/utilities/mesh/manipulation/createPatch/createPatch.C b/applications/utilities/mesh/manipulation/createPatch/createPatch.C index 90f6377b6d..7b3ebac43b 100644 --- a/applications/utilities/mesh/manipulation/createPatch/createPatch.C +++ b/applications/utilities/mesh/manipulation/createPatch/createPatch.C @@ -569,7 +569,7 @@ int main(int argc, char *argv[]) dumpCyclicMatch("initial_", mesh); // Read patch construct info from dictionary - PtrList patchSources(dict.lookup("patchInfo")); + PtrList patchSources(dict.lookup("patches")); @@ -614,7 +614,7 @@ int main(int argc, char *argv[]) if (destPatchI == -1) { - dictionary patchDict(dict.subDict("dictionary")); + dictionary patchDict(dict.subDict("patchInfo")); destPatchI = allPatches.size(); diff --git a/applications/utilities/mesh/manipulation/createPatch/createPatchDict b/applications/utilities/mesh/manipulation/createPatch/createPatchDict index 2d4046d456..10fd55e5a1 100644 --- a/applications/utilities/mesh/manipulation/createPatch/createPatchDict +++ b/applications/utilities/mesh/manipulation/createPatch/createPatchDict @@ -48,14 +48,14 @@ matchTolerance 1E-3; pointSync true; // Patches to create. -patchInfo +patches ( { // Name of new patch name sidePatches; // Type of new patch - dictionary + patchInfo { type cyclic; diff --git a/etc/apps/paraview3/bashrc b/etc/apps/paraview3/bashrc index 2062c389e0..0aff5a3352 100644 --- a/etc/apps/paraview3/bashrc +++ b/etc/apps/paraview3/bashrc @@ -62,7 +62,7 @@ case "$ParaView_VERSION" in ;; *) - ParaView_MAJOR=`echo $ParaView_VERSION | sed -e 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'` + [ -z ${ParaView_MAJOR} ] && ParaView_MAJOR=`echo $ParaView_VERSION | sed -e 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'` ;; esac export ParaView_MAJOR diff --git a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.H b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.H index 1abd05190b..3486932d2b 100644 --- a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.H +++ b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.H @@ -28,6 +28,11 @@ Class Description Limited to C(s) + O2 -> CO2 + Loosely based on the reference: + Murphy, J. J., Shaddix, C. R., Combustion kinetics of coal chars + in oxygen-enriched environments, Combustion and Flame 144, + pp710-729, 2006 + \*---------------------------------------------------------------------------*/ #ifndef COxidationMurphyShaddix_H diff --git a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C index a5155a9f49..75ff31f3b1 100644 --- a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C +++ b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C @@ -357,7 +357,7 @@ bool Foam::sampledSurfaces::update() if (Pstream::master() && debug) { Pout<< nl << "Merging all points within " - << mergeDim << " meter" << endl; + << mergeDim << " metre" << endl; } forAll(*this, surfI)