Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Development
openfoam
Commits
e3c4696a
Commit
e3c4696a
authored
Jan 17, 2018
by
Andrew Heather
Browse files
TUT: Updated Allrun scripts for tests. Fixes
#710
parent
40985d29
Changes
24
Hide whitespace changes
Inline
Side-by-side
tutorials/IO/fileHandler/Allrun
View file @
e3c4696a
...
...
@@ -2,6 +2,17 @@
cd
${
0
%/*
}
||
exit
1
# Run from this directory
.
$WM_PROJECT_DIR
/bin/tools/RunFunctions
# Tutorial run functions
if
isTest
$@
then
# Reset the controlDict
if
[
-f
system/controlDict.orig
]
then
echo
"
$0
: restoring the controlDict from controlDict.orig"
mv
system/controlDict.orig system/controlDict
fi
fi
runApplication blockMesh
application
=
$(
getApplication
)
...
...
tutorials/IO/fileHandler/Alltest
deleted
100755 → 0
View file @
40985d29
#!/bin/sh
cd
${
0
%/*
}
||
exit
1
# Run from this directory
.
$WM_PROJECT_DIR
/bin/tools/RunFunctions
# Tutorial run functions
# Reset the controlDict
if
[
-f
system/controlDict.orig
]
then
echo
"
$0
: restoring the controlDict from controlDict.orig"
mv
system/controlDict.orig system/controlDict
fi
./Allrun
#------------------------------------------------------------------------------
tutorials/basic/overPotentialFoam/cylinder/Allrun
View file @
e3c4696a
...
...
@@ -5,4 +5,4 @@
(
cd
cylinderMesh
&&
./Allrun.pre
)
# Add background mesh
(
cd
cylinderAndBackground
&&
./Allrun
)
(
cd
cylinderAndBackground
&&
./Allrun
$*
)
tutorials/combustion/XiFoam/RAS/Allrun
View file @
e3c4696a
...
...
@@ -4,55 +4,56 @@ cd ${0%/*} || exit 1 # Run from this directory
setControlDict
()
{
sed
\
-e
"s/
\(
deltaT[
\t
]*
\)
5e-06;/
\1
1e-05;/g"
\
-e
"s/
\(
endTime[
\t
]*
\)
0.005;/
\1
0.015;/g"
\
-e
"s/
\(
writeInterval[
\t
]*
\)
10;/
\1
50;/g"
\
-i
system/controlDict
foamDictionary
-entry
"deltaT"
-set
"1e-05"
system/controlDict
foamDictionary
-entry
"endTime"
-set
"0.015"
system/controlDict
foamDictionary
-entry
"writeInterval"
-set
"50"
system/controlDict
}
setCombustionProperties
()
{
sed
\
-
e
"s/
\(
laminarFlameSpeedCorrelation[
\t
]*
\)
Gulders;/
\1
RaviPetersen;/g"
\
-e
"s/
\(
fuel[
\t
]*
\)
Propane;/
\1
HydrogenInAir;/g
"
\
-
i
constant/combustionProperties
foamDictionary
-entry
"laminarFlameSpeedCorrelation"
\
-
set
"RaviPetersen"
constant/combustionProperties
foamDictionary
-entry
"fuel
"
\
-
set
"HydrogenInAir"
constant/combustionProperties
}
# Do moriyoshiHomogeneous
(
cd
moriyoshiHomogeneous
&&
foamRunTutorials
)
# Clone case for second phase
cloneCase moriyoshiHomogeneous moriyoshiHomogeneousPart2
# Modify and execute
(
cd
moriyoshiHomogeneousPart2
||
exit
# The following 2 command lines are a generic implementation of the
# following command:
# cp -r ../moriyoshiHomogeneous/0.005 .
lastTimeStep
=
$(
foamListTimes
-case
../moriyoshiHomogeneous
-latestTime
)
cp
-r
../moriyoshiHomogeneous/
$lastTimeStep
.
setControlDict
runApplication
$(
getApplication
)
)
# Clone case for hydrogen
cloneCase moriyoshiHomogeneous moriyoshiHomogeneousHydrogen
# Modify and execute
(
cd
moriyoshiHomogeneousHydrogen
||
exit
setCombustionProperties
mv
constant/thermophysicalProperties
\
constant/thermophysicalProperties.propane
mv
constant/thermophysicalProperties.hydrogen
\
constant/thermophysicalProperties
runApplication
$(
getApplication
)
)
if
!
isTest
$@
then
# Clone case for second phase
cloneCase moriyoshiHomogeneous moriyoshiHomogeneousPart2
# Modify and execute
(
cd
moriyoshiHomogeneousPart2
||
exit
# The following 2 command lines are a generic implementation of the
# following command:
# cp -r ../moriyoshiHomogeneous/0.005 .
lastTimeStep
=
$(
foamListTimes
-case
../moriyoshiHomogeneous
-latestTime
)
cp
-r
../moriyoshiHomogeneous/
$lastTimeStep
.
setControlDict
runApplication
$(
getApplication
)
)
# Clone case for hydrogen
cloneCase moriyoshiHomogeneous moriyoshiHomogeneousHydrogen
# Modify and execute
(
cd
moriyoshiHomogeneousHydrogen
||
exit
setCombustionProperties
mv
constant/thermophysicalProperties
\
constant/thermophysicalProperties.propane
mv
constant/thermophysicalProperties.hydrogen
\
constant/thermophysicalProperties
runApplication
$(
getApplication
)
)
fi
#------------------------------------------------------------------------------
tutorials/combustion/chemFoam/gri/Allrun
View file @
e3c4696a
...
...
@@ -9,6 +9,9 @@ runApplication chemkinToFoam \
runApplication
$(
getApplication
)
(
cd
validation
&&
./Allrun
$*
)
if
!
isTest
$@
then
(
cd
validation
&&
./Allrun
$*
)
fi
#------------------------------------------------------------------------------
tutorials/combustion/chemFoam/h2/Allrun
View file @
e3c4696a
...
...
@@ -4,6 +4,9 @@ cd ${0%/*} || exit 1 # Run from this directory
runApplication
$(
getApplication
)
(
cd
validation
&&
./Allrun
$*
)
if
!
isTest
$@
then
(
cd
validation
&&
./Allrun
$*
)
fi
#------------------------------------------------------------------------------
tutorials/combustion/chemFoam/ic8h18/Allrun
View file @
e3c4696a
...
...
@@ -4,6 +4,9 @@ cd ${0%/*} || exit 1 # Run from this directory
runApplication
$(
getApplication
)
(
cd
validation
&&
./Allrun
$*
)
if
!
isTest
$@
then
(
cd
validation
&&
./Allrun
$*
)
fi
#------------------------------------------------------------------------------
tutorials/combustion/chemFoam/ic8h18_TDAC/Allrun
View file @
e3c4696a
...
...
@@ -4,6 +4,9 @@ cd ${0%/*} || exit 1 # Run from this directory
runApplication
$(
getApplication
)
(
cd
validation
&&
./Allrun
$*
)
if
!
isTest
$@
then
(
cd
validation
&&
./Allrun
$*
)
fi
#------------------------------------------------------------------------------
tutorials/combustion/chemFoam/nc7h16/Allrun
View file @
e3c4696a
...
...
@@ -4,6 +4,9 @@ cd ${0%/*} || exit 1 # Run from this directory
runApplication
$(
getApplication
)
(
cd
validation
&&
./Allrun
$*
)
if
!
isTest
$@
then
(
cd
validation
&&
./Allrun
$*
)
fi
#------------------------------------------------------------------------------
tutorials/combustion/fireFoam/LES/compartmentFire/Allrun
View file @
e3c4696a
...
...
@@ -21,6 +21,9 @@ runParallel $(getApplication)
paraFoam
-touch
paraFoam
-touch
-region
panelRegion
(
cd
validation
&&
./createGraphs
)
if
!
isTest
$@
then
(
cd
validation
&&
./createGraphs
)
fi
#------------------------------------------------------------------------------
tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/Allrun
View file @
e3c4696a
...
...
@@ -5,8 +5,7 @@ cd ${0%/*} || exit 1 # Run from this directory
# Application name
application
=
$(
getApplication
)
rm
-f
0
cp
-r
0.orig 0
restore0Dir
runApplication chemkinToFoam
\
chemkin/grimech30.dat chemkin/thermo30.dat chemkin/transportProperties
\
...
...
@@ -15,20 +14,27 @@ runApplication chemkinToFoam \
runApplication blockMesh
runApplication setFields
if
isTest
$@
then
# Test without chemistry
foamDictionary
-entry
"chemistry"
-set
"off"
constant/chemistryProperties
runApplication
$application
else
# Run the application without chemistry until 1500 to let the flow field
# develop
foamDictionary
-entry
"writeInterval"
-set
"1500"
system/controlDict
foamDictionary
-entry
"endTime"
-set
"1500"
system/controlDict
foamDictionary
-entry
"chemistry"
-set
"off"
constant/chemistryProperties
# Run the application without chemistry until 1500 to let the flow field develop
foamDictionary
-entry
"writeInterval"
-set
"1500"
system/controlDict
foamDictionary
-entry
"endTime"
-set
"1500"
system/controlDict
foamDictionary
-entry
"chemistry"
-set
"off"
constant/chemistryProperties
runApplication
$application
runApplication
$application
# Run with chemistry until flame reach its full size
foamDictionary
-entry
"writeInterval"
-set
"100"
system/controlDict
foamDictionary
-entry
"endTime"
-set
"5000"
system/controlDict
foamDictionary
-entry
"chemistry"
-set
"on"
constant/chemistryProperties
# Run with chemistry until flame reach its full size
foamDictionary
-entry
"writeInterval"
-set
"100"
system/controlDict
foamDictionary
-entry
"endTime"
-set
"5000"
system/controlDict
foamDictionary
-entry
"chemistry"
-set
"on"
constant/chemistryProperties
runApplication
-o
$application
runApplication
-o
$application
fi
#------------------------------------------------------------------------------
tutorials/compressible/overRhoSimpleFoam/hotCylinder/Allrun
View file @
e3c4696a
...
...
@@ -5,4 +5,4 @@
(
cd
cylinderMesh
&&
./Allrun.pre
)
# Add background mesh
(
cd
cylinderAndBackground
&&
./Allrun
)
(
cd
cylinderAndBackground
&&
./Allrun
$*
)
tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/Allrun
View file @
e3c4696a
...
...
@@ -29,20 +29,23 @@ run resolved
# Run with the plenum modelled by a boundary condition
run modelled
# Plot a comparison of the pressure in the neck
cat
<<
EOF
| gnuplot -persist
if
!
isTest
$@
then
# Plot a comparison of the pressure in the neck
cat
<<
EOF
| gnuplot -persist
set terminal postscript eps size 5,4 enhanced color
set terminal postscript eps size 5,4 enhanced color
set xlabel "Time (s)"
set ylabel "Guage pressure in the neck (Pa)"
set xlabel "Time (s)"
set ylabel "Guage pressure in the neck (Pa)"
set output "pressure.eps"
set output "pressure.eps"
plot
\
"resolved/postProcessing/probes/0/p" us 1:(
\$
4-1e5) t "Resolved Plenum" w l,
\
"modelled/postProcessing/probes/0/p" us 1:(
\$
4-1e5) t "Modelled Plenum" w l
plot
\
"resolved/postProcessing/probes/0/p" us 1:(
\$
4-1e5) t "Resolved Plenum" w l,
\
"modelled/postProcessing/probes/0/p" us 1:(
\$
4-1e5) t "Modelled Plenum" w l
EOF
fi
#------------------------------------------------------------------------------
tutorials/compressible/sonicLiquidFoam/Allrun
View file @
e3c4696a
...
...
@@ -26,18 +26,21 @@ setDecompressionTankFine()
# Do decompressionTank
(
cd
decompressionTank
&&
foamRunTutorials
)
# Clone case
cloneCase decompressionTank decompressionTankFine
(
cd
decompressionTankFine
||
exit
# Modify case
setDecompressionTankFine
# And execute
runApplication blockMesh
runApplication
$(
getApplication
)
)
if
!
isTest
$@
then
# Clone case
cloneCase decompressionTank decompressionTankFine
(
cd
decompressionTankFine
||
exit
# Modify case
setDecompressionTankFine
# And execute
runApplication blockMesh
runApplication
$(
getApplication
)
)
fi
#------------------------------------------------------------------------------
tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/Allrun
View file @
e3c4696a
...
...
@@ -6,6 +6,9 @@ runApplication blockMesh
runApplication
$(
getApplication
)
runApplication
-s
sample postProcess
-latestTime
-func
sample
runApplication validation/createGraphs
if
!
istest
$@
then
runApplication validation/createGraphs
fi
#------------------------------------------------------------------------------
tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/Allrun
View file @
e3c4696a
...
...
@@ -32,37 +32,39 @@ do
rm
-rf
logs
done
# create validation plot
# Test if gnuplot exists on the system
command
-v
gnuplot
>
/dev/null 2>&1
||
{
echo
"gnuplot not found - skipping graph creation"
1>&2
exit
1
}
graphName
=
"OF_vs_ANALYTICAL.eps"
echo
"Creating graph of u+ vs y+ to
$graphName
"
gnuplot
<<
EOF
set terminal postscript eps color enhanced
set output "
$graphName
"
set grid
set xlabel "y+"
set ylabel "u+"
set key top left
set size 0.75, 0.75
set parametric
# u+ range
set trange [0:35]
# Spaldings law
k=0.41
E=9.8
f(t) = t + 1/E*(exp(k*t) - 1 - k*t*(1 + 0.5*k*t) - 1/6*k*t**3)
set logscale x
set format x "10^{%T}"
plot f(t),t title "Spalding" with lines linetype -1,
\
"yPlus_vs_uPlus" title "OpenFOAM" with points lt 1 pt 6
if
!
isTest
$@
then
# create validation plot
# Test if gnuplot exists on the system
command
-v
gnuplot
>
/dev/null 2>&1
||
{
echo
"gnuplot not found - skipping graph creation"
1>&2
exit
1
}
graphName
=
"OF_vs_ANALYTICAL.eps"
echo
"Creating graph of u+ vs y+ to
$graphName
"
gnuplot
<<
EOF
set terminal postscript eps color enhanced
set output "
$graphName
"
set grid
set xlabel "y+"
set ylabel "u+"
set key top left
set size 0.75, 0.75
set parametric
# u+ range
set trange [0:35]
# Spaldings law
k=0.41
E=9.8
f(t) = t + 1/E*(exp(k*t) - 1 - k*t*(1 + 0.5*k*t) - 1/6*k*t**3)
set logscale x
set format x "10^{%T}"
plot f(t),t title "Spalding" with lines linetype -1,
\
"yPlus_vs_uPlus" title "OpenFOAM" with points lt 1 pt 6
EOF
fi
echo
Done
...
...
tutorials/incompressible/overPimpleDyMFoam/cylinder/Allrun
View file @
e3c4696a
...
...
@@ -6,6 +6,6 @@ cd ${0%/*} || exit 1 # Run from this directory
(
cd
cylinderMesh
&&
./Allrun.pre
)
# Add background mesh
(
cd
cylinderAndBackground
&&
./Allrun
)
(
cd
cylinderAndBackground
&&
./Allrun
$*
)
#------------------------------------------------------------------------------
tutorials/incompressible/pimpleFoam/LES/vortexShed/Allrun
View file @
e3c4696a
...
...
@@ -15,7 +15,12 @@ runParallel $(getApplication)
# Run noise tool for both point and surface
runParallel
-s
point noise
-dict
system/noiseDict-point
if
!
isTest
$@
then
runParallel
-s
point noise
-dict
system/noiseDict-point
runParallel
-s
surface noise
-dict
system/noiseDict-surface
fi
runParallel
-s
surface noise
-dict
system/noiseDict-surface
#------------------------------------------------------------------------------
tutorials/incompressible/pimpleFoam/LES/vortexShed/Alltest
deleted
100755 → 0
View file @
40985d29
#!/bin/sh
cd
${
0
%/*
}
||
exit
1
# Run from this directory
.
$WM_PROJECT_DIR
/bin/tools/RunFunctions
# Tutorial run functions
rm
-f
system/blockMeshDict
m4 system/blockMeshDict.m4
>
system/blockMeshDict
runApplication blockMesh
restore0Dir
runApplication decomposePar
runParallel
$(
getApplication
)
# Note: not running the noise utility since no pressure data will be generated
#------------------------------------------------------------------------------
tutorials/multiphase/interFoam/RAS/damBreak/Allrun
View file @
e3c4696a
...
...
@@ -24,21 +24,25 @@ setDamBreakFine ()
# Do damBreak
(
cd
damBreak
&&
foamRunTutorials
)
# Clone case
cloneCase damBreak damBreakFine
(
cd
damBreakFine
||
exit
if
!
isTest
$@
then
# Clone case
cloneCase damBreak damBreakFine
# Modify case
setDamBreakFine
\c
p ../damBreak/0/alpha.water.orig 0/alpha.water
# And execute
runApplication blockMesh
runApplication setFields
runApplication decomposePar
runParallel
$(
getApplication
)
runApplication reconstructPar
)
(
cd
damBreakFine
||
exit
# Modify case
setDamBreakFine
\c
p ../damBreak/0/alpha.water.orig 0/alpha.water
# And execute
runApplication blockMesh
runApplication setFields
runApplication decomposePar
runParallel
$(
getApplication
)
runApplication reconstructPar
)
fi
#------------------------------------------------------------------------------
Prev
1
2
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment