Merge branch 'develop' of develop.openfoam.com:Development/OpenFOAM-plus into develop

Conflicts:
	tutorials/combustion/fireFoam/LES/compartmentFire/Allclean
This commit is contained in:
sergio
2016-11-21 07:39:46 -08:00
364 changed files with 1570 additions and 1972 deletions

View File

@ -4,12 +4,9 @@ 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 boxTurb
runApplication $application
runApplication $(getApplication)
runApplication -s enstrophy postProcess -func enstrophy
#------------------------------------------------------------------------------

View File

@ -5,7 +5,6 @@ cd ${0%/*} || exit 1 # Run from this directory
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
cleanCase
rm -rf EnSight Ensight Fieldview > /dev/null 2>&1
rm -f constant/polyMesh/boundary > /dev/null 2>&1
rm -rf Fieldview > /dev/null 2>&1
#------------------------------------------------------------------------------

View File

@ -4,9 +4,6 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
# Get application name
application=$(getApplication)
runAnsysToFoam()
{
if [ -f log.ansysToFoam ]
@ -19,7 +16,7 @@ runAnsysToFoam()
}
runAnsysToFoam flange.ans 0.001
runApplication $application
runApplication $(getApplication)
runApplication foamToEnsight -noZero
runApplication foamToEnsightParts -noZero
runApplication foamToVTK

View File

@ -4,8 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
\rm -rf 0 > /dev/null 2>&1
cleanCase
rm -rf 0
#------------------------------------------------------------------------------

View File

@ -4,11 +4,9 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
application=$(getApplication)
restore0Dir
runApplication blockMesh
runApplication $application -withFunctionObjects -writePhi -writep
runApplication $(getApplication) -withFunctionObjects -writePhi -writep
runApplication streamFunction
#------------------------------------------------------------------------------

View File

@ -4,8 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
rm -rf 0 > /dev/null 2>&1
cleanCase
rm -rf 0
#------------------------------------------------------------------------------

View File

@ -4,11 +4,9 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
application=$(getApplication)
restore0Dir
runApplication blockMesh
runApplication $application -writePhi -writep
runApplication $(getApplication) -writePhi -writep
runApplication streamFunction
#------------------------------------------------------------------------------

View File

@ -3,14 +3,10 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
cleanCase
rm -rf 0
rm -rf VTK
rm -rf 0
rm -rf constant/polyMesh/sets constant/polyMesh/faces
rm -rf constant/polyMesh/faces
rm -rf constant/polyMesh/points
rm -rf constant/polyMesh/owner
rm -rf constant/polyMesh/neighbour
#------------------------------------------------------------------------------

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
@ -12,7 +11,6 @@ runApplication topoSet
runApplication PDRMesh -overwrite
# Run
runApplication $(getApplication)
#------------------------------------------------------------------------------

View File

@ -0,0 +1,10 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
cleanCase
rm -rf 0
#------------------------------------------------------------------------------

View File

@ -1,7 +1,7 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
cd ${0%/*} || exit 1
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
./Allrun.mesh
@ -15,3 +15,5 @@ runParallel potentialFoam -pName pPotential -initialiseUBCs
\rm -f processor*/0/phi
runParallel XiDyMFoam
#------------------------------------------------------------------------------

View File

@ -1,11 +1,9 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
cd ${0%/*} || exit 1
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
rm -f log.* constant/polyMesh/*Level
runApplication blockMesh
runApplication -s cyclic \
@ -21,3 +19,5 @@ runApplication -s ami \
runApplication transformPoints -scale '(0.01 0.01 0.01)'
runApplication mergeOrSplitBaffles -split -overwrite
#------------------------------------------------------------------------------

View File

@ -1,12 +1,13 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
cleanCase
rm -rf 0
rm -rf 0 chemFoam.out constant/reactions constant/thermo \
rm -rf chemFoam.out constant/reactions constant/thermo \
validation/OF_vs_CHEMKINII.eps validation/chemkinII
#------------------------------------------------------------------------------

View File

@ -4,14 +4,12 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
# Set application name
application=$(getApplication)
runApplication chemkinToFoam \
chemkin/chem.inp chemkin/therm.dat chemkin/transportProperties \
constant/reactions constant/thermo
runApplication $application
runApplication $(getApplication)
(cd validation && ./Allrun $*)

View File

@ -1,5 +1,4 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
# Extract Chemkin II data into a friendlier format
@ -10,5 +9,3 @@ grep '^ Time (sec)' ../chemkin/senk.out | awk '{print $4 " " $8 }' \
./createGraph
#------------------------------------------------------------------------------

View File

@ -1,12 +1,12 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
cleanCase
rm -rf 0
rm -rf 0 chemFoam.out validation/OF_vs_CHEMKINII.eps validation/chemkinII
rm -rf chemFoam.out validation/OF_vs_CHEMKINII.eps validation/chemkinII
#------------------------------------------------------------------------------

View File

@ -4,10 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
# Set application name
application=$(getApplication)
runApplication $application
runApplication $(getApplication)
(cd validation && ./Allrun $*)

View File

@ -1,5 +1,4 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
# Extract Chemkin II data into a friendlier format
@ -10,5 +9,3 @@ grep '^ Time (sec)' ../chemkin/senk.out | awk '{print $4 " " $8 }' \
./createGraph
#------------------------------------------------------------------------------

View File

@ -1,12 +1,12 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
cleanCase
rm -rf 0
rm -rf 0 chemFoam.out validation/OF_vs_CHEMKINII.eps validation/chemkinII
rm -rf chemFoam.out validation/OF_vs_CHEMKINII.eps validation/chemkinII
#------------------------------------------------------------------------------

View File

@ -4,10 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
# Set application name
application=$(getApplication)
runApplication $application
runApplication $(getApplication)
(cd validation && ./Allrun $*)

View File

@ -1,5 +1,4 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
# Extract Chemkin II data into a friendlier format
@ -10,5 +9,3 @@ grep '^ Time (sec)' ../chemkin/senk.out | awk '{print $4 " " $8 }' \
./createGraph
#------------------------------------------------------------------------------

View File

@ -1,11 +1,12 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
cleanCase
rm -rf 0
rm -rf 0 chemFoam.out validation/OF_vs_CHEMKINII.eps validation/chemkinII
rm -rf chemFoam.out validation/OF_vs_CHEMKINII.eps validation/chemkinII
#------------------------------------------------------------------------------

View File

@ -4,10 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
# Set application name
application=`getApplication`
runApplication $application
runApplication $(getApplication)
(cd validation && ./Allrun $*)

View File

@ -1,5 +1,4 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
# Extract Chemkin II data into a friendlier format
@ -10,5 +9,3 @@ grep '^ Time (sec)' ../chemkin/senk.out | awk '{print $4 " " $8 }' \
./createGraph
#------------------------------------------------------------------------------

View File

@ -21,5 +21,4 @@ gnuplot<<EOF
"chemkinII" with lines title "Chemkin II" lt -1
EOF
# ----------------------------------------------------------------- end-of-file
# -----------------------------------------------------------------------------

View File

@ -1,12 +1,12 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
cleanCase
rm -rf 0
rm -rf 0 chemFoam.out validation/OF_vs_CHEMKINII.eps validation/chemkinII
rm -rf chemFoam.out validation/OF_vs_CHEMKINII.eps validation/chemkinII
#------------------------------------------------------------------------------

View File

@ -4,10 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
# Set application name
application=$(getApplication)
runApplication $application
runApplication $(getApplication)
(cd validation && ./Allrun $*)

View File

@ -1,5 +1,4 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
# Extract Chemkin II data into a friendlier format
@ -10,5 +9,3 @@ grep '^ Time (sec)' ../chemkin/senk.out | awk '{print $4 " " $8 }' \
./createGraph
#------------------------------------------------------------------------------

View File

@ -5,11 +5,10 @@ cd ${0%/*} || exit 1 # Run from this directory
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
mv ./-180 temp180
cleanCase
rm -rf 0 > /dev/null 2>&1
rm -f constant/polyMesh/boundary > /dev/null 2>&1
cleanCase
rm -rf 0
mv temp180 ./-180
#------------------------------------------------------------------------------
#------------------------------------------------------------------------------

View File

@ -4,11 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
# Get application name
application=$(getApplication)
runApplication kivaToFoam -file otape17
runApplication $application
runApplication $(getApplication)
#------------------------------------------------------------------------------

View File

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

View File

@ -1,5 +1,5 @@
#!/bin/sh
cd ${0%/*} || exit 1 # run from this directory
cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
@ -23,6 +23,6 @@ runParallel $(getApplication)
paraFoam -touch
paraFoam -touch -region panelRegion
(cd validation && ./crateGraphs)
(cd validation && ./createGraphs)
# -----------------------------------------------------------------------------

View File

@ -7,8 +7,7 @@ cd ${0%/*} || exit 1 # Run from this directory
cleanCase
rm -f 0/ph_rgh
rm -f 0/polyMesh/cellMap
rm -rf constant/panelRegion/polyMesh
rm -f 0/polyMesh/cellMap
rm -f constant/polyMesh/boundary
#------------------------------------------------------------------------------

View File

@ -4,9 +4,6 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
# Set application name
application=$(getApplication)
runApplication blockMesh
runApplication -s cRefine \

View File

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

View File

@ -1,16 +1,12 @@
#!/bin/sh
cd ${0%/*} || exit 1 # run from this directory
cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
runApplication blockMesh
runApplication topoSet
runApplication extrudeToRegionMesh -overwrite
# Run
runApplication $(getApplication)
paraFoam -touchAll

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
@ -11,7 +10,6 @@ runApplication createPatch -overwrite
cp 0/ph_rgh.orig 0/ph_rgh
# Run
runApplication $(getApplication)
#------------------------------------------------------------------------------

View File

@ -1,11 +1,9 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
# Set application name
application=$(getApplication)
runApplication blockMesh
runApplication topoSet
runApplication createPatch -overwrite
@ -13,8 +11,6 @@ runApplication createPatch -overwrite
cp 0/ph_rgh.orig 0/ph_rgh
runApplication decomposePar -force
# Run
runParallel $application
runParallel $(getApplication)
#------------------------------------------------------------------------------

View File

@ -6,6 +6,5 @@ cd ${0%/*} || exit 1 # Run from this directory
cleanCase
cleanSamples
rm -rf constant/polyMesh/boundary
#------------------------------------------------------------------------------

View File

@ -4,10 +4,8 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
# Remove 0 directory - recreated from 0.orig
\rm -rf 0
cleanCase
cleanSamples
rm -rf 0
#------------------------------------------------------------------------------

View File

@ -4,9 +4,9 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
rm -rf 0 > /dev/null 2>&1
cleanCase
rm -rf 0
rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1
cleanCase
#------------------------------------------------------------------------------

View File

@ -9,7 +9,7 @@ runApplication surfaceFeatureExtract
runApplication blockMesh
runApplication snappyHexMesh -overwrite
\rm -rf 0
rm -rf 0
runApplication createBaffles -overwrite
runApplication mergeOrSplitBaffles -split -overwrite

View File

@ -1,10 +1,12 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
m4 system/blockMeshDict.m4 > system/blockMeshDict
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
m4 system/blockMeshDict.m4 > system/blockMeshDict
runApplication blockMesh
runApplication $(getApplication)
#------------------------------------------------------------------------------

View File

@ -1,10 +1,12 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
m4 system/blockMeshDict.m4 > system/blockMeshDict
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
m4 system/blockMeshDict.m4 > system/blockMeshDict
runApplication blockMesh
runApplication $(getApplication)
#------------------------------------------------------------------------------

View File

@ -1,9 +1,10 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
application=$(getApplication)
./makeMesh
runApplication $application
runApplication $(getApplication)
#------------------------------------------------------------------------------

View File

@ -1,5 +1,7 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
cleanCase
@ -7,3 +9,5 @@ cleanCase
(cd system && rm -f blockMeshDict.caseBlocks blockMeshDict.caseBoundary)
rm -rf resolved modelled pressure.eps
#------------------------------------------------------------------------------

View File

@ -1,9 +1,10 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
cd ${0%/*} || exit 1
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
# Run function links the appropriate mesh files and clones the case
run()
{
@ -45,3 +46,5 @@ plot \
"modelled/postProcessing/probes/0/p" us 1:(\$4-1e5) t "Modelled Plenum" w l
EOF
#------------------------------------------------------------------------------

View File

@ -6,5 +6,4 @@ cd ${0%/*} || exit 1 # Run from this directory
cleanCase
#------------------------------------------------------------------------------

View File

@ -6,3 +6,5 @@ cd ${0%/*} || exit 1 # Run from this directory
runApplication blockMesh
runApplication $(getApplication)
#------------------------------------------------------------------------------

View File

@ -4,9 +4,9 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
cleanCase
# Remove copies of common files
\rm -rf 0 constant
cleanCase
#------------------------------------------------------------------------------

View File

@ -4,9 +4,9 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
cleanCase
# Remove copies of common files
\rm -rf 0 constant
cleanCase
#------------------------------------------------------------------------------

View File

@ -1,14 +1,12 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
m4 system/blockMeshDict.m4 > system/blockMeshDict
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
application=$(getApplication)
m4 system/blockMeshDict.m4 > system/blockMeshDict
runApplication blockMesh
runApplication $application
runApplication $(getApplication)
#------------------------------------------------------------------------------

View File

@ -5,7 +5,6 @@ cd ${0%/*} || exit 1 # Run from this directory
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
cleanCase
rm -f constant/polyMesh/boundary > /dev/null 2>&1
# Don't need these extra files (from star4ToFoam conversion)
rm -f \

View File

@ -4,10 +4,8 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
# Remove 0.orig/ copy
\rm -rf 0
cleanCase
cleanSamples
rm -rf 0
#------------------------------------------------------------------------------

View File

@ -4,12 +4,10 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
application=$(getApplication)
restore0Dir
runApplication blockMesh
runApplication setFields
runApplication $application
runApplication $(getApplication)
runApplication -s sample postProcess -func sample
#------------------------------------------------------------------------------

View File

@ -10,5 +10,4 @@ runParallel dsmcInitialise
runParallel $(getApplication)
runApplication reconstructPar -noLagrangian
#------------------------------------------------------------------------------

View File

@ -4,11 +4,11 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
cleanCase
rm -rf 0/lagrangian 0/uniform
rm -f Ar-Ar
rm -f electrostatic
rm -f constant/idList
rm -rf constant/polyMesh/sets
cleanCase
#------------------------------------------------------------------------------

View File

@ -4,11 +4,11 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
cleanCase
rm -rf 0/lagrangian 0/uniform
rm -f O-O
rm -f electrostatic
rm -f constant/idList
rm -rf constant/polyMesh/sets
cleanCase
#------------------------------------------------------------------------------

View File

@ -4,8 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
rm -rf constant/polyMesh/sets
rm -rf processor[0-9]
cleanCase
rm -rf processor[0-9]
#------------------------------------------------------------------------------

View File

@ -1,18 +1,14 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
application=$(getApplication)
runApplication blockMesh
runApplication decomposePar
runParallel mdInitialise
runParallel $application
runParallel $(getApplication)
runApplication reconstructPar

View File

@ -4,11 +4,8 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
# Set application name
application=$(getApplication)
runApplication blockMesh
runApplication $application
runApplication $(getApplication)
runApplication -s sample postProcess -func sample
#------------------------------------------------------------------------------

View File

@ -4,11 +4,9 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
application=$(getApplication)
runApplication blockMesh
\cp 0/T.orig 0/T
runApplication setFields
runApplication $application
runApplication $(getApplication)
#------------------------------------------------------------------------------

View File

@ -4,11 +4,9 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
application=$(getApplication)
runApplication blockMesh
\cp 0/T.orig 0/T
runApplication setFields
runApplication $application
runApplication $(getApplication)
#------------------------------------------------------------------------------

View File

@ -30,10 +30,10 @@ boundaryField
{
type lumpedMassWallTemperature;
kappaMethod fluidThermo;
kappaName none;
kappa none;
mass 1000;
Cp 4100;
value uniform 300.0;
value uniform 300;
}
fixedWalls
@ -42,4 +42,5 @@ boundaryField
}
}
// ************************************************************************* //

View File

@ -1,45 +0,0 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: plus |
| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class volScalarField;
object T;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [0 0 0 1 0 0 0];
internalField uniform 300;
boundaryField
{
floor
{
type fixedValue;
value uniform 300;
}
ceiling
{
type lumpedMassWallTemperature;
kappaMethod fluidThermo;
kappaName none;
mass 1000;
Cp 4100;
value uniform 300.0;
}
fixedWalls
{
type zeroGradient;
}
}
// ************************************************************************* //

View File

@ -5,6 +5,6 @@ cd ${0%/*} || exit 1 # Run from this directory
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
cleanCase
\cp 0/T.orig 0/T
rm -rf 0
#------------------------------------------------------------------------------

View File

@ -4,11 +4,11 @@ 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
restore0Dir
runApplication setFields
runApplication $application
runApplication $(getApplication)
#------------------------------------------------------------------------------

View File

@ -4,10 +4,7 @@ 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 $application
runApplication $(getApplication)
#------------------------------------------------------------------------------

View File

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

View File

@ -4,11 +4,8 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
# Set application name
application=$(getApplication)
runApplication blockMesh
runApplication $application
runApplication $(getApplication)
runApplication -s sample postProcess -latestTime -func sample
( cd validation && ./createGraphs )

View File

@ -5,8 +5,8 @@ cd ${0%/*} || exit 1 # Run from this directory
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
cleanCase
rm -rf constant/baffle3DRegion
rm -rf constant/polyMesh/boundary
rm -rf 0
rm -rf constant/baffle3DRegion
#------------------------------------------------------------------------------

View File

@ -1,8 +1,8 @@
#!/bin/sh
. $WM_PROJECT_DIR/bin/tools/RunFunctions
cd ${0%/*} || exit 1 # Run from this directory
# Get application name
application=$(getApplication)
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
runApplication blockMesh
@ -11,4 +11,6 @@ restore0Dir
# Create 1D and 3D baffles
runApplication createBaffles -overwrite
runApplication $application
runApplication $(getApplication)
#------------------------------------------------------------------------------

View File

@ -4,9 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
application=$(getApplication)
runApplication blockMesh
runApplication $application
runApplication $(getApplication)
#------------------------------------------------------------------------------

View File

@ -4,9 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
application=$(getApplication)
runApplication blockMesh
runApplication $application
runApplication $(getApplication)
#------------------------------------------------------------------------------

View File

@ -5,19 +5,22 @@ cd ${0%/*} || exit 1 # Run from this directory
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
cleanCase
rm -rf comms
rm -rf VTK
rm -rf constant/cellToRegion constant/polyMesh/sets
rm -rf constant/cellToRegion
rm -rf 0/bottomWater
rm -rf 0/topAir
rm -rf 0/heater
rm -rf 0/leftSolid
rm -rf 0/rightSolid
rm -f 0/cellToRegion
rm -rf constant/bottomWater/polyMesh
rm -rf constant/topAir/polyMesh
rm -rf constant/heater/polyMesh
rm -rf constant/leftSolid/polyMesh
rm -rf constant/rightSolid/polyMesh
# ----------------------------------------------------------------- end-of-file
# -----------------------------------------------------------------------------

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
@ -15,6 +14,12 @@ cd ${0%/*} || exit 1 # Run from this directory
# Decompose
runApplication decomposePar -allRegions
## Can verify parallel operation of createExternalCoupledPatchGeometry
# \rm -f log.createExternalCoupledPatchGeometry
# runParallel createExternalCoupledPatchGeometry \
# -regions '(topAir heater)' coupleGroup \
# -commsDir $PWD/comms
# Run OpenFOAM
runParallel $(getApplication) &
@ -24,5 +29,4 @@ runApplication ./externalSolver
# Reconstruct
runApplication reconstructPar -allRegions
# ----------------------------------------------------------------- end-of-file
# -----------------------------------------------------------------------------

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
@ -28,6 +27,6 @@ runApplication createExternalCoupledPatchGeometry \
echo
echo "creating files for paraview post-processing"
echo
paraFoam -touchAll
paraFoam -touchAll 2>/dev/null
# ----------------------------------------------------------------- end-of-file
# -----------------------------------------------------------------------------

View File

@ -10,7 +10,6 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
location "constant/bottomWater";
object thermophysicalProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

View File

@ -20,13 +20,17 @@ fieldName="T"
lockFile="${commsDir}/OpenFOAM.lock"
dataFile="${commsDir}/${regionGroupName}/${patchGroupName}/${fieldName}"
waitSec=1
timeOut=10
nSteps=200 # maximum number of time steps. Note: should be more than
waitSec=5
timeOut=100
nSteps=1000 # maximum number of time steps. Note: should be more than
# number of iterations on the OpenFOAM side
refGrad=0
valueFraction=1
# Remove any old junk
\rm -f $lockFile 2>/dev/null
log()
{
echo "External: $@"
@ -53,7 +57,7 @@ init()
echo "$refValue2 $refGrad $valueFraction" >> "${dataFile}.in"
done
# create lock file to pass control to OF
# Create lock file to pass control to OpenFOAM
touch ${lockFile}
}
@ -61,7 +65,6 @@ init()
# create the comms directory
mkdir -p ${commsDir}/${regionGroupName}/${patchGroupName}
# tutorial case employs the 'initByExternalOption', so we need to provide
# the initial values
init
@ -69,11 +72,24 @@ init
totalWait=0
step=0
while [ $step -lt $nSteps ]; do
if [ -f $lockFile ]; then
log "found lock file ${lockFile} - waiting"
while [ $step -lt $nSteps ]
do
if [ -f $lockFile ]
then
if grep -q "status=done" ${lockFile}
then
log "found lock file ${lockFile} with 'status=done' - finished"
break
elif [ -s $lockFile ]
then
log "found lock file ${lockFile} containing '$(cat $lockFile)' - waiting"
else
log "found lock file ${lockFile} - waiting"
fi
totalWait=$(expr $totalWait + $waitSec)
if [ $totalWait -gt $timeOut ]; then
if [ $totalWait -gt $timeOut ]
then
log "timeout"
break
else
@ -91,7 +107,7 @@ while [ $step -lt $nSteps ]; do
log "updating ${dataFile}.in from ${dataFile}.out"
awk '{if( $1 != "#" ){print $1+1 " 0 1"}}' \
${dataFile}.out | tee ${dataFile}.in
${dataFile}.out >| ${dataFile}.in
log "creating lock file ${lockFile}"
touch ${lockFile}
@ -100,5 +116,7 @@ done
log "done"
# Remove the lock file too
\rm -f $lockFile 2>/dev/null
#------------------------------------------------------------------------------

View File

@ -14,158 +14,154 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dictionaryReplacement
U
{
U
internalField uniform (0.001 0 0);
boundaryField
{
internalField uniform (0.001 0 0);
boundaryField
minX
{
minX
{
type fixedValue;
value uniform (0.001 0 0);
}
type fixedValue;
value uniform (0.001 0 0);
}
maxX
{
type inletOutlet;
inletValue uniform (0 0 0);
}
maxX
{
type inletOutlet;
inletValue uniform (0 0 0);
}
".*"
{
type fixedValue;
value uniform (0 0 0);
}
".*"
{
type fixedValue;
value uniform (0 0 0);
}
}
}
T
T
{
internalField uniform 300;
boundaryField
{
internalField uniform 300;
boundaryField
minX
{
minX
{
type fixedValue;
value uniform 300;
}
type fixedValue;
value uniform 300;
}
maxX
{
type inletOutlet;
inletValue uniform 300;
}
maxX
{
type inletOutlet;
inletValue uniform 300;
}
".*"
{
type zeroGradient;
value uniform 300;
}
".*"
{
type zeroGradient;
value uniform 300;
}
"bottomWater_to_.*"
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
Tnbr T;
kappaMethod fluidThermo;
kappa none;
value uniform 300;
}
"bottomWater_to_.*"
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
Tnbr T;
kappaMethod fluidThermo;
value uniform 300;
}
}
}
epsilon
epsilon
{
internalField uniform 0.01;
boundaryField
{
internalField uniform 0.01;
boundaryField
minX
{
minX
{
type fixedValue;
value uniform 0.01;
}
type fixedValue;
value uniform 0.01;
}
maxX
{
type inletOutlet;
inletValue uniform 0.01;
}
maxX
{
type inletOutlet;
inletValue uniform 0.01;
}
".*"
{
type epsilonWallFunction;
value uniform 0.01;
}
".*"
{
type epsilonWallFunction;
value uniform 0.01;
}
}
}
k
k
{
internalField uniform 0.1;
boundaryField
{
internalField uniform 0.1;
boundaryField
minX
{
minX
{
type inletOutlet;
inletValue uniform 0.1;
}
type inletOutlet;
inletValue uniform 0.1;
}
maxX
{
type zeroGradient;
value uniform 0.1;
}
maxX
{
type zeroGradient;
value uniform 0.1;
}
".*"
{
type kqRWallFunction;
value uniform 0.1;
}
".*"
{
type kqRWallFunction;
value uniform 0.1;
}
}
}
p_rgh
p_rgh
{
internalField uniform 0;
boundaryField
{
internalField uniform 0;
boundaryField
minX
{
minX
{
type zeroGradient;
value uniform 0;
}
type zeroGradient;
value uniform 0;
}
maxX
{
type fixedValue;
value uniform 0;
}
maxX
{
type fixedValue;
value uniform 0;
}
".*"
{
type fixedFluxPressure;
value uniform 0;
}
".*"
{
type fixedFluxPressure;
value uniform 0;
}
}
}
p
p
{
internalField uniform 0;
boundaryField
{
internalField uniform 0;
boundaryField
".*"
{
".*"
{
type calculated;
value uniform 0;
}
type calculated;
value uniform 0;
}
}
}

View File

@ -16,7 +16,7 @@ FoamFile
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// Library defines new boundary conditions
libs ("libOpenFOAM.so" "libjobControl.so");
libs ("libOpenFOAM.so" "libfieldFunctionObjects.so");
application chtMultiRegionFoam;
@ -26,11 +26,12 @@ startTime 0;
stopAt endTime;
endTime 1;
endTime 0.5;
deltaT 0.001;
writeControl adjustableRunTime;
writeInterval 0.1;
purgeWrite 0;
@ -56,40 +57,7 @@ adjustTimeStep yes;
functions
{
externalCoupled
{
// Where to load it from (if not already in solver)
libs ("libfieldFunctionObjects.so");
type externalCoupled;
// Directory to use for communication
commsDir "${FOAM_CASE}/comms";
// Does external process start first
initByExternal true;
// Additional output
log true;
regions
{
// Region name (wildcards allowed)
"(topAir|heater)"
{
// In topAir adjust the minX patch (fixedValue)
// Patch or patchGroup
coupleGroup
{
// Fields to output in commsDir
writeFields (T);
// Fields to read from commsDir
readFields (T);
}
}
}
}
#include "externalCoupled"
}

View File

@ -0,0 +1,43 @@
// -*- C++ -*-
// control for external coupled simulation
externalCoupled
{
// Where to load it from (if not already in solver)
libs ("libfieldFunctionObjects.so");
type externalCoupled;
// Directory to use for communication
commsDir "${FOAM_CASE}/comms";
// Does external process start first
initByExternal true;
// Cleanup behaviour on termination (remove|done)
stateEnd done;
// Additional output
log true;
regions
{
// Region name (wildcards allowed)
"(topAir|heater)"
{
// In topAir adjust the minX patch (fixedValue)
// Patch or patchGroup
coupleGroup
{
// Fields to output in commsDir
writeFields (T);
// Fields to read from commsDir
readFields (T);
}
}
}
}
// ************************************************************************* //

View File

@ -14,62 +14,56 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dictionaryReplacement
boundary
{
boundary
minY
{
type patch;
inGroups (coupleGroup);
}
minZ
{
type patch;
}
maxZ
{
type patch;
}
}
T
{
internalField uniform 300;
boundaryField
{
".*"
{
type zeroGradient;
value uniform 300;
}
"heater_to_.*"
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
Tnbr T;
kappaMethod solidThermo;
value uniform 300;
}
heater_to_leftSolid
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
Tnbr T;
kappaMethod solidThermo;
thicknessLayers (1e-3);
kappaLayers (5e-4);
value uniform 300;
}
minY
{
type patch;
inGroups (coupleGroup);
}
minZ
{
type patch;
}
maxZ
{
type patch;
}
}
T
{
internalField uniform 300;
boundaryField
{
".*"
{
type zeroGradient;
value uniform 300;
}
"heater_to_.*"
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
Tnbr T;
kappaMethod solidThermo;
kappa none;
value uniform 300;
}
heater_to_leftSolid
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
Tnbr T;
kappaMethod solidThermo;
kappa none;
thicknessLayers (1e-3);
kappaLayers (5e-4);
value uniform 300;
}
minY
{
type fixedValue;
value uniform 500;
}
type fixedValue;
value uniform 500;
}
}
}

View File

@ -14,50 +14,45 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dictionaryReplacement
boundary
{
boundary
minZ
{
minZ
{
type patch;
}
maxZ
{
type patch;
}
type patch;
}
T
maxZ
{
internalField uniform 300;
type patch;
}
}
boundaryField
T
{
internalField uniform 300;
boundaryField
{
".*"
{
".*"
{
type zeroGradient;
value uniform 300;
}
"leftSolid_to_.*"
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
Tnbr T;
kappaMethod solidThermo;
kappa none;
value uniform 300;
}
type zeroGradient;
value uniform 300;
}
"leftSolid_to_.*"
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
Tnbr T;
kappaMethod solidThermo;
value uniform 300;
}
leftSolid_to_heater
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
Tnbr T;
kappaMethod solidThermo;
kappa none;
thicknessLayers (1e-3);
kappaLayers (5e-4);
value uniform 300;
}
leftSolid_to_heater
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
Tnbr T;
kappaMethod solidThermo;
thicknessLayers (1e-3);
kappaLayers (5e-4);
value uniform 300;
}
}
}

View File

@ -14,39 +14,35 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dictionaryReplacement
boundary
{
boundary
minZ
{
minZ
{
type patch;
}
maxZ
{
type patch;
}
type patch;
}
T
maxZ
{
internalField uniform 300;
type patch;
}
}
boundaryField
T
{
internalField uniform 300;
boundaryField
{
".*"
{
".*"
{
type zeroGradient;
value uniform 300;
}
"rightSolid_to_.*"
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
Tnbr T;
kappaMethod solidThermo;
kappa none;
value uniform 300;
}
type zeroGradient;
value uniform 300;
}
"rightSolid_to_.*"
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
Tnbr T;
kappaMethod solidThermo;
value uniform 300;
}
}
}

View File

@ -14,164 +14,160 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dictionaryReplacement
boundary
{
boundary
minX
{
inGroups (coupleGroup);
}
}
U
{
internalField uniform (0.1 0 0);
boundaryField
{
".*"
{
type fixedValue;
value uniform (0 0 0);
}
minX
{
inGroups (coupleGroup);
type fixedValue;
value uniform ( 0.1 0 0 );
}
maxX
{
type inletOutlet;
inletValue uniform ( 0 0 0 );
value uniform ( 0.1 0 0 );
}
}
}
U
T
{
internalField uniform 300;
boundaryField
{
internalField uniform (0.1 0 0);
boundaryField
".*"
{
".*"
{
type fixedValue;
value uniform (0 0 0);
}
minX
{
type fixedValue;
value uniform ( 0.1 0 0 );
}
maxX
{
type inletOutlet;
inletValue uniform ( 0 0 0 );
value uniform ( 0.1 0 0 );
}
type zeroGradient;
}
minX
{
type fixedValue;
value uniform 300;
}
maxX
{
type inletOutlet;
inletValue uniform 300;
value uniform 300;
}
"topAir_to_.*"
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
Tnbr T;
kappaMethod fluidThermo;
value uniform 300;
}
}
}
T
epsilon
{
internalField uniform 0.01;
boundaryField
{
internalField uniform 300;
boundaryField
".*"
{
".*"
{
type zeroGradient;
}
type epsilonWallFunction;
value uniform 0.01;
}
minX
{
type fixedValue;
value uniform 300;
}
maxX
{
type inletOutlet;
inletValue uniform 300;
value uniform 300;
}
"topAir_to_.*"
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
Tnbr T;
kappaMethod fluidThermo;
kappa none;
value uniform 300;
}
minX
{
type fixedValue;
value uniform 0.01;
}
maxX
{
type inletOutlet;
inletValue uniform 0.01;
value uniform 0.01;
}
}
}
epsilon
k
{
internalField uniform 0.1;
boundaryField
{
internalField uniform 0.01;
boundaryField
".*"
{
".*"
{
type epsilonWallFunction;
value uniform 0.01;
}
type kqRWallFunction;
value uniform 0.1;
}
minX
{
type fixedValue;
value uniform 0.01;
}
maxX
{
type inletOutlet;
inletValue uniform 0.01;
value uniform 0.01;
}
minX
{
type fixedValue;
value uniform 0.1;
}
maxX
{
type inletOutlet;
inletValue uniform 0.1;
value uniform 0.1;
}
}
}
k
p_rgh
{
internalField uniform 1e5;
boundaryField
{
internalField uniform 0.1;
boundaryField
".*"
{
".*"
{
type kqRWallFunction;
value uniform 0.1;
}
type fixedFluxPressure;
value uniform 1e5;
}
minX
{
type fixedValue;
value uniform 0.1;
}
maxX
{
type inletOutlet;
inletValue uniform 0.1;
value uniform 0.1;
}
maxX
{
type fixedValue;
value uniform 1e5;
}
}
}
p_rgh
p
{
internalField uniform 1e5;
boundaryField
{
internalField uniform 1e5;
boundaryField
".*"
{
".*"
{
type fixedFluxPressure;
value uniform 1e5;
}
maxX
{
type fixedValue;
value uniform 1e5;
}
type calculated;
value uniform 1e5;
}
}
p
{
internalField uniform 1e5;
boundaryField
maxX
{
".*"
{
type calculated;
value uniform 1e5;
}
maxX
{
type calculated;
value uniform 1e5;
}
type calculated;
value uniform 1e5;
}
}
}

View File

@ -1,5 +1,5 @@
#!/bin/sh
cd ${0%/*} || exit 1 # run from this directory
cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
@ -7,7 +7,7 @@ cd ${0%/*} || exit 1 # run from this directory
cleanCase
rm -rf VTK
rm -rf constant/cellToRegion constant/polyMesh/sets
rm -rf constant/cellToRegion
rm -rf constant/air/polyMesh
rm -rf constant/solid/polyMesh
@ -28,6 +28,4 @@ rm -f 0/floor/cellToRegion
rm -f 0/solid/cellToRegion
rm -f 0/cellToRegion
# ----------------------------------------------------------------- end-of-file
#------------------------------------------------------------------------------

Some files were not shown because too many files have changed in this diff Show More