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

STYLE: indentation, comments

Browse Source 
ENH: additional faMesh cleanup in CleanFunctions
This commit is contained in:
Mark Olesen
2023-12-06 15:04:10 +01:00
parent 227480c366
commit 2de1a26c7b
3 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
bin/tools/CleanFunctions
View File

@ -6,7 +6,7 @@
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Copyright (C) 2011-2016 OpenFOAM Foundation # Copyright (C) 2011-2016 OpenFOAM Foundation
# Copyright (C) 2015-2022 OpenCFD Ltd. # Copyright (C) 2015-2023 OpenCFD Ltd.
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# License # License
# This file is part of OpenFOAM, distributed under GPL-3.0-or-later. # This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
@ -107,6 +107,10 @@ cleanPostProcessing()
cleanFaMesh() cleanFaMesh()
{ {
if [ -e constant/finite-area/faMesh ]
then
rm -rf constant/finite-area/faMesh
fi
if [ -e constant/faMesh ] if [ -e constant/faMesh ]
then then
if [ -e constant/faMesh/faMeshDefinition ] if [ -e constant/faMesh/faMeshDefinition ]
@ -116,7 +120,7 @@ cleanFaMesh()
echo echo
echo "Warning: not removing constant/faMesh/" echo "Warning: not removing constant/faMesh/"
echo " It contains a 'faMeshDefinition' file" echo " It contains a 'faMeshDefinition' file"
echo " Relocate the file(s) to system/ to avoid this warning" echo " Please relocate file(s) to system/ !!"
echo echo
else else
# Can remove constant/faMesh/ entirely (no faMeshDefinition) # Can remove constant/faMesh/ entirely (no faMeshDefinition)
@ -138,7 +142,7 @@ cleanPolyMesh()
echo echo
echo "Warning: not removing constant/polyMesh/" echo "Warning: not removing constant/polyMesh/"
echo " It contains a 'blockMeshDict' or 'blockMeshDict.m4' file" echo " It contains a 'blockMeshDict' or 'blockMeshDict.m4' file"
echo " Relocate the file(s) to system/ to avoid this warning" echo " Please relocate file(s) to system/ !!"
echo echo
else else
# Can remove constant/polyMesh/ entirely (no blockMeshDict) # Can remove constant/polyMesh/ entirely (no blockMeshDict)

15
src/OpenFOAM/meshes/polyMesh/polyMesh.H
View File

@ -116,10 +116,11 @@ private:
// Private Data // Private Data
// Primitive mesh data //- Mesh and solver state data
meshState data_;
//- Mesh data
meshState data_; // Primitive mesh data
//- Points //- Points
pointIOField points_; pointIOField points_;
@ -434,11 +435,11 @@ public:
// Access // Access
//- Return a reference to the mesh data //- Const reference to the mesh and solver state data
virtual meshState& data() noexcept {return data_;} virtual const meshState& data() const noexcept { return data_; }
//- Return a const reference to the mesh data //- Reference to the mesh and solver state data
virtual const meshState& data() const noexcept {return data_;} virtual meshState& data() noexcept { return data_; }
//- Return raw points //- Return raw points
virtual const pointField& points() const; virtual const pointField& points() const;

6
src/finiteArea/faMesh/faMesh.H
View File

@ -645,9 +645,11 @@ public:
//- Return the current instance directory for faces //- Return the current instance directory for faces
const fileName& facesInstance() const; const fileName& facesInstance() const;
const meshState& data() const noexcept { return mesh().data(); } //- Const reference to the mesh and solver state data
const meshState& data() const { return mesh().data(); }
meshState& data() noexcept { return const_cast<polyMesh&>(mesh()).data(); } //- Reference to the mesh and solver state data
meshState& data() { return const_cast<polyMesh&>(mesh()).data(); }
// Parallel // Parallel