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

STYLE: code cleanup searchableSurface (issue #929)

Browse Source 
- improve doxygen entries for searchable surfaces.

- support selection of searchable surfaces with shorter names.
  Eg,
      type   box | cylinder | ...;
  vs  type   searchableBox | searchableCylinder | ...;
This commit is contained in:
Mark Olesen
2018-07-06 11:03:28 +02:00
parent 1ee5144079
commit d530bc254a
82 changed files with 804 additions and 700 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tutorials/combustion/XiDyMFoam/annularCombustorTurbine/system/snappyHexMeshDict
View File

@ -59,8 +59,7 @@ geometry
type triSurfaceMesh;
name walls;
}
};
}
// Settings for the castellatedMesh generation.

9
tutorials/combustion/fireFoam/LES/compartmentFire/system/snappyHexMeshDict
View File

@ -30,12 +30,11 @@ geometry
{
box1 //0.6x1x0.02 [cm]
{
type searchableBox;
min (-0.1 -0.01 -0.1);
max (0.1 0.30 0.1);
type box;
min (-0.1 -0.01 -0.1);
max (0.1 0.30 0.1);
}
};
}
// Settings for the castellatedMesh generation.

2
tutorials/combustion/reactingFoam/RAS/membrane/system/snappyHexMeshDict
View File

@ -61,7 +61,7 @@ geometry
type triSurfaceMesh;
file "membrane-membrane.stl";
}
};
}
castellatedMeshControls
{

2
tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/system/blockMeshDict
View File

@ -55,7 +55,7 @@ geometry
}
cylinder
{
type searchableCylinder;
type cylinder;
point1 ($:aerofoil.xUpper -1e3 0);
point2 ($:aerofoil.xUpper 1e3 0);
radius $:domain.zMax;

2
tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/system/snappyHexMeshDict
View File

@ -73,7 +73,7 @@ geometry
type triSurfaceMesh;
name walls;
}
};
}
castellatedMeshControls
{

2
tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/system/blockMeshDict
View File

@ -55,7 +55,7 @@ geometry
}
cylinder
{
type searchableCylinder;
type cylinder;
point1 ($:aerofoil.xUpper -1e3 0);
point2 ($:aerofoil.xUpper 1e3 0);
radius $:domain.zMax;

9
tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/system/snappyHexMeshDict
View File

@ -57,12 +57,11 @@ geometry
refinementBox
{
type searchableBox;
min (-0.5 -0.125 -0.25);
max (1.5 0.125 0.25);
type box;
min (-0.5 -0.125 -0.25);
max (1.5 0.125 0.25);
}
};
}
// Settings for the castellatedMesh generation.

19
tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/snappyHexMeshDict
View File

@ -30,16 +30,16 @@ geometry
{
igloo
{
type searchableSphere;
centre (3 3 0);
radius 4;
type sphere;
centre (3 3 0);
radius 4;
}
box1
{
type searchableBox;
min (0 0 0);
max (1 1 1);
type box;
min (0 0 0);
max (1 1 1);
}
twoFridgeFreezers
@ -51,7 +51,7 @@ geometry
seal
{
surface box1;
scale (1.0 1.0 2.1);
scale (1.0 1.0 2.1);
transform
{
coordinateSystem
@ -70,7 +70,7 @@ geometry
herring
{
surface box1;
scale (1.0 1.0 2.1);
scale (1.0 1.0 2.1);
transform
{
coordinateSystem
@ -87,8 +87,7 @@ geometry
}
}
}
};
}
// Settings for the castellatedMesh generation.

3
tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/snappyHexMeshDict
View File

@ -34,8 +34,7 @@ geometry
type triSurfaceMesh;
name geom;
}
};
}
// Settings for the castellatedMesh generation.

2
tutorials/incompressible/lumpedPointMotion/building/steady/system/snappyHexMeshDict
View File

@ -33,7 +33,7 @@ geometry
type triSurfaceMesh;
name building;
}
};
}
// Settings for the castellatedMesh generation.

4
tutorials/incompressible/overSimpleFoam/aeroFoil/aeroFoil_snappyHexMesh/system/snappyHexMeshDict
View File

