Merge branch 'master' of /home/dm4/OpenFOAM/repositories/OpenFOAM-dev

This commit is contained in:
william
2013-12-20 10:32:38 +00:00
29 changed files with 722 additions and 902 deletions

View File

@ -30,4 +30,7 @@ do
removeCase $caseName
done
(cd elbow && ./Allclean)
# ----------------------------------------------------------------- end-of-file

View File

@ -18,12 +18,6 @@ runMapFieldsConsistent()
mapFieldsNew $1 -case $2 -sourceTime latestTime -consistent > $2/log.mapFields 2>&1
}
runFluentMeshToFoam()
{
echo "fluentMeshToFoam: converting mesh $2"
fluentMeshToFoam $2 -case $1 > $1/log.fluentMeshToFoam 2>&1
}
copySolutionDirs()
{
echo "Copying $2/0* directory to $1"
@ -95,16 +89,8 @@ do
( cd $caseName && runApplication `getApplication` )
done
# elbow case for testing Fluent-FOAM conversion tools
runFluentMeshToFoam elbow elbow/elbow.msh
(
cd elbow || exit
runApplication `getApplication`
runApplication foamMeshToFluent
runApplication foamDataToFluent
)
(cd elbow && ./Allrun)
# ----------------------------------------------------------------- end-of-file

View File

@ -0,0 +1,11 @@
#!/bin/sh
cd ${0%/*} || exit 1 # run from this directory
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
rm -f constant/polyMesh/boundary
rm -rf fluentInterface
cleanCase
# ----------------------------------------------------------------- end-of-file

View File

@ -0,0 +1,15 @@
#!/bin/sh
cd ${0%/*} || exit 1 # run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
# Get application directory
application=`getApplication`
runApplication fluentMeshToFoam elbow.msh
runApplication "$application"
runApplication foamMeshToFluent
runApplication foamDataToFluent
# ----------------------------------------------------------------- end-of-file

View File

@ -1,58 +0,0 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class polyBoundaryMesh;
location "constant/polyMesh";
object boundary;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
6
(
wall-4
{
type wall;
nFaces 100;
startFace 1300;
}
velocity-inlet-5
{
type patch;
nFaces 8;
startFace 1400;
}
velocity-inlet-6
{
type patch;
nFaces 4;
startFace 1408;
}
pressure-outlet-7
{
type patch;
nFaces 8;
startFace 1412;
}
wall-8
{
type wall;
nFaces 34;
startFace 1420;
}
frontAndBackPlanes
{
type empty;
nFaces 1836;
startFace 1454;
}
)
// ************************************************************************* //

View File

@ -26,41 +26,6 @@ boundaryField
type timeVaryingMappedFixedValue;
setAverage 0;
offset 0;
value nonuniform List<scalar>
30
(
9813.84
8665.24
1866.31
755.118
205.654
76.6694
28.4518
16.0868
15.9867
11.0187
7.95753
5.26064
3.44136
2.55317
2.27183
2.33608
2.9115
3.59492
3.0497
2.716
2.9325
3.88456
6.91821
14.9754
37.5461
217.022
2043.58
4864.22
6244
6334.7
)
;
}
outlet
{

View File

@ -26,41 +26,6 @@ boundaryField
type timeVaryingMappedFixedValue;
setAverage 0;
offset 0;
value nonuniform List<scalar>
30
(
2.95219
2.54219
0.725449
0.486465
0.353566
0.240375
0.172984
0.147052
0.146827
0.135658
0.12147
0.0942189
0.0833465
0.0828453
0.0955983
0.0920838
0.0967682
0.0990811
0.100866
0.101556
0.0967155
0.0841739
0.0904567
0.130411
0.194046
0.219327
0.975528
2.22578
3.12421
2.28104
)
;
}
outlet
{