From 5f08a2f90a7e040935457e0585ee3b4c8cfaa528 Mon Sep 17 00:00:00 2001 From: Danial Khazaei Date: Thu, 31 Jan 2019 17:52:39 +0330 Subject: [PATCH] Bugfix: update cfMesh to v1.1 which fixes self-comparison always evaluates to false [-Wtautological-compare] --- .../cfMesh/FLMAToSurface/FLMAToSurface.C | 26 +- .../cfMesh/FMSToSurface/FMSToSurface.C | 26 +- .../generation/cfMesh/FMSToVTK/FMSToVTK.C | 212 +- .../mesh/generation/cfMesh/FMSToVTK/xmlTag.H | 74 +- .../cfMesh/cartesian2DMesh/cartesian2DMesh.C | 26 +- .../cfMesh/cartesianMesh/cartesianMesh.C | 26 +- .../copySurfaceParts/copySurfaceParts.C | 24 +- .../extrudeEdgesInto2DSurface.C | 26 +- .../generateBoundaryLayers.C | 2 - .../importSurfaceAsSubset.C | 24 +- .../improveMeshQuality/improveMeshQuality.C | 2 - .../improveSymmetryPlanes.C | 26 +- .../mergeSurfacePatches/mergeSurfacePatches.C | 130 +- .../generation/cfMesh/meshToFPMA/meshToFPMA.C | 32 +- .../mesh/generation/cfMesh/pMesh/pMesh.C | 2 - .../patchesToSubsets/patchesToSubsets.C | 26 +- .../generation/cfMesh/preparePar/preparePar.C | 36 +- .../python/Salome/extractFeatureEdges.py | 46 +- .../cfMesh/python/Salome/salomeTriSurf.py | 136 +- .../removeSurfaceFacets/removeSurfaceFacets.C | 26 +- .../cfMesh/subsetToPatch/subsetToPatch.C | 26 +- .../surfaceFeatureEdges/surfaceFeatureEdges.C | 24 +- .../surfaceGenerateBoundingBox.C | 32 +- .../cfMesh/surfaceToFMS/surfaceToFMS.C | 26 +- .../mesh/generation/cfMesh/tetMesh/tetMesh.C | 26 +- ...1.0.1.pdf => User Guide - cfMesh v1.1.pdf} | Bin 1728882 -> 1936335 bytes .../cartesian2DMeshGenerator.C | 228 +- .../cartesianMeshExtractor.C | 12 +- .../cartesianMeshExtractor.H | 12 +- ...artesianMeshExtractorDecomposeSplitHexes.C | 26 +- .../cartesianMeshExtractorPolyMesh.C | 4 +- .../cartesianMeshGenerator.C | 206 +- .../tetMeshGenerator/tetMeshGenerator.C | 201 +- .../coordinateModification/boxScaling.C | 2 +- .../coordinateModification.C | 2 +- .../coordinateModifier.H | 2 - .../coordinateModification/planeScaling.C | 2 +- .../boundaryLayers/boundaryLayers.H | 2 - .../boundaryLayersCreateVertices.C | 2 +- .../boundaryLayersWrapperLayer.C | 16 +- .../extrudeLayer/extrudeLayer.C | 12 +- .../extrudeLayer/extrudeLayer.H | 2 - .../extrudeLayer/extrudeLayerI.H | 32 +- .../refineBoundaryLayers.H | 2 - .../refineBoundaryLayersCells.C | 2 +- .../refineBoundaryLayersFaces.C | 6 +- .../refineBoundaryLayersFunctions.C | 4 +- .../triangulateNonPlanarBaseFaces.H | 2 - .../utilities/checkMeshDict/checkMeshDict.C | 54 +- .../utilities/checkMeshDict/checkMeshDict.H | 5 +- .../utilities/containers/DynList/DynList.C | 19 +- .../utilities/containers/DynList/DynList.H | 26 +- .../utilities/containers/DynList/DynListI.H | 313 +- .../utilities/containers/FRWGraph/FRWGraph.C | 27 +- .../utilities/containers/FRWGraph/FRWGraphI.H | 8 +- .../containers/IODynList/IODynList.C | 9 +- .../containers/IOLongList/IOLongList.C | 9 +- .../utilities/containers/Lists/cellListPMG.H | 20 +- .../utilities/containers/Lists/cellListPMGI.H | 10 +- .../utilities/containers/Lists/faceListPMGI.H | 10 +- .../containers/Lists/pointFieldPMGI.H | 8 +- .../utilities/containers/LongList/LongList.C | 33 +- .../utilities/containers/LongList/LongListI.H | 18 +- .../utilities/containers/VRWGraph/VRWGraph.C | 19 +- .../utilities/containers/VRWGraph/VRWGraph.H | 7 + .../utilities/containers/VRWGraph/VRWGraphI.H | 5 +- .../containers/VRWGraph/VRWGraphSMPModifier.H | 16 +- .../containers/VRWGraphList/VRWGraphList.C | 10 +- .../containers/VRWGraphList/VRWGraphList.H | 24 +- .../containers/VRWGraphList/VRWGraphListI.H | 14 +- .../utilities/containers/graphRow/graphRow.H | 16 +- .../utilities/containers/graphRow/graphRowI.H | 2 +- .../utilities/containers/subGraph/subGraph.H | 14 +- .../utilities/containers/subGraph/subGraphI.H | 8 +- .../dataConversion/foamToFPMA/fpmaMesh.C | 32 +- .../dataConversion/foamToFPMA/fpmaMesh.H | 4 +- .../dataConversion/foamToFPMA/writeMeshFPMA.C | 2 - .../dataConversion/foamToFPMA/writeMeshFPMA.H | 2 +- .../decomposeCellsDecomposition.C | 6 +- .../decomposeCells/decomposeCellsPyramids.C | 14 +- .../faceDecomposition/decomposeFaces.C | 2 +- .../faceDecomposition/faceDecomposition.C | 14 +- .../faceDecomposition/faceDecomposition.H | 6 +- .../geometry/quadricFitting/quadricFittingI.H | 9 +- .../labelledMeshOctreeCubeCoordinates.H | 38 +- .../labelledPoint/labelledPoint.H | 42 +- .../labelledPoint/refLabelledPoint.H | 38 +- .../labelledPointScalar/labelledPointScalar.H | 48 +- .../parallelHelpers/parPartTet/parPartTet.H | 40 +- .../parallelHelpers/parTriFace/parTriFace.H | 4 +- .../sortEdgesIntoChains/sortEdgesIntoChains.C | 19 +- .../sortEdgesIntoChains/sortEdgesIntoChains.H | 13 +- .../helperFunctionsFrontalMarking.C | 2 +- .../helperFunctionsGeometryQueries.H | 9 + .../helperFunctionsGeometryQueriesI.H | 175 +- .../helperFunctions/helperFunctionsPar.C | 84 +- .../helperFunctions/helperFunctionsPar.H | 2 +- .../helperFunctionsStringConversion.C | 6 +- .../helperFunctionsStringConversion.H | 6 +- .../helperFunctionsTopologyManipulationI.H | 2 +- .../meshes/partTetMesh/partTetMesh.C | 4 +- .../partTetMesh/partTetMeshAddressing.C | 4 +- .../partTetMeshParallelAddressing.C | 146 +- .../meshes/partTetMesh/partTetMeshSimplex.C | 16 +- .../meshes/partTetMesh/partTetMeshSimplex.H | 24 +- .../partTriMeshParallelAddressing.C | 4 +- .../meshes/partTriMesh/partTriMeshSimplex.C | 8 +- .../meshes/partTriMesh/partTriMeshSimplex.H | 22 +- .../boundaryPatch/boundaryPatchBase.C | 10 +- .../boundaryPatch/boundaryPatchBase.H | 42 +- .../boundaryPatch/processorBoundaryPatch.C | 12 +- .../meshes/polyMeshGen/polyMeshGen.H | 2 +- .../meshes/polyMeshGen/polyMeshGenFacesI.H | 20 +- .../meshes/polyMeshGen/polyMeshGenPoints.H | 1 - .../meshes/polyMeshGen/polyMeshGenPointsI.H | 16 +- .../polyMeshGenAddressing.H | 44 +- .../polyMeshGenAddressingParallelAddressing.C | 20 +- .../polyMeshGenChecks/polyMeshGenChecks.H | 69 + .../polyMeshGenChecksGeometry.C | 1429 +- .../polyMeshGenModifierAddBufferCells.C | 8 +- .../polyMeshGenModifierAddCellByCell.C | 24 +- .../polyMeshGenModifierAddCellByCell.H | 6 +- .../polyMeshGenModifierRemoveFaces.C | 6 +- .../polyMeshGenModifierZipUpCells.C | 32 +- .../primitives/meshSubsets/meshSubsetI.H | 2 +- .../meshes/triSurf/triSurfAddressing.C | 15 +- .../utilities/octrees/meshOctree/meshOctree.C | 2 +- .../meshOctreeAddressing.H | 152 +- .../meshOctreeAddressingI.H | 70 +- .../meshOctreeAddressingParallelAddressing.C | 16 +- .../meshOctreeAutomaticRefinement.C | 2 +- .../meshOctreeCreatorAdjustOctreeToSurface.C | 2 +- .../meshOctreeCreatorCreateOctreeBoxes.C | 12 +- .../meshOctreeCubeCoordinatesI.H | 16 +- .../meshOctreeFindNearestSurfacePoint.C | 10 + .../meshOctreeInsideOutside.H | 38 +- .../meshOctreeModifierLoadDistribution.C | 8 +- .../meshOctreeModifierParallelRefinement.C | 21 +- .../meshOctreeModifierRefineSelectedBoxes.C | 4 + .../meshOctreeParallelCommunication.C | 32 +- .../objectRefinement/boxRefinement.C | 2 +- .../objectRefinement/boxRefinement.H | 12 +- .../objectRefinement/coneRefinement.C | 24 +- .../objectRefinement/coneRefinement.H | 12 +- .../objectRefinement/hollowConeRefinement.C | 30 +- .../objectRefinement/hollowConeRefinement.H | 12 +- .../objectRefinement/lineRefinement.C | 10 +- .../objectRefinement/lineRefinement.H | 12 +- .../objectRefinement/objectRefinement.H | 9 +- .../objectRefinement/sphereRefinement.C | 12 +- .../objectRefinement/sphereRefinement.H | 12 +- .../boundaryLayerOptimisationNormals.C | 4 +- .../geometry/meshOptimizer/meshOptimizer.C | 2 +- .../geometry/meshOptimizer/meshOptimizerI.H | 12 +- .../meshOptimizerOptimizePoint.C | 20 +- .../geometry/meshOptimizer/optimizeMeshFV.C | 14 +- .../symmetryPlaneOptimisation.C | 78 +- .../symmetryPlaneOptimisation.H | 2 +- .../knuppMetric/knuppMetric.C | 68 +- .../knuppMetric/knuppMetric.H | 12 +- .../meshUntangler/meshUntangler.C | 28 +- .../meshUntangler/meshUntangler.H | 40 +- .../meshUntangler/meshUntanglerCutRegion.C | 15 +- .../meshUntanglerCutRegionEdges.C | 24 +- .../meshUntanglerCutRegionFaces.C | 4 +- .../meshUntanglerCutRegionPoints.C | 6 +- .../meshUntanglerCutRegionTieBreak.C | 13 +- .../quadricMetric/quadricMetric.C | 2 +- .../simplexSmoother/simplexSmoother.H | 24 +- .../tetMeshOptimisation/tetMeshOptimisation.C | 12 +- ...eshSurfaceOptimizerOptimizePointParallel.C | 4 +- .../checkBoundaryFacesSharingTwoEdges.H | 22 +- .../checkCellConnectionsOverFaces.C | 6 +- .../checkIrregularSurfaceConnections.C | 3 +- .../checkIrregularSurfaceConnections.H | 12 +- ...heckIrregularSurfaceConnectionsFunctions.C | 4 +- .../checkNonMappableCellConnections.C | 4 +- .../checkNonMappableCellConnections.H | 6 +- .../topologicalCleaner/topologicalCleaner.H | 14 +- .../topologicalCleanerInvalidVertices.C | 6 +- ...ogyCleanerNonConsecutiveBoundaryVertices.C | 91 +- .../topologyCleanerNonMappableCells.C | 4 +- .../edgeExtractor/edgeExtractor.C | 22 +- .../edgeExtractor/edgeExtractor.H | 2 - .../edgeExtractor/edgeExtractorCorners.C | 2 +- .../meshSurfaceCheckEdgeTypes.C | 81 +- .../meshSurfaceCheckEdgeTypes.H | 13 +- .../meshSurfaceCheckInvertedVertices.H | 2 - .../meshSurfaceEdgeExtractor.H | 10 +- .../meshSurfaceEngine/meshSurfaceEngine.H | 2 - ...faceEngineCalculateBoundaryNodesAndFaces.C | 109 +- .../meshSurfaceEngineModifier.H | 12 +- .../meshSurfaceEngineParallelAddressing.C | 16 +- .../meshSurfaceMapper/meshSurfaceMapper.C | 4 +- .../meshSurfaceMapper/parMapperHelper.H | 34 +- .../renameBoundaryPatches.C | 32 +- .../renameBoundaryPatches.H | 10 +- .../surfaceMorpherCells/surfaceMorpherCells.H | 18 +- .../surfaceMorpherCellsMorphInternalFaces.C | 7 +- .../tetCreatorOctree/tetCreatorOctree.C | 20 +- .../tetCreatorOctree/tetCreatorOctree.H | 44 +- .../tetCreatorOctreeFromFacesWithCentreNode.C | 44 +- .../tetCreatorOctree/tetCreatorOctreeI.H | 4 +- .../tetCreatorOctreeTetsFromSplitFaces.C | 12 +- .../triSurface2DCheck/triSurface2DCheck.C | 7 +- .../triSurfaceChecks/triSurfaceChecks.C | 21 +- .../triSurfaceImportSurfaceAsSubset.C | 5 +- .../triSurfacePatchManipulator.C | 29 + .../workflowControls/workflowControls.H | 2 - .../voronoiMeshGenerator.C | 192 +- .../cfMesh/cartesian2DMesh/hatOctree/Allclean | 7 +- .../hatOctree/system/controlDict | 36 +- .../hatOctree/system/fvSchemes | 10 +- .../hatOctree/system/fvSolution | 10 +- .../cartesian2DMesh/hatOctree/system/meshDict | 14 +- .../cfMesh/cartesianMesh/asmoOctree/Allclean | 7 +- .../asmoOctree/system/controlDict | 4 +- .../cartesianMesh/asmoOctree/system/fvSchemes | 10 +- .../asmoOctree/system/fvSolution | 10 +- .../cartesianMesh/asmoOctree/system/meshDict | 6 +- .../bunnyOctree/0/.emptyFileForGit | 0 .../cfMesh/cartesianMesh/bunnyOctree/Allclean | 7 +- .../bunnyOctree/system/controlDict | 4 +- .../bunnyOctree/system/decomposeParDict | 4 +- .../bunnyOctree/system/fvSchemes | 10 +- .../bunnyOctree/system/fvSolution | 10 +- .../cartesianMesh/bunnyOctree/system/meshDict | 11 +- .../cartesianMesh/elbow_90degree/Allclean | 7 +- .../elbow_90degree/elbow_90degree.stl | 72136 +++---- .../cartesianMesh/elbow_90degree/readme.txt | 2 +- .../elbow_90degree/system/controlDict | 4 +- .../elbow_90degree/system/fvSchemes | 10 +- .../elbow_90degree/system/fvSolution | 10 +- .../elbow_90degree/system/meshDict | 18 +- .../intakePortOctree/0/.emptyFileForGit | 0 .../cartesianMesh/intakePortOctree/Allclean | 7 +- .../intakePortOctree/system/controlDict | 4 +- .../intakePortOctree/system/fvSchemes | 10 +- .../intakePortOctree/system/fvSolution | 10 +- .../intakePortOctree/system/meshDict | 25 +- .../cartesianMesh/multipleOrifices/Allclean | 7 +- .../multipleOrifices/multipleOrifices.stl | 166592 +++++++-------- .../cartesianMesh/multipleOrifices/readme.txt | 2 +- .../multipleOrifices/system/controlDict | 4 +- .../multipleOrifices/system/fvSchemes | 10 +- .../multipleOrifices/system/fvSolution | 10 +- .../multipleOrifices/system/meshDict | 22 +- .../sBendOctree/0/.emptyFileForGit | 0 .../cfMesh/cartesianMesh/sBendOctree/Allclean | 7 +- .../cfMesh/cartesianMesh/sBendOctree/Allrun | 1 + .../cfMesh/cartesianMesh/sBendOctree/README | 2 +- .../cartesianMesh/sBendOctree/sBend.fms | 8 +- .../sBendOctree/system/controlDict | 38 +- .../sBendOctree/system/fvSchemes | 10 +- .../sBendOctree/system/fvSolution | 10 +- .../cartesianMesh/sBendOctree/system/meshDict | 18 +- .../sawOctree/0/.emptyFileForGit | 0 .../cfMesh/cartesianMesh/sawOctree/Allclean | 7 +- .../cfMesh/cartesianMesh/sawOctree/Allrun | 11 +- .../cfMesh/cartesianMesh/sawOctree/sav.smesh | 40728 ++-- .../sawOctree/sawOctree.foam} | 0 .../sawOctree/system/controlDict | 6 +- .../cartesianMesh/sawOctree/system/fvSchemes | 10 +- .../cartesianMesh/sawOctree/system/fvSolution | 10 +- .../cartesianMesh/sawOctree/system/meshDict | 4 +- .../cartesianMesh/ship5415Octree/Allclean | 7 +- .../ship5415Octree.foam} | 0 .../ship5415Octree/system/controlDict | 36 +- .../ship5415Octree/system/fvSchemes | 12 +- .../ship5415Octree/system/fvSolution | 6 +- .../ship5415Octree/system/meshDict | 46 +- .../cartesianMesh/singleOrifice/Allclean | 7 +- .../cartesianMesh/singleOrifice/readme.txt | 2 +- .../singleOrifice/singleOrifice.stl | 39292 ++-- .../singleOrifice/system/controlDict | 4 +- .../singleOrifice/system/fvSchemes | 10 +- .../singleOrifice/system/fvSolution | 10 +- .../singleOrifice/system/meshDict | 32 +- .../mesh/cfMesh/pMesh/bunnyPoly/Allclean | 7 +- .../cfMesh/pMesh/bunnyPoly/system/controlDict | 4 +- .../pMesh/bunnyPoly/system/decomposeParDict | 4 +- .../cfMesh/pMesh/bunnyPoly/system/fvSchemes | 10 +- .../cfMesh/pMesh/bunnyPoly/system/fvSolution | 10 +- .../cfMesh/pMesh/bunnyPoly/system/meshDict | 68 +- .../cfMesh/pMesh/multipleOrifices/Allclean | 9 +- .../cfMesh/pMesh/multipleOrifices/readme.txt | 2 +- .../pMesh/multipleOrifices/system/controlDict | 4 +- .../pMesh/multipleOrifices/system/fvSchemes | 10 +- .../pMesh/multipleOrifices/system/fvSolution | 10 +- .../pMesh/multipleOrifices/system/meshDict | 31 +- .../tetMesh/cutCubeOctree/0/.emptyFileForGit | 0 .../cfMesh/tetMesh/cutCubeOctree/Allclean | 7 +- .../mesh/cfMesh/tetMesh/cutCubeOctree/README | 2 +- .../tetMesh/cutCubeOctree/system/controlDict | 4 +- .../tetMesh/cutCubeOctree/system/fvSchemes | 10 +- .../tetMesh/cutCubeOctree/system/fvSolution | 10 +- .../tetMesh/cutCubeOctree/system/meshDict | 4 +- .../tetMesh/socketOctree/0/.emptyFileForGit | 0 .../mesh/cfMesh/tetMesh/socketOctree/Allclean | 7 +- .../mesh/cfMesh/tetMesh/socketOctree/README | 2 +- .../cfMesh/tetMesh/socketOctree/socket.fms | 74 +- .../tetMesh/socketOctree/system/controlDict | 4 +- .../tetMesh/socketOctree/system/fvSchemes | 10 +- .../tetMesh/socketOctree/system/fvSolution | 10 +- .../tetMesh/socketOctree/system/meshDict | 36 +- 305 files changed, 164476 insertions(+), 162251 deletions(-) rename doc/cfMesh/{User Guide - cfMesh v1.0.1.pdf => User Guide - cfMesh v1.1.pdf} (70%) delete mode 100644 tutorials/mesh/cfMesh/cartesianMesh/bunnyOctree/0/.emptyFileForGit delete mode 100644 tutorials/mesh/cfMesh/cartesianMesh/intakePortOctree/0/.emptyFileForGit delete mode 100644 tutorials/mesh/cfMesh/cartesianMesh/sBendOctree/0/.emptyFileForGit delete mode 100644 tutorials/mesh/cfMesh/cartesianMesh/sawOctree/0/.emptyFileForGit rename tutorials/mesh/cfMesh/{cartesian2DMesh/hatOctree/0/.emptyFileForGit => cartesianMesh/sawOctree/sawOctree.foam} (100%) rename tutorials/mesh/cfMesh/cartesianMesh/{asmoOctree/0/.emptyFileForGit => ship5415Octree/ship5415Octree.foam} (100%) delete mode 100644 tutorials/mesh/cfMesh/tetMesh/cutCubeOctree/0/.emptyFileForGit delete mode 100644 tutorials/mesh/cfMesh/tetMesh/socketOctree/0/.emptyFileForGit diff --git a/applications/utilities/mesh/generation/cfMesh/FLMAToSurface/FLMAToSurface.C b/applications/utilities/mesh/generation/cfMesh/FLMAToSurface/FLMAToSurface.C index b462bc0ef..5c10fd65f 100644 --- a/applications/utilities/mesh/generation/cfMesh/FLMAToSurface/FLMAToSurface.C +++ b/applications/utilities/mesh/generation/cfMesh/FLMAToSurface/FLMAToSurface.C @@ -1,25 +1,25 @@ /*---------------------------------------------------------------------------*\ ========= | - \\ / F ield | foam-extend: Open Source CFD - \\ / O peration | Version: 3.2 - \\ / A nd | Web: http://www.foam-extend.org - \\/ M anipulation | For copyright notice see file Copyright + \\ / F ield | cfMesh: A library for mesh generation + \\ / O peration | + \\ / A nd | Author: Franjo Juretic (franjo.juretic@c-fields.com) + \\/ M anipulation | Copyright (C) Creative Fields, Ltd. ------------------------------------------------------------------------------- License - This file is part of foam-extend. + This file is part of cfMesh. - foam-extend is free software: you can redistribute it and/or modify it + cfMesh 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 + Free Software Foundation; either version 3 of the License, or (at your option) any later version. - foam-extend 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. + cfMesh 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 foam-extend. If not, see . + along with cfMesh. If not, see . Description Reads the AVL's surface mesh @@ -27,8 +27,6 @@ Description \*---------------------------------------------------------------------------*/ #include "argList.H" -#include "objectRegistry.H" -#include "foamTime.H" #include "triSurf.H" #include "triSurfModifier.H" #include "triFaceList.H" diff --git a/applications/utilities/mesh/generation/cfMesh/FMSToSurface/FMSToSurface.C b/applications/utilities/mesh/generation/cfMesh/FMSToSurface/FMSToSurface.C index a4a617c3e..8c27c9042 100644 --- a/applications/utilities/mesh/generation/cfMesh/FMSToSurface/FMSToSurface.C +++ b/applications/utilities/mesh/generation/cfMesh/FMSToSurface/FMSToSurface.C @@ -1,25 +1,25 @@ /*---------------------------------------------------------------------------*\ ========= | - \\ / F ield | foam-extend: Open Source CFD - \\ / O peration | Version: 3.2 - \\ / A nd | Web: http://www.foam-extend.org - \\/ M anipulation | For copyright notice see file Copyright + \\ / F ield | cfMesh: A library for mesh generation + \\ / O peration | + \\ / A nd | Author: Franjo Juretic (franjo.juretic@c-fields.com) + \\/ M anipulation | Copyright (C) Creative Fields, Ltd. ------------------------------------------------------------------------------- License - This file is part of foam-extend. + This file is part of cfMesh. - foam-extend is free software: you can redistribute it and/or modify it + cfMesh 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 + Free Software Foundation; either version 3 of the License, or (at your option) any later version. - foam-extend 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. + cfMesh 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 foam-extend. If not, see . + along with cfMesh. If not, see . Description Creates surface patches from surface subsets @@ -27,8 +27,6 @@ Description \*---------------------------------------------------------------------------*/ #include "argList.H" -#include "objectRegistry.H" -#include "foamTime.H" #include "triSurf.H" #include "triSurfaceCopyParts.H" #include "demandDrivenData.H" diff --git a/applications/utilities/mesh/generation/cfMesh/FMSToVTK/FMSToVTK.C b/applications/utilities/mesh/generation/cfMesh/FMSToVTK/FMSToVTK.C index 02f74e65a..f37b39e32 100644 --- a/applications/utilities/mesh/generation/cfMesh/FMSToVTK/FMSToVTK.C +++ b/applications/utilities/mesh/generation/cfMesh/FMSToVTK/FMSToVTK.C @@ -1,25 +1,25 @@ /*---------------------------------------------------------------------------*\ ========= | - \\ / F ield | foam-extend: Open Source CFD - \\ / O peration | Version: 3.2 - \\ / A nd | Web: http://www.foam-extend.org - \\/ M anipulation | For copyright notice see file Copyright + \\ / F ield | cfMesh: A library for mesh generation + \\ / O peration | + \\ / A nd | Author: Franjo Juretic (franjo.juretic@c-fields.com) + \\/ M anipulation | Copyright (C) Creative Fields, Ltd. ------------------------------------------------------------------------------- License - This file is part of foam-extend. + This file is part of cfMesh. - foam-extend is free software: you can redistribute it and/or modify it + cfMesh 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 + Free Software Foundation; either version 3 of the License, or (at your option) any later version. - foam-extend 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. + cfMesh 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 foam-extend. If not, see . + along with cfMesh. If not, see . Description cfMesh utility to convert a surface file to VTK multiblock dataset @@ -45,29 +45,29 @@ using namespace Foam; void writePointsToVTK ( const fileName& fn, - const string& title, + const string& /*title*/, const UList& points ) { xmlTag xmlRoot("VTKFile"); xmlRoot.addAttribute("type", "PolyData"); - + xmlTag& xmlPolyData = xmlRoot.addChild("PolyData"); - + xmlTag& xmlPiece = xmlPolyData.addChild("Piece"); xmlPiece.addAttribute("NumberOfPoints", points.size()); - + xmlTag& xmlPoints = xmlPiece.addChild("Points"); - + xmlTag& xmlPointData = xmlPoints.addChild("DataArray"); xmlPointData.addAttribute("type", "Float32"); xmlPointData.addAttribute("NumberOfComponents", 3); xmlPointData.addAttribute("format", "ascii"); xmlPointData << points; - + OFstream os(fn); os << xmlRoot << endl; - + Info << "Created " << fn << endl; } @@ -78,17 +78,17 @@ void writePointsToVTK const fileName& fn, const string& title, const UList& points, - unallocLabelList& addr + UList