@ -35,11 +35,11 @@ geometry
refinementBox
{
type searchableBox;
type box;
min (-1 -1 -1);
max ( 5 1 1);
}
};
}
// Settings for the castellatedMesh generation.
castellatedMeshControls

4
tutorials/incompressible/overSimpleFoam/aeroFoil/background_snappyHexMesh/system/snappyHexMeshDict
View File

@ -30,11 +30,11 @@ geometry
refinementBox
{
type searchableBox;
type box;
min (-5 -1 -1);
max ( 5 1 1);
}
};
}
// Settings for the castellatedMesh generation.
castellatedMeshControls

2
tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/system/createBafflesDict
View File

@ -79,7 +79,7 @@ baffles
{
//- Select faces and orientation through a searchableSurface
type searchableSurface;
surface searchablePlate;
surface plate;
origin (0.099 -0.006 0.004);
span (0 0.012 0.012);

15
tutorials/incompressible/pimpleFoam/RAS/propeller/system/snappyHexMeshDict
View File

@ -36,7 +36,7 @@ geometry
{
ascii
{
name innerCylinder;
name innerCylinder;
}
}
}
@ -48,7 +48,7 @@ geometry
{
ascii
{
name innerCylinderSmall;
name innerCylinderSmall;
}
}
}
@ -60,7 +60,7 @@ geometry
{
ascii
{
name outerCylinder;
name outerCylinder;
}
}
}
@ -72,7 +72,7 @@ geometry
{
ascii
{
name propellerTip;
name propellerTip;
}
}
}
@ -84,7 +84,7 @@ geometry
{
ascii
{
name propellerStem1;
name propellerStem1;
}
}
}
@ -108,12 +108,11 @@ geometry
{
ascii
{
name propellerStem3;
name propellerStem3;
}
}
}
};
}
// Settings for the castellatedMesh generation.

5
tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion_snappyHexMesh/system/snappyHexMeshDict
View File

@ -36,12 +36,11 @@ geometry
refinementBox
{
type searchableBox;
type box;
min (-1 -1 -1);
max ( 5 1 1);
}
};
}
// Settings for the castellatedMesh generation.

16
tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/system/blockMeshDict.m4
View File

@ -794,10 +794,10 @@ boundary
/* optional
surface
{
type searchableCylinder; // none
point1 (0 0 -1);
point2 (0 0 1);
radius 0.5;
type cylinder; // none
point1 (0 0 -1);
point2 (0 0 1);
radius 0.5;
}
*/
faces
@ -821,10 +821,10 @@ boundary
/* optional
surface
{
type searchableCylinder; // none
point1 (0 0 -1);
point2 (0 0 1);
radius 0.5;
type cylinder; // none
point1 (0 0 -1);
point2 (0 0 1);
radius 0.5;
}
*/
faces

9
tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/snappyHexMeshDict
View File

@ -37,12 +37,11 @@ geometry
// Analytical shape; cylinder, sphere
refinementBox
{
type searchableBox;
min (-1.0 -0.7 0.0);
max ( 8.0 0.7 2.5);
type box;
min (-1.0 -0.7 0.0);
max ( 8.0 0.7 2.5);
}
};
}
// Settings for the castellatedMesh generation.

9
tutorials/incompressible/simpleFoam/motorBike/system/snappyHexMeshDict
View File

@ -36,12 +36,11 @@ geometry
refinementBox
{
type searchableBox;
min (-1.0 -0.7 0.0);
max ( 8.0 0.7 2.5);
type box;
min (-1.0 -0.7 0.0);
max ( 8.0 0.7 2.5);
}
};
}
// Settings for the castellatedMesh generation.

2
tutorials/incompressible/simpleFoam/rotorDisk/system/snappyHexMeshDict
View File

@ -38,7 +38,7 @@ geometry
type triSurfaceMesh;
name rotatingZone;
}
};
}
castellatedMeshControls
{

15
tutorials/incompressible/simpleFoam/turbineSiting/system/snappyHexMeshDict
View File

@ -31,16 +31,16 @@ geometry
{
windTurbine1
{
type searchableBox;
min (581845 4785805 1061);
max (581855 4785815 1071);
type box;
min (581845 4785805 1061);
max (581855 4785815 1071);
}
windTurbine2
{
type searchableBox;
min (581740 4785658 1065);
max (581771 4785671 1079);
type box;
min (581740 4785658 1065);
max (581771 4785671 1079);
}
terrain.stl
@ -48,8 +48,7 @@ geometry
type triSurfaceMesh;
name terrain;
}
};
}
// Settings for the castellatedMesh generation.

4
tutorials/incompressible/simpleFoam/windAroundBuildings/system/snappyHexMeshDict
View File

@ -30,11 +30,11 @@ geometry
refinementBox
{
type searchableBox;
type box;
min ( 0 0 0);
max (250 180 90);
}
};
}
castellatedMeshControls
{

3
tutorials/lagrangian/MPPICFoam/cyclone/system/snappyHexMeshDict
View File

@ -34,8 +34,7 @@ geometry
type triSurfaceMesh;
name walls;
}
};
}
// Settings for the castellatedMesh generation.

16
tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/system/blockMeshDict.m4
View File

@ -810,10 +810,10 @@ boundary
/* optional
surface
{
type searchableCylinder; // none
point1 (0 0 -1);
point2 (0 0 1);
radius 0.5;
type cylinder; // none
point1 (0 0 -1);
point2 (0 0 1);
radius 0.5;
}
*/
faces
@ -837,10 +837,10 @@ boundary
/* optional
surface
{
type searchableCylinder; // none
point1 (0 0 -1);
point2 (0 0 1);
radius 0.5;
type cylinder; // none
point1 (0 0 -1);
point2 (0 0 1);
radius 0.5;
}
*/
faces

6
tutorials/mesh/blockMesh/pipe/system/blockMeshDict
View File

@ -18,20 +18,20 @@ geometry
{
cylinder
{
type searchableCylinder;
type cylinder;
point1 (0 -4 0);
point2 (0 4 0);
radius 0.7;
}
cylinder2
{
type searchableExtrudedCircle;
type extrudedCircle;
file "curve2.vtk";
radius 0.5;
}
inletPlane
{
type searchablePlate;
type plate;
origin (-4 -50 -50);
span (0 100 100);
}

2
tutorials/mesh/blockMesh/sphere/system/blockMeshDict
View File

@ -18,7 +18,7 @@ geometry
{
sphere
{
type searchableSphere;
type sphere;
centre (0 0 0);
radius 1;
}

2
tutorials/mesh/blockMesh/sphere7/system/blockMeshDict
View File

@ -20,7 +20,7 @@ geometry
{
sphere
{
type searchableSphere;
type sphere;
centre (0 0 0);
radius 1;
}

4
tutorials/mesh/blockMesh/sphere7ProjectedEdges/system/blockMeshDict
View File

@ -20,14 +20,14 @@ geometry
{
sphere
{
type searchableSphere;
type sphere;
centre (0 0 0);
radius 1;
}
innerSphere
{
type searchableSphere;
type sphere;
centre (0 0 0);
radius 0.5;
}

6
tutorials/mesh/foamyHexMesh/blob/system/foamyHexMeshDict
View File

@ -27,9 +27,9 @@ geometry
refinementBox
{
type searchableBox;
min (-0.2 -0.6 -0.2);
max ( 0.4 0.2 0.35);
type box;
min (-0.2 -0.6 -0.2);
max ( 0.4 0.2 0.35);
}
}

8
tutorials/mesh/foamyHexMesh/blob/system/snappyHexMeshDict
View File

@ -36,11 +36,11 @@ geometry
//
// refinementBox
// {
// type searchableBox;
// min (-1.0 -0.7 0.0);
// max ( 8.0 0.7 2.5);
// type box;
// min (-1.0 -0.7 0.0);
// max ( 8.0 0.7 2.5);
// }
};
}

7
tutorials/mesh/foamyHexMesh/simpleShapes/system/foamyHexMeshDict
View File

@ -34,11 +34,10 @@ geometry
// Outside of domain
domain
{
type searchableBox;
min (-0.7 -0.9 -1);
max (1.3 1.1 1);
type box;
min (-0.7 -0.9 -1);
max (1.3 1.1 1);
}
}

