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 feature/cvMesh

Browse Source 
Conflicts:
	applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
This commit is contained in:
laurence
2013-06-03 16:27:14 +01:00
parent ae7a7bc1da cc8a232756
commit c644cb680b
52 changed files with 3322 additions and 1218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/system/createBafflesDict
View File

@ -23,6 +23,9 @@ internalFacesOnly false;
// Baffles to create.
baffles
{
// NOTE: cyclicAMI patches MUST BE defined PRIOR to their associted
// blockage patches
ACMI1
{
//- Use predefined faceZone to select faces and orientation.
@ -32,19 +35,6 @@ baffles
patches
{
master
{
//- Master side patch
name ACMI1_blockage;
type wall;
}
slave // not used since we're manipulating a boundary patch
{
//- Slave side patch
name ACMI1_blockage;
type wall;
}
master2
{
//- Master side patch
name ACMI1_couple;
@ -54,12 +44,26 @@ baffles
nonOverlapPatch ACMI1_blockage;
transform noOrdering;
}
slave2 // not used since we're manipulating a boundary patch
slave // not used since we're manipulating a boundary patch
{
//- Slave side patch
name ACMI1_couple;
type patch;
}
master2
{
//- Master side patch
name ACMI1_blockage;
type wall;
}
slave2 // not used since we're manipulating a boundary patch
{
//- Slave side patch
name ACMI1_blockage;
type wall;
}
}
}
ACMI2
@ -71,19 +75,6 @@ baffles
patches
{
master
{
//- Master side patch
name ACMI2_blockage;
type wall;
}
slave // not used since we're manipulating a boundary patch
{
//- Slave side patch
name ACMI2_blockage;
type wall;
}
master2
{
//- Master side patch
name ACMI2_couple;
@ -93,12 +84,25 @@ baffles
nonOverlapPatch ACMI2_blockage;
transform noOrdering;
}
slave2 // not used since we're manipulating a boundary patch
slave // not used since we're manipulating a boundary patch
{
//- Slave side patch
name ACMI2_couple;
type patch;
}
master2
{
//- Master side patch
name ACMI2_blockage;
type wall;
}
slave2 // not used since we're manipulating a boundary patch
{
//- Slave side patch
name ACMI2_blockage;
type wall;
}
}
}
}

1
tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/system/controlDict
View File

@ -50,6 +50,7 @@ adjustTimeStep yes;
maxCo 0.25;
maxDeltaT 1;
maxAlphaCo 1;
// ************************************************************************* //

1
tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/system/controlDict
View File

@ -50,6 +50,7 @@ adjustTimeStep yes;
maxCo 0.25;
maxDeltaT 1;
maxAlphaCo 1;
// ************************************************************************* //

2
tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.org/U
View File

@ -38,7 +38,7 @@ boundaryField
}
atmosphere
{
type fluxCorrectedVelocity;
type pressureInletOutletVelocity;
value uniform (0 0 0);
}
defaultFaces

2
tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.org/U
View File

@ -38,7 +38,7 @@ boundaryField
}
atmosphere
{
type fluxCorrectedVelocity;
type pressureInletOutletVelocity;
value uniform (0 0 0);
}
defaultFaces