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

BUG: cleanCase deletes blockMeshDict (fixes #900)

Browse Source 
- Don't remove the constant/polyMesh directory if it contains a
  blockMeshDict or blockMeshDict.m4 file. Offer a reminder that
  system/ is the normal place for it.
This commit is contained in:
Mark Olesen
2018-06-22 14:50:25 +02:00
parent c8fd217e95
commit b68fe2c76d
1 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
bin/tools/CleanFunctions
View File

@ -3,7 +3,7 @@
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration | # \\ / O peration |
# \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation # \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
# \\/ M anipulation | Copyright (C) 2015-2017 OpenCFD Ltd. # \\/ M anipulation | Copyright (C) 2015-2018 OpenCFD Ltd.
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# License # License
# This file is part of OpenFOAM, licensed under GNU General Public License # This file is part of OpenFOAM, licensed under GNU General Public License
@ -95,11 +95,32 @@ cleanCase()
rm -f 0/cellDist > /dev/null 2>&1 rm -f 0/cellDist > /dev/null 2>&1
( (
cd constant 2>/dev/null && \ cd constant 2>/dev/null || exit 0
rm -rf \ rm -rf \
cellDecomposition cellToRegion cellLevel* pointLevel* \ cellDecomposition cellToRegion cellLevel* pointLevel* \
polyMesh tetDualMesh \ tetDualMesh \
> /dev/null 2>&1 \ > /dev/null 2>&1
# Old constant/polyMesh location for blockMeshDict still in use?
# - emit a gentle warning
if [ -e polyMesh/blockMeshDict.m4 ]
then
rm -f polyMesh/blockMeshDict > /dev/null 2>&1
echo
echo "Warning: not removing constant/polyMesh/ "
echo " it contains a blockMeshDict, which should normally be under system/ instead"
echo
elif [ -e polyMesh/blockMeshDict ]
then
echo
echo "Warning: not removing constant/polyMesh/ "
echo " it contains a blockMeshDict, which should normally be under system/ instead"
echo
else
# Remove polyMesh entirely if there is no blockMeshDict
rm -rf polyMesh > /dev/null 2>&1
fi
) )
if [ -e system/blockMeshDict.m4 ] if [ -e system/blockMeshDict.m4 ]