6
tutorials/mesh/foamyQuadMesh/square/system/foamyQuadMeshDict
View File

@ -25,9 +25,9 @@ geometry
refinementBox
{
type searchableBox;
min (0.25 0.25 -1000);
max (0.75 0.75 1000);
type box;
min (0.25 0.25 -1000);
max (0.75 0.75 1000);
}
}

38
tutorials/mesh/moveDynamicMesh/relativeMotion/box_snappyHexMesh/system/snappyHexMeshDict
View File

@ -30,37 +30,37 @@ geometry
{
v_dualWing
{
type searchableCylinder;
name v_dualWing;
point1 (-0.43 0 -10);
point2 (-0.43 0 10);
radius 0.1;
type cylinder;
name v_dualWing;
point1 (-0.43 0 -10);
point2 (-0.43 0 10);
radius 0.1;
}
v_rotor
{
type searchableCylinder;
name v_rotor;
point1 (0 0 -10);
point2 (0 0 10);
radius 0.75;
type cylinder;
name v_rotor;
point1 (0 0 -10);
point2 (0 0 10);
radius 0.75;
}
wing1
{
type searchableBox;
name wing1;
min (-0.5 -0.01 -10);
max (-0.44 0.01 10);
type box;
name wing1;
min (-0.5 -0.01 -10);
max (-0.44 0.01 10);
}
wing2
{
type searchableBox;
name wing2;
min (-0.42 -0.0025 -10);
max (-0.36 0.0025 10);
type box;
name wing2;
min (-0.42 -0.0025 -10);
max (-0.36 0.0025 10);
}
};
}

2
tutorials/mesh/snappyHexMesh/addLayersToFaceZone/system/snappyHexMeshDict
View File

@ -23,7 +23,7 @@ addLayers true;
// Geometry. Definition of all surfaces. All surfaces are of class
// searchableSurface.
geometry
{};
{}

9
tutorials/mesh/snappyHexMesh/aerofoilNACA0012_directionalRefinement/system/snappyHexMeshDict
View File

@ -35,12 +35,11 @@ geometry
}
wake
{
type searchableBox;
min (0.8 -0.1 -0.1);
max (2.0 0.1 0.1);
type box;
min (0.8 -0.1 -0.1);
max (2.0 0.1 0.1);
}
};
}
// Settings for the castellatedMesh generation.

9
tutorials/mesh/snappyHexMesh/flange/system/snappyHexMeshDict
View File

@ -38,12 +38,11 @@ geometry
//- Refine a bit extra around the small centre hole
refineHole
{
type searchableSphere;
centre (0 0 -0.012);
radius 0.003;
type sphere;
centre (0 0 -0.012);
radius 0.003;
}
};
}
// Settings for the castellatedMesh generation.

10
tutorials/mesh/snappyHexMesh/gap_detection/system/snappyHexMeshDict
View File

@ -34,13 +34,11 @@ geometry
}
all
{
type searchableBox;
min (-1000 -1000 -1000);
max (1000 1000 1000);
type box;
min (-1000 -1000 -1000);
max (1000 1000 1000);
}
};
}
// Settings for the castellatedMesh generation.

3
tutorials/multiphase/interFoam/RAS/DTCHull/system/snappyHexMeshDict
View File

@ -39,8 +39,7 @@ geometry
type wall;
}
}
};
}
// Settings for the castellatedMesh generation.

3
tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/snappyHexMeshDict
View File

@ -39,8 +39,7 @@ geometry
type wall;
}
}
};
}
// Settings for the castellatedMesh generation.

2
tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/system/createBafflesDict
View File

