mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
Merge branch 'master' into dicts
This commit is contained in:
@ -34,14 +34,7 @@ Description
|
||||
#include "Time.H"
|
||||
#include "IFstream.H"
|
||||
#include "OFstream.H"
|
||||
#include "meshTools.H"
|
||||
#include "polyMesh.H"
|
||||
#include "wallPolyPatch.H"
|
||||
#include "symmetryPolyPatch.H"
|
||||
#include "preservePatchTypes.H"
|
||||
#include "cellShape.H"
|
||||
#include "cellModeller.H"
|
||||
#include "mergePoints.H"
|
||||
#include "pointField.H"
|
||||
#include "unitConversion.H"
|
||||
|
||||
using namespace Foam;
|
||||
|
||||
@ -1,24 +0,0 @@
|
||||
/*--------------------------------*- C++ -*----------------------------------*\
|
||||
| ========= | |
|
||||
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
|
||||
| \\ / O peration | Version: dev |
|
||||
| \\ / A nd | Web: www.OpenFOAM.com |
|
||||
| \\/ M anipulation | |
|
||||
\*---------------------------------------------------------------------------*/
|
||||
FoamFile
|
||||
{
|
||||
version 2.0;
|
||||
format ascii;
|
||||
class dictionary;
|
||||
location "0/uniform/lagrangian/dsmc";
|
||||
object particleProperties;
|
||||
}
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
processor0
|
||||
{
|
||||
particleCount 63978;
|
||||
}
|
||||
|
||||
|
||||
// ************************************************************************* //
|
||||
@ -1,24 +0,0 @@
|
||||
/*--------------------------------*- C++ -*----------------------------------*\
|
||||
| ========= | |
|
||||
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
|
||||
| \\ / O peration | Version: dev |
|
||||
| \\ / A nd | Web: www.OpenFOAM.com |
|
||||
| \\/ M anipulation | |
|
||||
\*---------------------------------------------------------------------------*/
|
||||
FoamFile
|
||||
{
|
||||
version 2.0;
|
||||
format ascii;
|
||||
class dictionary;
|
||||
location "0/uniform/lagrangian/dsmc";
|
||||
object particleProperties;
|
||||
}
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
processor0
|
||||
{
|
||||
particleCount 63978;
|
||||
}
|
||||
|
||||
|
||||
// ************************************************************************* //
|
||||
@ -1,14 +0,0 @@
|
||||
#!/bin/sh
|
||||
cd ${0%/*} || exit 1 # run from this directory
|
||||
|
||||
# Source tutorial run functions
|
||||
. $WM_PROJECT_DIR/bin/tools/RunFunctions
|
||||
|
||||
# Get application name
|
||||
application=`getApplication`
|
||||
|
||||
runApplication blockMesh
|
||||
runApplication changeDictionary
|
||||
runApplication $application
|
||||
|
||||
# ----------------------------------------------------------------- end-of-file
|
||||
@ -85,69 +85,90 @@ edges
|
||||
(
|
||||
);
|
||||
|
||||
patches
|
||||
boundary
|
||||
(
|
||||
patch inlet
|
||||
(
|
||||
(0 22 23 1)
|
||||
(1 23 24 2)
|
||||
(2 24 25 3)
|
||||
)
|
||||
patch outlet
|
||||
(
|
||||
(16 17 39 38)
|
||||
(17 18 40 39)
|
||||
(18 19 41 40)
|
||||
(19 20 42 41)
|
||||
(20 21 43 42)
|
||||
)
|
||||
wall upperWall
|
||||
(
|
||||
(3 25 31 9)
|
||||
(9 31 37 15)
|
||||
(15 37 43 21)
|
||||
)
|
||||
wall lowerWall
|
||||
(
|
||||
(0 6 28 22)
|
||||
(6 5 27 28)
|
||||
(5 4 26 27)
|
||||
(4 10 32 26)
|
||||
(10 16 38 32)
|
||||
)
|
||||
empty frontAndBack
|
||||
(
|
||||
(22 28 29 23)
|
||||
(23 29 30 24)
|
||||
(24 30 31 25)
|
||||
(26 32 33 27)
|
||||
(27 33 34 28)
|
||||
(28 34 35 29)
|
||||
(29 35 36 30)
|
||||
(30 36 37 31)
|
||||
(32 38 39 33)
|
||||
(33 39 40 34)
|
||||
(34 40 41 35)
|
||||
(35 41 42 36)
|
||||
(36 42 43 37)
|
||||
(0 1 7 6)
|
||||
(1 2 8 7)
|
||||
(2 3 9 8)
|
||||
(4 5 11 10)
|
||||
(5 6 12 11)
|
||||
(6 7 13 12)
|
||||
(7 8 14 13)
|
||||
(8 9 15 14)
|
||||
(10 11 17 16)
|
||||
(11 12 18 17)
|
||||
(12 13 19 18)
|
||||
(13 14 20 19)
|
||||
(14 15 21 20)
|
||||
)
|
||||
);
|
||||
inlet
|
||||
{
|
||||
type directMappedPatch;
|
||||
offset ( 0.0495 0 0 );
|
||||
sampleRegion region0;
|
||||
sampleMode nearestCell;
|
||||
samplePatch none;
|
||||
|
||||
mergePatchPairs
|
||||
(
|
||||
faces
|
||||
(
|
||||
(0 22 23 1)
|
||||
(1 23 24 2)
|
||||
(2 24 25 3)
|
||||
);
|
||||
}
|
||||
outlet
|
||||
{
|
||||
type patch;
|
||||
faces
|
||||
(
|
||||
(16 17 39 38)
|
||||
(17 18 40 39)
|
||||
(18 19 41 40)
|
||||
(19 20 42 41)
|
||||
(20 21 43 42)
|
||||
);
|
||||
}
|
||||
upperWall
|
||||
{
|
||||
type wall;
|
||||
faces
|
||||
(
|
||||
(3 25 31 9)
|
||||
(9 31 37 15)
|
||||
(15 37 43 21)
|
||||
);
|
||||
}
|
||||
lowerWall
|
||||
{
|
||||
type wall;
|
||||
faces
|
||||
(
|
||||
(0 6 28 22)
|
||||
(6 5 27 28)
|
||||
(5 4 26 27)
|
||||
(4 10 32 26)
|
||||
(10 16 38 32)
|
||||
);
|
||||
}
|
||||
frontAndBack
|
||||
{
|
||||
type empty;
|
||||
faces
|
||||
(
|
||||
(22 28 29 23)
|
||||
(23 29 30 24)
|
||||
(24 30 31 25)
|
||||
(26 32 33 27)
|
||||
(27 33 34 28)
|
||||
(28 34 35 29)
|
||||
(29 35 36 30)
|
||||
(30 36 37 31)
|
||||
(32 38 39 33)
|
||||
(33 39 40 34)
|
||||
(34 40 41 35)
|
||||
(35 41 42 36)
|
||||
(36 42 43 37)
|
||||
(0 1 7 6)
|
||||
(1 2 8 7)
|
||||
(2 3 9 8)
|
||||
(4 5 11 10)
|
||||
(5 6 12 11)
|
||||
(6 7 13 12)
|
||||
(7 8 14 13)
|
||||
(8 9 15 14)
|
||||
(10 11 17 16)
|
||||
(11 12 18 17)
|
||||
(12 13 19 18)
|
||||
(13 14 20 19)
|
||||
(14 15 21 20)
|
||||
);
|
||||
}
|
||||
);
|
||||
|
||||
// ************************************************************************* //
|
||||
|
||||
@ -1,63 +0,0 @@
|
||||
/*--------------------------------*- C++ -*----------------------------------*\
|
||||
| ========= | |
|
||||
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
|
||||
| \\ / O peration | Version: dev |
|
||||
| \\ / A nd | Web: www.OpenFOAM.com |
|
||||
| \\/ M anipulation | |
|
||||
\*---------------------------------------------------------------------------*/
|
||||
FoamFile
|
||||
{
|
||||
version 2.0;
|
||||
format ascii;
|
||||
class polyBoundaryMesh;
|
||||
location "constant/polyMesh";
|
||||
object boundary;
|
||||
}
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
|
||||
5
|
||||
(
|
||||
inlet
|
||||
{
|
||||
type directMappedPatch;
|
||||
nFaces 30;
|
||||
startFace 27238;
|
||||
sampleMode nearestCell;
|
||||
sampleRegion region0;
|
||||
samplePatch none;
|
||||
offset ( 0.0495 0 0 );
|
||||
}
|
||||
|
||||
outlet
|
||||
{
|
||||
type patch;
|
||||
nFaces 57;
|
||||
startFace 27268;
|
||||
}
|
||||
|
||||
upperWall
|
||||
{
|
||||
type wall;
|
||||
nFaces 275;
|
||||
startFace 27325;
|
||||
}
|
||||
|
||||
lowerWall
|
||||
{
|
||||
type wall;
|
||||
nFaces 302;
|
||||
startFace 27600;
|
||||
}
|
||||
|
||||
frontAndBack
|
||||
{
|
||||
type empty;
|
||||
nFaces 27570;
|
||||
startFace 27902;
|
||||
}
|
||||
|
||||
)
|
||||
|
||||
|
||||
// ************************************************************************* //
|
||||
@ -1,34 +0,0 @@
|
||||
/*--------------------------------*- C++ -*----------------------------------*\
|
||||
| ========= | |
|
||||
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
|
||||
| \\ / O peration | Version: dev |
|
||||
| \\ / A nd | Web: www.OpenFOAM.com |
|
||||
| \\/ M anipulation | |
|
||||
\*---------------------------------------------------------------------------*/
|
||||
FoamFile
|
||||
{
|
||||
version 2.0;
|
||||
format ascii;
|
||||
class dictionary;
|
||||
location "system";
|
||||
object changeDictionaryDict;
|
||||
}
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
dictionaryReplacement
|
||||
{
|
||||
boundary
|
||||
{
|
||||
inlet
|
||||
{
|
||||
type directMappedPatch;
|
||||
offset ( 0.0495 0 0 );
|
||||
sampleRegion region0;
|
||||
sampleMode nearestCell;
|
||||
samplePatch none;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// ************************************************************************* //
|
||||
@ -1,30 +0,0 @@
|
||||
#!/bin/sh
|
||||
cd ${0%/*} || exit 1 # run from this directory
|
||||
|
||||
# Source tutorial clean functions
|
||||
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
|
||||
|
||||
(
|
||||
cd throttle || exit
|
||||
|
||||
rm -rf constant/polyMesh/sets > /dev/null 2>&1
|
||||
rm -rf 0/polyMesh > /dev/null 2>&1
|
||||
rm system/topoSetDict > /dev/null 2>&1
|
||||
|
||||
cleanCase
|
||||
)
|
||||
|
||||
|
||||
(
|
||||
cd throttle3D || exit
|
||||
|
||||
rm -rf constant/polyMesh/sets > /dev/null 2>&1
|
||||
rm -rf 0 > /dev/null 2>&1
|
||||
cp -r 0.org 0
|
||||
rm system/topoSetDict > /dev/null 2>&1
|
||||
rm -rf processor[0-9] > /dev/null 2>&1
|
||||
|
||||
cleanCase
|
||||
)
|
||||
|
||||
# ----------------------------------------------------------------- end-of-file
|
||||
@ -1,50 +1,14 @@
|
||||
#!/bin/sh
|
||||
cd ${0%/*} || exit 1 # run from this directory
|
||||
|
||||
# Source tutorial run functions
|
||||
. $WM_PROJECT_DIR/bin/tools/RunFunctions
|
||||
|
||||
# Set application name
|
||||
application="cavitatingFoam"
|
||||
|
||||
refineMeshByCellSet()
|
||||
{
|
||||
while [ $# -ge 1 ]
|
||||
do
|
||||
echo "creating cell set for primary zone - $1"
|
||||
cp system/topoSetDict.$1 system/topoSetDict
|
||||
topoSet > log.topoSet.$1 2>&1
|
||||
|
||||
echo "refining primary zone - $1"
|
||||
refineMesh -dict -overwrite > log.refineMesh.$1 2>&1
|
||||
shift
|
||||
done
|
||||
}
|
||||
|
||||
|
||||
(
|
||||
cd throttle || exit
|
||||
|
||||
runApplication blockMesh
|
||||
refineMeshByCellSet 1 2 3
|
||||
runApplication $application
|
||||
./Allrun
|
||||
)
|
||||
|
||||
|
||||
(
|
||||
cd throttle3D || exit
|
||||
|
||||
cp -r 0.org 0
|
||||
|
||||
runApplication blockMesh
|
||||
refineMeshByCellSet 1 2 3
|
||||
|
||||
echo "mapping fields from 2D throttle case"
|
||||
mapFields ../throttle -sourceTime latestTime > log.mapFields 2>&1
|
||||
|
||||
runApplication decomposePar
|
||||
runParallel $application 4
|
||||
runApplication reconstructPar
|
||||
./Allrun
|
||||
)
|
||||
|
||||
# ----------------------------------------------------------------- end-of-file
|
||||
|
||||
12
tutorials/multiphase/cavitatingFoam/les/throttle/Allclean
Executable file
12
tutorials/multiphase/cavitatingFoam/les/throttle/Allclean
Executable file
@ -0,0 +1,12 @@
|
||||
#!/bin/sh
|
||||
cd ${0%/*} || exit 1 # run from this directory
|
||||
|
||||
# Source tutorial clean functions
|
||||
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
|
||||
|
||||
rm -rf constant/polyMesh/sets > /dev/null 2>&1
|
||||
rm -rf 0/polyMesh > /dev/null 2>&1
|
||||
rm system/topoSetDict > /dev/null 2>&1
|
||||
cleanCase
|
||||
|
||||
# ----------------------------------------------------------------- end-of-file
|
||||
28
tutorials/multiphase/cavitatingFoam/les/throttle/Allrun
Executable file
28
tutorials/multiphase/cavitatingFoam/les/throttle/Allrun
Executable file
@ -0,0 +1,28 @@
|
||||
#!/bin/sh
|
||||
cd ${0%/*} || exit 1 # run from this directory
|
||||
|
||||
# Source tutorial run functions
|
||||
. $WM_PROJECT_DIR/bin/tools/RunFunctions
|
||||
|
||||
# Set application name
|
||||
application="cavitatingFoam"
|
||||
|
||||
refineMeshByCellSet()
|
||||
{
|
||||
while [ $# -ge 1 ]
|
||||
do
|
||||
echo "creating cell set for primary zone - $1"
|
||||
cp system/topoSetDict.$1 system/topoSetDict
|
||||
topoSet > log.topoSet.$1 2>&1
|
||||
|
||||
echo "refining primary zone - $1"
|
||||
refineMesh -dict -overwrite > log.refineMesh.$1 2>&1
|
||||
shift
|
||||
done
|
||||
}
|
||||
|
||||
runApplication blockMesh
|
||||
refineMeshByCellSet 1 2 3
|
||||
runApplication $application
|
||||
|
||||
# ----------------------------------------------------------------- end-of-file
|
||||
@ -21,25 +21,25 @@ FoamFile
|
||||
{
|
||||
type patch;
|
||||
nFaces 51;
|
||||
startFace 15151;
|
||||
startFace 35380;
|
||||
}
|
||||
outlet
|
||||
{
|
||||
type patch;
|
||||
nFaces 51;
|
||||
startFace 15202;
|
||||
startFace 35431;
|
||||
}
|
||||
walls
|
||||
{
|
||||
type wall;
|
||||
nFaces 436;
|
||||
startFace 15253;
|
||||
nFaces 640;
|
||||
startFace 35482;
|
||||
}
|
||||
frontBack
|
||||
{
|
||||
type empty;
|
||||
nFaces 15420;
|
||||
startFace 15689;
|
||||
nFaces 35580;
|
||||
startFace 36122;
|
||||
}
|
||||
)
|
||||
|
||||
|
||||
14
tutorials/multiphase/cavitatingFoam/les/throttle3D/Allclean
Executable file
14
tutorials/multiphase/cavitatingFoam/les/throttle3D/Allclean
Executable file
@ -0,0 +1,14 @@
|
||||
#!/bin/sh
|
||||
cd ${0%/*} || exit 1 # run from this directory
|
||||
|
||||
# Source tutorial clean functions
|
||||
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
|
||||
|
||||
rm -rf constant/polyMesh/sets > /dev/null 2>&1
|
||||
rm -rf 0 > /dev/null 2>&1
|
||||
cp -r 0.org 0
|
||||
rm system/topoSetDict > /dev/null 2>&1
|
||||
rm -rf processor[0-9] > /dev/null 2>&1
|
||||
cleanCase
|
||||
|
||||
# ----------------------------------------------------------------- end-of-file
|
||||
36
tutorials/multiphase/cavitatingFoam/les/throttle3D/Allrun
Executable file
36
tutorials/multiphase/cavitatingFoam/les/throttle3D/Allrun
Executable file
@ -0,0 +1,36 @@
|
||||
#!/bin/sh
|
||||
cd ${0%/*} || exit 1 # run from this directory
|
||||
|
||||
# Source tutorial run functions
|
||||
. $WM_PROJECT_DIR/bin/tools/RunFunctions
|
||||
|
||||
# Set application name
|
||||
application="cavitatingFoam"
|
||||
|
||||
refineMeshByCellSet()
|
||||
{
|
||||
while [ $# -ge 1 ]
|
||||
do
|
||||
echo "creating cell set for primary zone - $1"
|
||||
cp system/topoSetDict.$1 system/topoSetDict
|
||||
topoSet > log.topoSet.$1 2>&1
|
||||
|
||||
echo "refining primary zone - $1"
|
||||
refineMesh -dict -overwrite > log.refineMesh.$1 2>&1
|
||||
shift
|
||||
done
|
||||
}
|
||||
|
||||
cp -r 0.org 0
|
||||
|
||||
runApplication blockMesh
|
||||
refineMeshByCellSet 1 2 3
|
||||
|
||||
echo "mapping fields from 2D throttle case"
|
||||
mapFields ../throttle -sourceTime latestTime > log.mapFields 2>&1
|
||||
|
||||
runApplication decomposePar
|
||||
runParallel $application 4
|
||||
runApplication reconstructPar
|
||||
|
||||
# ----------------------------------------------------------------- end-of-file
|
||||
Reference in New Issue
Block a user