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' of ssh://dm/home/dm4/OpenFOAM/OpenFOAM-dev

Browse Source
This commit is contained in:
Henry
2012-10-26 15:36:43 +01:00
parent 193a1e96ce efeae5332e
commit b544a4c361
72 changed files with 2705 additions and 387 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
tutorials/combustion/engineFoam/kivaTest/Allrun
View File

@ -7,36 +7,14 @@ cd ${0%/*} || exit 1 # run from this directory
# Get application name
application=`getApplication`
runKivaToFoam()
{
if [ -f log.kivaToFoam ]
then
echo "kivaToFoam already run: remove log file to re-run"
else
echo "kivaToFoam: converting kiva file"
kivaToFoam -file $1 > log.kivaToFoam 2>&1
fi
}
restartApplication()
{
if [ -f log-2.$1 ]
then
echo "$1 already run: remove log file to re-run"
else
echo "Running $1"
$1 > log-2.$1 2>&1
fi
}
runKivaToFoam otape17
runApplication kivaToFoam -file otape17
cp system/controlDict.1st system/controlDict
runApplication $application
mv log.$application log.$application.1
cp system/controlDict.2nd system/controlDict
restartApplication $application
runApplication $application
mv log.$application log.$application.2
# ----------------------------------------------------------------- end-of-file

7
tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/makeMesh
View File

@ -1,5 +1,8 @@
#!/bin/sh
set -x
cd ${0%/*} || exit 1 # run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
m4 < constant/polyMesh/blockMeshDict.m4 > constant/polyMesh/blockMeshDict
blockMesh > log.blockMesh 2>&1
runApplication blockMesh

15
tutorials/compressible/sonicFoam/ras/nacaAirfoil/Allrun
View File

@ -7,24 +7,13 @@ cd ${0%/*} || exit 1 # run from this directory
# Get application name
application=`getApplication`
runStarToFoam()
{
if [ -f log.star3ToFoam -o -f log.starToFoam ]
then
echo "star3ToFoam already run on $PWD: remove log file to re-run"
else
echo "star3ToFoam: converting mesh $1"
star3ToFoam $1 > log.star3ToFoam 2>&1
fi
}
runApplication star3ToFoam prostar/nacaAirfoil
runStarToFoam prostar/nacaAirfoil
mv constant/polyMesh/boundary temp
sed -e s/"\([\t ]*type[\t ]*\)symmetryPlane"/"\1empty"/g \
temp > constant/polyMesh/boundary
rm temp
runApplication $application
# end-of-file
# ----------------------------------------------------------------- end-of-file

10
tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/validation/createGraphs
View File

@ -83,8 +83,16 @@ type -P gnuplot &>/dev/null || {
exit 1
}
SETSDIR="../sets"
if [ ! -d $SETSDIR ]
then
echo "createGraphs: results sets not available in folder $SETSDIR"
exit 0
fi
# paths to data
LATESTTIME=`ls ../sets`
LATESTTIME=`ls $SETSDIR`
OFDATAROOT=../sets/$LATESTTIME
EXPTDATAROOT=./exptData

2
tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/Allrun
View File

@ -13,7 +13,7 @@ unset FOAM_SETNAN
unset FOAM_SIGFPE
# Create first baffle
createBaffles baffleFaces '(baffle1Wall_0 baffle1Wall_1)' -overwrite > log.createBaffles 2>&1
runApplication createBaffles baffleFaces '(baffle1Wall_0 baffle1Wall_1)' -overwrite
# Create region
runApplication extrudeToRegionMesh -overwrite

10
tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/makeMesh
View File

@ -1,5 +1,11 @@
#!/bin/sh
set -x
cd ${0%/*} || exit 1 # run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
m4 < constant/polyMesh/blockMeshDict.m4 > constant/polyMesh/blockMeshDict
blockMesh > log.blockMesh 2>&1
runApplication blockMesh
# ----------------------------------------------------------------- end-of-file

1
tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/Allrun
View File

@ -1,7 +1,6 @@
#!/bin/sh
cd ${0%/*} || exit 1 # run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions

13
tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/makeMesh
View File

@ -1,6 +1,13 @@
#!/bin/sh
set -x
cd ${0%/*} || exit 1 # run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
m4 < constant/polyMesh/blockMeshDict.m4 > constant/polyMesh/blockMeshDict
blockMesh > log.blockMesh 2>&1
topoSet
runApplication blockMesh
runApplication topoSet
# ----------------------------------------------------------------- end-of-file

2
tutorials/incompressible/pimpleFoam/TJunctionFan/0/p
View File

@ -56,7 +56,6 @@ boundaryField
{
type fan;
patchType cyclic;
jump uniform 0;
jumpTable polynomial
2
@ -71,7 +70,6 @@ boundaryField
{
type fan;
patchType cyclic;
jump uniform 0;
value uniform 0;
}
defaultFaces

8
tutorials/incompressible/pimpleFoam/TJunctionFan/Allrun
View File

@ -16,9 +16,13 @@ unset FOAM_SETNAN
# Create faceZones for fan and baffles
runApplication topoSet
# Create fan cyclics
createBaffles cyclicFaces '(fan_half0 fan_half1)' -overwrite > log.createBaffles 2>&1
runApplication createBaffles cyclicFaces '(fan_half0 fan_half1)' -overwrite
mv log.createBaffles log.createBaffles.1
# Create wall baffles
createBaffles baffleFaces '(baffles baffles)' -overwrite > log.createBaffles 2>&1
runApplication createBaffles baffleFaces '(baffles baffles)' -overwrite
mv log.createBaffles log.createBaffles.2
runApplication $application

2
tutorials/incompressible/pimpleFoam/elipsekkLOmega/Allrun
View File

@ -8,7 +8,7 @@ cd ${0%/*} || exit 1 # run from this directory
application=`getApplication`
runApplication blockMesh
transformPoints -scale '(1.6666 1 1)'
runApplication transformPoints -scale '(1.6666 1 1)'
runApplication changeDictionary -instance system -dict system/changeDictionaryDict.X
runApplication mirrorMesh -overwrite

6
tutorials/lagrangian/reactingParcelFoam/filter/Allrun
View File

@ -21,10 +21,12 @@ setsToZones -noFlipMap > log.setsToZones 2>&1
# - use binary writing to avoid 'nan'
# - use setFields to set values
unset FOAM_SIGFPE
createBaffles cycLeft '(cycLeft_half0 cycLeft_half1)' -overwrite > log.createBaffles1 2>&1
runApplication createBaffles cycLeft '(cycLeft_half0 cycLeft_half1)' -overwrite
mv log.createBaffles log.createBaffles1
# create the second cyclic - rhs of porous zone
createBaffles cycRight '(cycRight_half0 cycRight_half1)' -overwrite > log.createBaffles2 2>&1
runApplication createBaffles cycRight '(cycRight_half0 cycRight_half1)' -overwrite
mv log.createBaffles log.createBaffles2
# Initialise newly created patchFields to 0
runApplication changeDictionary

7
tutorials/lagrangian/reactingParcelFoam/filter/constant/porosityProperties
View File

@ -23,11 +23,8 @@ filter1
DarcyForchheimerCoeffs
{
Darcy
{
d d [0 -2 0 0 0 0 0] (500000 -1000 -1000);
f f [0 -1 0 0 0 0 0] (0 0 0);
}
d d [0 -2 0 0 0 0 0] (500000 -1000 -1000);
f f [0 -1 0 0 0 0 0] (0 0 0);
coordinateSystem
{

26
tutorials/lagrangian/reactingParcelFoam/filter/constant/sourcesProperties
View File

@ -17,7 +17,7 @@ FoamFile
massSource1
{
type scalarExplicitSource;
type scalarSemiImplicitSource;
active true;
timeStart 0.2;
duration 2.0;
@ -27,13 +27,13 @@ massSource1
(2.75 0.5 0)
);
scalarExplicitSourceCoeffs
scalarSemiImplicitSourceCoeffs
{
volumeMode absolute;
injectionRate
injectionRateSuSp
{
rho 1e-4; // kg/s
H2O 1e-4; // kg/s
rho (1e-4 0); // kg/s
H2O (1e-4 0); // kg/s
}
}
}
@ -41,7 +41,7 @@ massSource1
momentumSource1
{
type vectorExplicitSource;
type vectorSemiImplicitSource;
active true;
timeStart 0.2;
duration 2.0;
@ -51,12 +51,12 @@ momentumSource1
(2.75 0.5 0)
);
vectorExplicitSourceCoeffs
vectorSemiImplicitSourceCoeffs
{
volumeMode absolute;
injectionRate
injectionRateSuSp
{
U (0 0.005 0);
U ((0 0.005 0) 0);
}
}
}
@ -64,7 +64,7 @@ momentumSource1
energySource1
{
type scalarExplicitSource;
type scalarSemiImplicitSource;
active true;
timeStart 0.2;
duration 2.0;
@ -74,12 +74,12 @@ energySource1
(2.75 0.5 0)
);
scalarExplicitSourceCoeffs
scalarSemiImplicitSourceCoeffs
{
volumeMode absolute;
injectionRate
injectionRateSuSp
{
h 10;
h (10 0);
}
}
}

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

@ -186,6 +186,10 @@ snapControls
//- Use castellatedMeshControls::features
explicitFeatureSnap true;
//- Detect features between multiple surfaces
// (only for explicitFeatureSnap, default = false)
multiRegionFeatureSnap true;
}

2
tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/Allrun
View File

@ -16,7 +16,7 @@ unset FOAM_SETNAN
# Create faceZones for porous baffles
runApplication topoSet
createBaffles cyclicZoneFaces '(porous_half0 porous_half1)' -overwrite > log.createBaffles 2>&1
runApplication createBaffles cyclicZoneFaces '(porous_half0 porous_half1)' -overwrite
runApplication changeDictionary