@ -27,7 +27,7 @@ baffles
{
//- Select faces and orientation through a searchableSurface
type searchableSurface;
surface searchablePlate;
surface plate;
origin (0.3042 0.0493 -100);
span (0 0.1584 200);

3
tutorials/multiphase/interFoam/RAS/mixerVesselAMI/system/snappyHexMeshDict
View File

@ -130,7 +130,8 @@ geometry
name rotating;
type triSurfaceMesh;
}
};
}
// Settings for the castellatedMesh generation.
castellatedMeshControls

2
tutorials/multiphase/interFoam/RAS/motorBike/system/snappyHexMeshDict
View File

@ -33,7 +33,7 @@ geometry
type triSurfaceMesh;
name motorBike;
}
};
}
//// Optional: avoid patch-face merging. Allows mesh to be used for

8
tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/blockMeshDict
View File

@ -30,10 +30,10 @@ geometry
{
cylinder
{
type searchableCylinder;
point1 (0 0 -1);
point2 (0 0 1);
radius $radius;
type cylinder;
point1 (0 0 -1);
point2 (0 0 1);
radius $radius;
}
}

2
tutorials/multiphase/interFoam/laminar/sloshingCylinder/system/snappyHexMeshDict
View File

@ -27,7 +27,7 @@ geometry
type closedTriSurfaceMesh;
name sloshingCylinder;
}
};
}
castellatedMeshControls
{

16
tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/snappyHexMeshDict
View File

@ -36,7 +36,7 @@ geometry
{
ascii
{
name innerCylinder;
name innerCylinder;
}
}
}
@ -48,7 +48,7 @@ geometry
{
ascii
{
name innerCylinderSmall;
name innerCylinderSmall;
}
}
}
@ -60,7 +60,7 @@ geometry
{
ascii
{
name outerCylinder;
name outerCylinder;
}
}
}
@ -72,7 +72,7 @@ geometry
{
ascii
{
name propellerTip;
name propellerTip;
}
}
}
@ -84,7 +84,7 @@ geometry
{
ascii
{
name propellerStem1;
name propellerStem1;
}
}
}
@ -96,7 +96,7 @@ geometry
{
ascii
{
name propellerStem2;
name propellerStem2;
}
}
}
@ -108,11 +108,11 @@ geometry
{
ascii
{
name propellerStem3;
name propellerStem3;
}
}
}
};
}

7
tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/snappyHexMeshDict
View File

@ -45,20 +45,19 @@ geometry
refinement1
{
type searchableSphere;
type sphere;
centre (0 0 0.0025);
radius 0.0075;
}
refinement2
{
type searchableCylinder;
type cylinder;
point1 (0 0 0);
point2 (0 0 0.03);
radius 0.0075;
}
};
}
// Settings for the castellatedMesh generation.

16
tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/system/blockMeshDict.m4
View File

@ -794,10 +794,10 @@ boundary
/* optional
surface
{
type searchableCylinder; // none
point1 (0 0 -1);
point2 (0 0 1);
radius 0.5;
type cylinder; // none
point1 (0 0 -1);
point2 (0 0 1);
radius 0.5;
}
*/
faces
@ -821,10 +821,10 @@ boundary
/* optional
surface
{
type searchableCylinder; // none
point1 (0 0 -1);
point2 (0 0 1);
radius 0.5;
type cylinder; // none
point1 (0 0 -1);
point2 (0 0 1);
radius 0.5;
}
*/
faces

9
tutorials/preProcessing/createZeroDirectory/motorBike/system/snappyHexMeshDict
View File

@ -36,12 +36,11 @@ geometry
refinementBox
{
type searchableBox;
min (-1.0 -0.7 0.0);
max ( 8.0 0.7 2.5);
type box;
min (-1.0 -0.7 0.0);
max ( 8.0 0.7 2.5);
}
};
}
// Settings for the castellatedMesh generation.

11
tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/snappyHexMeshDict
View File

@ -61,12 +61,11 @@ geometry
//refinementBox
//{
// type searchableBox;
// min (-0.3 -0.4 -0.1);
// max ( 3.0 0.4 1.4);
// }
};
// type box;
// min (-0.3 -0.4 -0.1);
// max ( 3.0 0.4 1.4);
//}
}
// Settings for the castellatedMesh generation.