diff --git a/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam.C b/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam.C index 58070fc473cc4010d0d9f07a5cb499ea303946ec..decabfeae0107b3508b8aca691bd2b7e059d6a46 100644 --- a/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam.C +++ b/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam.C @@ -579,12 +579,17 @@ void ReadCells int main(int argc, char *argv[]) { + argList::addNote + ( + "read CCM files as written by proSTAR/ccm\n" + " - does not handle 'interfaces' (couples), cyclics or data\n" + " - does not handle mesh regions (porosity, solids, ...)\n" + ); argList::noParallel(); - argList::validArgs.append("ccm26 file"); - -# include "setRootCase.H" -# include "createTime.H" + argList::validArgs.append("ccmFile"); + #include "setRootCase.H" + #include "createTime.H" // Foam mesh data // ~~~~~~~~~~~~~~ @@ -615,6 +620,7 @@ int main(int argc, char *argv[]) { const fileName ccmFile = args[1]; + const word ccmExt = ccmFile.ext(); if (!isFile(ccmFile)) { @@ -623,8 +629,6 @@ int main(int argc, char *argv[]) << exit(FatalError); } - word ccmExt = ccmFile.ext(); - if (ccmExt != "ccm" && ccmExt != "ccmg") { FatalErrorIn(args.executable()) diff --git a/applications/utilities/mesh/conversion/foamToStarMesh/foamToStarMesh.C b/applications/utilities/mesh/conversion/foamToStarMesh/foamToStarMesh.C index 09e34235e5fda8fcb6820b6a4f0cdbf8b31ed0f3..2587a5d4571e5c071511d1528a4903bdf415e2f4 100644 --- a/applications/utilities/mesh/conversion/foamToStarMesh/foamToStarMesh.C +++ b/applications/utilities/mesh/conversion/foamToStarMesh/foamToStarMesh.C @@ -62,6 +62,10 @@ using namespace Foam; int main(int argc, char *argv[]) { + argList::addNote + ( + "read OpenFOAM mesh and write a pro-STAR (v4) bnd/cel/vrt format" + ); argList::noParallel(); timeSelector::addOptions(); @@ -74,7 +78,7 @@ int main(int argc, char *argv[]) argList::addBoolOption ( "noBnd", - "suppress writing the .bnd file" + "suppress writing a boundary (.bnd) file" ); # include "setRootCase.H" diff --git a/applications/utilities/mesh/conversion/star3ToFoam/star3ToFoam.C b/applications/utilities/mesh/conversion/star3ToFoam/star3ToFoam.C index de32c0f5b3daecc5e08e86de08a041266e86dd8e..8d8c565387dc912953b0eea630314b4a18f6be36 100644 --- a/applications/utilities/mesh/conversion/star3ToFoam/star3ToFoam.C +++ b/applications/utilities/mesh/conversion/star3ToFoam/star3ToFoam.C @@ -38,8 +38,13 @@ Description int main(int argc, char *argv[]) { + argList::addNote + ( + "convert pro-STAR (v3) mesh to OpenFOAM" + ); + argList::noParallel(); - argList::validArgs.append("STAR mesh file prefix"); + argList::validArgs.append("pro-STAR prefix"); argList::addOption ( "scale", @@ -56,7 +61,7 @@ int main(int argc, char *argv[]) const scalar scaleFactor = args.optionLookupOrDefault("scale", 1.0); -# include "createTime.H" + #include "createTime.H" starMesh makeMesh(args[1], runTime, scaleFactor); diff --git a/applications/utilities/mesh/conversion/star4ToFoam/star4ToFoam.C b/applications/utilities/mesh/conversion/star4ToFoam/star4ToFoam.C index fc956582b3e0ca50d99b6f8fcbd591fa8c9ec329..53dd66c234ac48fe91e05a469f767c3361b0f2a9 100644 --- a/applications/utilities/mesh/conversion/star4ToFoam/star4ToFoam.C +++ b/applications/utilities/mesh/conversion/star4ToFoam/star4ToFoam.C @@ -59,6 +59,11 @@ using namespace Foam; int main(int argc, char *argv[]) { + argList::addNote + ( + "convert pro-STAR (v4) mesh to OpenFOAM" + ); + argList::noParallel(); argList::validArgs.append("pro-STAR prefix"); argList::addBoolOption diff --git a/applications/utilities/mesh/conversion/polyDualMesh/Make/files b/applications/utilities/mesh/manipulation/polyDualMesh/Make/files similarity index 100% rename from applications/utilities/mesh/conversion/polyDualMesh/Make/files rename to applications/utilities/mesh/manipulation/polyDualMesh/Make/files diff --git a/applications/utilities/mesh/conversion/polyDualMesh/Make/options b/applications/utilities/mesh/manipulation/polyDualMesh/Make/options similarity index 100% rename from applications/utilities/mesh/conversion/polyDualMesh/Make/options rename to applications/utilities/mesh/manipulation/polyDualMesh/Make/options diff --git a/applications/utilities/mesh/conversion/polyDualMesh/meshDualiser.C b/applications/utilities/mesh/manipulation/polyDualMesh/meshDualiser.C similarity index 99% rename from applications/utilities/mesh/conversion/polyDualMesh/meshDualiser.C rename to applications/utilities/mesh/manipulation/polyDualMesh/meshDualiser.C index 74a89fdc5e360043b0953024b81084c224033fb3..bdfb35bd504f2125576a8b0d85305963fda46248 100644 --- a/applications/utilities/mesh/conversion/polyDualMesh/meshDualiser.C +++ b/applications/utilities/mesh/manipulation/polyDualMesh/meshDualiser.C @@ -881,9 +881,6 @@ Foam::meshDualiser::meshDualiser(const polyMesh& mesh) {} -// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // - - // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // void Foam::meshDualiser::setRefinement @@ -1469,14 +1466,4 @@ void Foam::meshDualiser::setRefinement } - -// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * // - - -// * * * * * * * * * * * * * * * Friend Functions * * * * * * * * * * * * * // - - -// * * * * * * * * * * * * * * * Friend Operators * * * * * * * * * * * * * // - - // ************************************************************************* // diff --git a/applications/utilities/mesh/conversion/polyDualMesh/meshDualiser.H b/applications/utilities/mesh/manipulation/polyDualMesh/meshDualiser.H similarity index 100% rename from applications/utilities/mesh/conversion/polyDualMesh/meshDualiser.H rename to applications/utilities/mesh/manipulation/polyDualMesh/meshDualiser.H diff --git a/applications/utilities/mesh/conversion/polyDualMesh/polyDualMeshApp.C b/applications/utilities/mesh/manipulation/polyDualMesh/polyDualMeshApp.C similarity index 100% rename from applications/utilities/mesh/conversion/polyDualMesh/polyDualMeshApp.C rename to applications/utilities/mesh/manipulation/polyDualMesh/polyDualMeshApp.C