tutorials: added multiregion support to CleanFunctions and

removed redundant foamCleanPolyMesh script
This commit is contained in:
Chris Greenshields
2021-06-22 10:39:14 +01:00
parent b2b7240733
commit a172463bd0
7 changed files with 19 additions and 184 deletions

View File

@ -1,143 +0,0 @@
#!/bin/sh
#------------------------------------------------------------------------------
# ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration | Website: https://openfoam.org
# \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
# \\/ M anipulation |
#------------------------------------------------------------------------------
# License
# This file is part of OpenFOAM.
#
# OpenFOAM is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
#
# Script
# foamCleanPolyMesh
#
# Description
# Remove the contents of the constant/polyMesh directory
# as per the Foam::polyMesh::removeFiles() method.
#
#------------------------------------------------------------------------------
usage() {
cat <<USAGE
Usage: ${0##*/} [OPTION]
options:
-case <dir> specify alternative case directory, default is the cwd
-region <name> specify alternative mesh region
-help print the usage
Remove the contents of the constant/polyMesh directory as per the
Foam::polyMesh::removeFiles() method.
USAGE
}
error() {
exec 1>&2
while [ "$#" -ge 1 ]; do echo "$1"; shift; done
usage
exit 1
}
unset caseDir regionName
# Parse a single option
while [ "$#" -gt 0 ]
do
case "$1" in
-h | -help)
usage && exit 0
;;
-case)
[ "$#" -ge 2 ] || error "'$1' option requires an argument"
cd "$2" 2>/dev/null || error "directory does not exist: '$2'"
caseDir=$2
shift 2
;;
-region)
[ "$#" -ge 2 ] || error "'$1' option requires an argument"
regionName=$2
shift 2
;;
*)
error "unknown option/argument: '$*'"
;;
esac
done
if [ -n "$regionName" ]
then
meshDir=$regionName/polyMesh
else
meshDir=polyMesh
fi
# If -case was specified: insist upon 'constant/polyMesh'
if [ -n "$caseDir" ]
then
if [ -d constant/$meshDir ]
then
# Use constant/polyMesh
meshDir=constant/$meshDir
else
echo "Error: no 'constant/$meshDir' in $caseDir" 1>&2
exit 1
fi
else
if [ -d constant/$meshDir ]
then
# Use constant/polyMesh
meshDir=constant/$meshDir
elif [ -d $meshDir ]
then
# Likely already in constant/ - do not adjust anything
:
elif [ "${PWD##*/}" = polyMesh -a -z "$regionName" ]
then
# Apparently already within polyMesh/
meshDir=.
fi
fi
# Remove files (mesh itself, modifiers, snappyHexMesh ones) and subdirectories
# also remove .gz versions of the same files
echo "Cleaning ${caseDir:-.}/$meshDir" 1>&2
for i in \
points \
faces \
owner \
neighbour \
cells \
boundary \
pointZones \
faceZones \
cellZones \
meshModifiers \
parallelData \
sets \
cellLevel \
pointLevel \
level0Edge \
refinementHistory \
surfaceIndex \
;
do
rm -rf ${meshDir:?}/$i ${meshDir:?}/$i.gz
done
#------------------------------------------------------------------------------

View File

@ -44,27 +44,20 @@ cleanCase()
rm -rf ./[1-9]* ./-[1-9]* ./log ./log.* ./logSummary.* \
./*.OpenFOAM ./*.blockMesh ./*.foam ./.setSet
for d in constant 0
do
rm -rf $d/polyMesh $d/*/polyMesh \
$d/cellToRegion $d/*/cellToRegion \
$d/cellLevel* $d/pointLevel* \
$d/cellDist $d/cellDecomposition
done
[ -d system ] && [ -d dynamicCode ] && rm -rf dynamicCode
rm -rf processor*
rm -rf jobInfo
rm -rf postProcessing
rm -rf TDAC
rm -rf constant/polyMesh
rm -f constant/cellToRegion \
constant/cellLevel* \
constant/pointLevel*
rm -rf constant/tetDualMesh
rm -rf VTK
rm -rf sequencedVTK
rm -rf 0/polyMesh 0/cellLevel \
0/pointLevel 0/cellDist \
constant/cellDecomposition
rm -rf jobInfo TDAC constant/tetDualMesh
rm -rf VTK sequencedVTK
find . -name "*.orig" -type f -exec sh -c 'rm -f ${0%.*} ${0%.*}.gz' {} \;
}
@ -84,7 +77,7 @@ cleanVoFCase()
removeCase()
{
echo "Removing ${1:-unknown} case"
rm -rf $1
rm -rf "$1"
}
cleanApplication()

View File

@ -1,14 +1,9 @@
#!/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
cleanCase
rm -f 0/cellToRegion
for region in fluid solid
do
rm -rf 0/${region}/cellToRegion constant/${region}/polyMesh
done
#------------------------------------------------------------------------------

View File

@ -1,13 +1,9 @@
#!/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/CleanFunctions
cleanCase
foamCleanPolyMesh -region air
foamCleanPolyMesh -region porous
#------------------------------------------------------------------------------

View File

@ -1,9 +1,8 @@
#!/bin/sh
cd ${0%/*} || exit 1
cd "${0%/*}" || exit 1
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
cleanCase
rm -rf constant/*/polyMesh 0/cellToRegion 0/*/cellToRegion
#------------------------------------------------------------------------------

View File

@ -6,4 +6,4 @@ cd ${0%/*} || exit 1
cleanCase
rm -rf constant/*/polyMesh 0/cellToRegion 0/*/cellToRegion
#------------------------------------------------------------------------------

View File

@ -1,14 +1,9 @@
#!/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
cleanCase
rm -f 0/cellToRegion
for region in shell tube solid
do
rm -rf 0/${region}/cellToRegion constant/${region}/polyMesh
done
#------------------------------------------------------------------------------