tutorials: Removed 0.orig directories in favor of <field>.orig

The new automated <field>.orig reading has made 0.orig directories and
associated scripting redundant.
This commit is contained in:
Henry Weller
2018-02-15 20:14:27 +00:00
parent df6e2da2dd
commit 9221dd0d0f
211 changed files with 326 additions and 13180 deletions

View File

@ -78,7 +78,7 @@ cleanCase()
rm -rf VTK > /dev/null 2>&1 rm -rf VTK > /dev/null 2>&1
rm -rf sequencedVTK > /dev/null 2>&1 rm -rf sequencedVTK > /dev/null 2>&1
rm -f 0/cellLevel 0/pointLevel 0/cellDist constant/cellDecomposition rm -f 0/polyMesh 0/cellLevel 0/pointLevel 0/cellDist constant/cellDecomposition
if [ -e system/blockMeshDict.m4 ] if [ -e system/blockMeshDict.m4 ]
then then

View File

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

View File

@ -6,7 +6,6 @@ cd ${0%/*} || exit 1 # Run from this directory
application=`getApplication` application=`getApplication`
cp -r 0.orig 0 > /dev/null 2>&1
runApplication blockMesh runApplication blockMesh
runApplication $application -withFunctionObjects -writePhi -writep runApplication $application -withFunctionObjects -writePhi -writep
runApplication postProcess -func streamFunction runApplication postProcess -func streamFunction

View File

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

View File

@ -6,7 +6,6 @@ cd ${0%/*} || exit 1 # Run from this directory
application=`getApplication` application=`getApplication`
cp -r 0.orig 0 > /dev/null 2>&1
runApplication blockMesh runApplication blockMesh
runApplication $application -writePhi -writep runApplication $application -writePhi -writep
runApplication postProcess -func streamFunction runApplication postProcess -func streamFunction

View File

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

View File

@ -25,8 +25,6 @@ refineMeshByCellSet()
done done
} }
cp -r 0.orig 0
runApplication blockMesh runApplication blockMesh
refineMeshByCellSet 1 2 3 refineMeshByCellSet 1 2 3

View File

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

View File

@ -10,8 +10,6 @@ application=`getApplication`
runApplication blockMesh runApplication blockMesh
runApplication extrudeMesh runApplication extrudeMesh
rm -rf 0 2> /dev/null
cp -r 0.orig 0
runApplication setFields runApplication setFields
runApplication $application runApplication $application

View File

@ -1,11 +0,0 @@
#!/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

@ -5,7 +5,6 @@ cd ${0%/*} || exit 1 # Run from this directory
. $WM_PROJECT_DIR/bin/tools/RunFunctions . $WM_PROJECT_DIR/bin/tools/RunFunctions
runApplication blockMesh runApplication blockMesh
cp -r 0.orig 0
runApplication setFields runApplication setFields
runApplication $(getApplication) runApplication $(getApplication)

View File

@ -99,8 +99,8 @@ PIMPLE
{ {
momentumPredictor no; momentumPredictor no;
transonic no; transonic no;
nOuterCorrectors 1; nOuterCorrectors 3;
nCorrectors 2; nCorrectors 1;
nNonOrthogonalCorrectors 0; nNonOrthogonalCorrectors 0;
} }

View File

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

View File

@ -5,7 +5,6 @@ cd ${0%/*} || exit 1 # Run from this directory
. $WM_PROJECT_DIR/bin/tools/RunFunctions . $WM_PROJECT_DIR/bin/tools/RunFunctions
runApplication blockMesh runApplication blockMesh
cp -r 0.orig 0
runApplication setFields runApplication setFields
runApplication decomposePar runApplication decomposePar
runParallel $(getApplication) runParallel $(getApplication)

View File

@ -99,8 +99,8 @@ PIMPLE
{ {
momentumPredictor no; momentumPredictor no;
transonic no; transonic no;
nOuterCorrectors 1; nOuterCorrectors 2;
nCorrectors 2; nCorrectors 1;
nNonOrthogonalCorrectors 0; nNonOrthogonalCorrectors 0;
} }

View File

@ -1,47 +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 volScalarField;
location "0";
object alphas;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [0 0 0 0 0 0 0];
internalField uniform 0;
boundaryField
{
leftWall
{
type zeroGradient;
}
rightWall
{
type zeroGradient;
}
lowerWall
{
type zeroGradient;
}
atmosphere
{
type zeroGradient;
}
defaultFaces
{
type empty;
}
}
// ************************************************************************* //

View File

@ -6,6 +6,6 @@ cd ${0%/*} || exit 1 # Run from this directory
cleanCase cleanCase
rm -rf 0 rm -rf 0/T.* 0/alphas
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------

View File

@ -7,9 +7,6 @@ cd ${0%/*} || exit 1 # Run from this directory
# Set application name # Set application name
application=`getApplication` application=`getApplication`
rm -rf 0
cp -r 0.orig 0
runApplication blockMesh runApplication blockMesh
runApplication setFields runApplication setFields
runApplication $application runApplication $application

View File

@ -21,7 +21,6 @@ defaultFieldValues
volScalarFieldValue alpha.water 0 volScalarFieldValue alpha.water 0
volScalarFieldValue alpha.oil 0 volScalarFieldValue alpha.oil 0
volScalarFieldValue alpha.mercury 0 volScalarFieldValue alpha.mercury 0
volVectorFieldValue U (0 0 0)
); );
regions regions

View File

@ -11,7 +11,6 @@ rm -f constant/triSurface/DTC-scaled.eMesh > /dev/null 2>&1
cleanCase cleanCase
rm constant/polyMesh/boundary > /dev/null 2>&1 rm constant/polyMesh/boundary > /dev/null 2>&1
rm -rf 0 > /dev/null 2>&1
rm system/topoSetDict > /dev/null 2>&1 rm system/topoSetDict > /dev/null 2>&1
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------

View File

@ -22,9 +22,6 @@ done
runApplication snappyHexMesh -overwrite runApplication snappyHexMesh -overwrite
rm -rf 0
cp -r 0.orig 0
runApplication setFields runApplication setFields
runApplication decomposePar runApplication decomposePar

View File

@ -4,14 +4,12 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial clean functions # Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions . $WM_PROJECT_DIR/bin/tools/CleanFunctions
# remove surface # Remove surface
rm -f constant/triSurface/DTC-scaled.stl.gz > /dev/null 2>&1 rm -f constant/triSurface/DTC-scaled.stl.gz > /dev/null 2>&1
rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1 rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1
rm -f constant/triSurface/DTC-scaled.eMesh > /dev/null 2>&1 rm -f constant/triSurface/DTC-scaled.eMesh > /dev/null 2>&1
cleanCase cleanCase
rm constant/polyMesh/boundary > /dev/null 2>&1
rm -rf 0 > /dev/null 2>&1
rm system/topoSetDict > /dev/null 2>&1 rm system/topoSetDict > /dev/null 2>&1
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------

View File

@ -22,9 +22,6 @@ done
runApplication snappyHexMesh -overwrite runApplication snappyHexMesh -overwrite
rm -rf 0
cp -r 0.orig 0
runApplication setFields runApplication setFields
runApplication decomposePar runApplication decomposePar

View File

@ -11,7 +11,6 @@ rm -f constant/triSurface/DTC-scaled.eMesh > /dev/null 2>&1
cleanCase cleanCase
rm constant/polyMesh/boundary > /dev/null 2>&1 rm constant/polyMesh/boundary > /dev/null 2>&1
rm -rf 0 > /dev/null 2>&1
rm system/topoSetDict > /dev/null 2>&1 rm system/topoSetDict > /dev/null 2>&1
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------

View File

@ -23,9 +23,6 @@ done
runApplication snappyHexMesh -overwrite runApplication snappyHexMesh -overwrite
rm -rf 0
cp -r 0.orig 0
runApplication setWaves -alpha alpha.water runApplication setWaves -alpha alpha.water
runApplication decomposePar runApplication decomposePar
@ -35,3 +32,5 @@ runParallel renumberMesh -overwrite
runParallel $(getApplication) runParallel $(getApplication)
runApplication reconstructPar runApplication reconstructPar
#------------------------------------------------------------------------------

View File

@ -11,7 +11,7 @@ FoamFile
format ascii; format ascii;
class volScalarField; class volScalarField;
location "0"; location "0";
object alpha.water; object alpha.water.orig;
} }
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

View File

@ -10,6 +10,7 @@ FoamFile
version 2.0; version 2.0;
format ascii; format ascii;
class volScalarField; class volScalarField;
location "0";
object p_rgh; object p_rgh;
} }
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -23,16 +24,25 @@ boundaryField
stationaryWalls stationaryWalls
{ {
type fixedFluxPressure; type fixedFluxPressure;
gradient uniform 0;
value uniform 0;
} }
atmosphere atmosphere
{ {
type totalPressure; type totalPressure;
rho rho;
psi none;
gamma 1;
p0 uniform 0; p0 uniform 0;
value uniform 0;
} }
floatingObject floatingObject
{ {
type fixedFluxPressure; type fixedFluxPressure;
gradient uniform 0;
value uniform 0;
} }
} }
// ************************************************************************* // // ************************************************************************* //

View File

@ -10,6 +10,7 @@ FoamFile
version 2.0; version 2.0;
format ascii; format ascii;
class pointVectorField; class pointVectorField;
location "0";
object pointDisplacement; object pointDisplacement;
} }
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -33,7 +34,6 @@ boundaryField
floatingObject floatingObject
{ {
type calculated; type calculated;
value uniform (0 0 0);
} }
} }

View File

@ -1,11 +0,0 @@
#!/bin/sh
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
#------------------------------------------------------------------------------

View File

@ -10,7 +10,6 @@ application=`getApplication`
runApplication blockMesh runApplication blockMesh
runApplication topoSet runApplication topoSet
runApplication subsetMesh -overwrite c0 -patch floatingObject runApplication subsetMesh -overwrite c0 -patch floatingObject
cp -r 0.orig 0 > /dev/null 2>&1
runApplication setFields runApplication setFields
runApplication $application runApplication $application

View File

@ -1,63 +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 binary;
class volVectorField;
object U;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [0 1 -1 0 0 0 0];
internalField uniform (0 0 0);
boundaryField
{
".*"
{
type fixedValue;
value $internalField;
}
gasInlet
{
type fixedValue;
value uniform (0 0 0.5);
}
outlet
{
type pressureInletOutletVelocity;
value $internalField;
}
"(shaftRotating|stirrer)"
{
type movingWallVelocity;
value $internalField;
}
shaft
{
type rotatingWallVelocity;
origin (0 0 0);
axis (0 0 1);
omega -5;
}
"AMI.*"
{
type cyclicAMI;
value $internalField;
}
}
// ************************************************************************* //

View File

@ -1,41 +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 volScalarField;
object p_rgh;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [1 -1 -2 0 0 0 0];
internalField uniform 1.25e5;
boundaryField
{
".*"
{
type fixedFluxPressure;
}
outlet
{
type fixedValue;
value $internalField;
}
"AMI.*"
{
type cyclicAMI;
value $internalField;
}
}
// ************************************************************************* //

Binary file not shown.

View File

@ -8,9 +8,10 @@
FoamFile FoamFile
{ {
version 2.0; version 2.0;
format ascii; format binary;
class volScalarField; class volScalarField;
object alpha.water; location "0";
object alpha.water.orig;
} }
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -20,28 +21,52 @@ internalField uniform 0;
boundaryField boundaryField
{ {
".*" vessel
{ {
type zeroGradient; type zeroGradient;
} }
gasInlet gasInlet
{ {
type fixedValue; type fixedValue;
value uniform 1; value uniform 1;
} }
outlet outlet
{ {
type inletOutlet; type inletOutlet;
inletValue uniform 0; inletValue uniform 0;
value $internalField; value uniform 0;
} }
shaftRotating
"AMI.*" {
type zeroGradient;
}
shaft
{
type zeroGradient;
}
sparger
{
type zeroGradient;
}
stirrer
{
type zeroGradient;
}
baffles
{
type zeroGradient;
}
AMI1
{ {
type cyclicAMI; type cyclicAMI;
value uniform 0;
}
AMI2
{
type cyclicAMI;
value uniform 0;
} }
} }
// ************************************************************************* // // ************************************************************************* //

View File

@ -8,41 +8,69 @@
FoamFile FoamFile
{ {
version 2.0; version 2.0;
format ascii; format binary;
class volScalarField; class volScalarField;
location "0";
object epsilon; object epsilon;
} }
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [0 2 -3 0 0 0 0]; dimensions [0 2 -3 0 0 0 0];
internalField uniform 7e-3; internalField uniform 0.007;
boundaryField boundaryField
{ {
".*" vessel
{ {
type epsilonWallFunction; type epsilonWallFunction;
value $internalField; value uniform 0.007;
} }
gasInlet gasInlet
{ {
type fixedValue; type fixedValue;
value $internalField; value uniform 0.007;
} }
outlet outlet
{ {
type inletOutlet; type inletOutlet;
inletValue $internalField; inletValue uniform 0.007;
value $internalField; value uniform 0.007;
} }
shaftRotating
"AMI.*" {
type epsilonWallFunction;
value uniform 0.007;
}
shaft
{
type epsilonWallFunction;
value uniform 0.007;
}
sparger
{
type epsilonWallFunction;
value uniform 0.007;
}
stirrer
{
type epsilonWallFunction;
value uniform 0.007;
}
baffles
{
type epsilonWallFunction;
value uniform 0.007;
}
AMI1
{ {
type cyclicAMI; type cyclicAMI;
value $internalField; value uniform 0;
}
AMI2
{
type cyclicAMI;
value uniform 0;
} }
} }

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