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' into cvm

Browse Source
This commit is contained in:
graham
2009-08-19 18:40:21 +01:00
parent ad5a8d8f23 91fca60f79
commit 2fca5550cd
267 changed files with 4610 additions and 2504 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
applications/utilities/mesh/generation/blockMesh/createMergeList.C
View File

@ -30,7 +30,7 @@ License
Foam::labelList Foam::blockMesh::createMergeList()
{
Info<< nl << "Creating merge list " << flush;
Info<< nl << "Creating merge list" << flush;
labelList MergeList(nPoints_, -1);

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

@ -53,18 +53,18 @@ patches
name sidePatches;
// Type of new patch
dictionary
{
dictionary
{
type cyclic;
// Optional: explicitly set transformation tensor.
// Optional: explicitly set transformation tensor.
// Used when matching and synchronising points.
//transform translational;
//separationVector (-2289 0 0);
transform rotational;
rotationAxis (1 0 0);
transform rotational;
rotationAxis (1 0 0);
rotationCentre (0 0 0);
}
}
// How to construct: either from 'patches' or 'set'
constructFrom patches;
@ -80,10 +80,10 @@ patches
name bottom;
// Type of new patch
dictionary
{
dictionary
{
type wall;
}
}
constructFrom set;

23
applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C
View File

@ -105,6 +105,8 @@ int main(int argc, char *argv[])
Foam::argList::validOptions.insert("overwrite", "");
Foam::argList::validOptions.insert("toleranceDict", "file with tolerances");
# include "setRootCase.H"
# include "createTime.H"
runTime.functionObjects().off();
@ -168,6 +170,22 @@ int main(int argc, char *argv[])
<< "If this is not the case use the -partial option" << nl << endl;
}
// set up the tolerances for the sliding mesh
dictionary slidingTolerances;
if (args.options().found("toleranceDict"))
{
IOdictionary toleranceFile(
IOobject(
args.options()["toleranceDict"],
runTime.constant(),
mesh,
IOobject::MUST_READ,
IOobject::NO_WRITE
)
);
slidingTolerances += toleranceFile;
}
// Check for non-empty master and slave patches
checkPatch(mesh.boundaryMesh(), masterPatchName);
checkPatch(mesh.boundaryMesh(), slavePatchName);
@ -320,6 +338,11 @@ int main(int argc, char *argv[])
true // couple/decouple mode
)
);
static_cast<slidingInterface&>(stitcher[0]).setTolerances
(
slidingTolerances,
true
);
}