mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
GIT: Resolve conflict with upstream merge from Foundation
This commit is contained in:
@ -2,7 +2,7 @@
|
||||
# ========= |
|
||||
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
# \\ / O peration |
|
||||
# \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
|
||||
# \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
|
||||
# \\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
|
||||
#------------------------------------------------------------------------------
|
||||
# License
|
||||
@ -122,7 +122,9 @@ cleanCase()
|
||||
(cd constant/polyMesh && \
|
||||
rm -rf \
|
||||
allOwner* cell* face* meshModifiers* \
|
||||
owner* neighbour* point* edge* sets \
|
||||
owner* neighbour* point* edge* \
|
||||
cellLevel* pointLevel* refinementHistory* level0Edge* surfaceIndex* sets \
|
||||
boundary \
|
||||
> /dev/null 2>&1 \
|
||||
)
|
||||
fi
|
||||
@ -133,9 +135,9 @@ cleanCase()
|
||||
rm -rf VTK > /dev/null 2>&1
|
||||
rm -f 0/cellDist constant/cellDecomposition
|
||||
|
||||
if [ -e constant/polyMesh/blockMeshDict.m4 ]
|
||||
if [ -e system/blockMeshDict.m4 ]
|
||||
then
|
||||
rm -f constant/polyMesh/blockMeshDict > /dev/null 2>&1
|
||||
rm -f system/blockMeshDict > /dev/null 2>&1
|
||||
fi
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user