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 commit 'origin/master' into splitCyclic

Browse Source 
Conflicts:
	applications/utilities/mesh/manipulation/createBaffles/createBaffles.C
	applications/utilities/postProcessing/patch/patchIntegrate/patchIntegrate.C
	src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/cyclic/cyclicPointPatch.C
	src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/processor/processorPointPatch.C
	src/dynamicMesh/motionSmoother/motionSmoother.C
	src/dynamicMesh/motionSmoother/motionSmoother.H
	src/dynamicMesh/motionSmoother/motionSmootherTemplates.C
This commit is contained in:
mattijs
2010-05-18 13:28:21 +01:00
parent bba50b2152 2e418fec9e
commit f84a91d7ce
480 changed files with 13145 additions and 5249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
applications/utilities/mesh/generation/blockMesh/blockMeshApp.C
View File

@ -42,7 +42,7 @@ Usage
Specify an alternative mesh region.
@param -dict \<filename\> \n
Specify an alternative dictionary for the block mesh description.
Specify alternative dictionary for the block mesh description.
\*---------------------------------------------------------------------------*/
@ -80,7 +80,7 @@ int main(int argc, char *argv[])
(
"dict",
"file",
"specify an alternative dictionary for the blockMesh description"
"specify alternative dictionary for the blockMesh description"
);
# include "addRegionOption.H"

10
applications/utilities/mesh/generation/blockMesh/mergePatchPairs.H
View File

@ -27,10 +27,7 @@
// Master patch
const word masterPatchName(mergePatchPairs[pairI].first());
const polyPatch& masterPatch =
mesh.boundaryMesh()
[
mesh.boundaryMesh().findPatchID(masterPatchName)
];
mesh.boundaryMesh()[masterPatchName];
labelList isf(masterPatch.size());
@ -51,10 +48,7 @@
// Slave patch
const word slavePatchName(mergePatchPairs[pairI].second());
const polyPatch& slavePatch =
mesh.boundaryMesh()
[
mesh.boundaryMesh().findPatchID(slavePatchName)
];
mesh.boundaryMesh()[slavePatchName];
labelList osf(slavePatch.size());