zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
mattijs
2010-03-17 18:13:13 +00:00
parent e0fcca3858 9e68716255
commit a703cb3b94
5 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
applications/utilities/mesh/manipulation/createPatch/createPatch.C
View File

@ -569,7 +569,7 @@ int main(int argc, char *argv[])
dumpCyclicMatch("initial_", mesh);
// Read patch construct info from dictionary
PtrList<dictionary> patchSources(dict.lookup("patchInfo"));
PtrList<dictionary> 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();

4
applications/utilities/mesh/manipulation/createPatch/createPatchDict
View File

@ -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;

2
etc/apps/paraview3/bashrc
View File

@ -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

5
src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.H
View File

@ -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

2
src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C
View File

@ -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)